jufubao-admin-library 1.1.29 → 1.1.31

package/library/viewModules/viewCardsGift/schemas/greeting_card.js

@@ -100,7 +100,7 @@ module.exports = {
     {
       title: '贺卡管理 - 素材配置数据',
       mapFn: "setGreetingCardBaseConfig",
-      path: '/saas-admin/v1/bless_material/:material_id',
+      path: '/saas-admin/v1/bless_material/config/:material_id',
       isRule: false,
       data: {
         material_id:['素材ID', 'string|number', '必填'],

package/library/viewModules/viewCardsGift/viewCardsGift/config.vue

@@ -19,6 +19,7 @@
                 :class="{'g-active':item.value === custom_group_id,'g-no-active':item.value !== custom_group_id}"
                 v-for="item in search_group_list"
                 :icon="item.value === custom_group_id?'el-icon-check':''"
+                :key="item.value"
                 :command="item.value"
               >{{item.label}}</el-dropdown-item>
             </el-dropdown-menu>
@@ -69,7 +70,6 @@
               <hr>
               <div style="font-size: 30px">Detail:{{materialDetailConfig}}</div>
             </template>
-            {{materialData}}
             <div
               v-if="isShowPhone"
               v-for="(item,key) in materialData"
@@ -77,6 +77,7 @@
               class="iphone-box-content"
               @click="handleEditCard(item['key'])"
               :class="{active:mainActive === item['key']}"
+
               :style="{height: item.outHeight}"
             >
               <div class="iphone-box-content__image" :style="item.image"></div>
@@ -147,10 +148,8 @@ export default {
     listValue:{
       handler(value){
         if(this.materialDataTimer) clearTimeout(this.materialDataTimer);
-        this.materialDataTimer = setTimeout(()=>{
-          this.setMaterialData(value);
-          this.setMaterialConfig(value)
-        }, 500)
+        this.setMaterialData(value);
+        this.setMaterialConfig(value)
       },
       deep: true
     },
@@ -180,7 +179,7 @@ export default {
       isPc: true,
       firstLoading:false,
       defaultCoverImage: '//img.jufubao.cn/component/dome-cover.png',
-      defaultDetailImage: '//img.jufubao.cn/component/dome-detail.png',
+      defaultDetailImage: '',//img.jufubao.cn/component/dome-detail.png',
 
       //地址栏中参数（超管）
       group_id: '',
@@ -211,6 +210,7 @@ export default {
 
 
       //编辑模式下使用变量
+      bless_id:null,//祝福ID
       mainActive:'', //编辑时候区分是封面还是详情原始快
       materialCoverKey:{
         material_cover_config:'materialCoverConfig',
@@ -257,6 +257,10 @@ export default {
     if(query.x_material_id) {
       this.custom_x_material_id = Number(query.x_material_id);
     }
+
+    //祝福ID
+    if(query['bless_id']) this.bless_id = query['bless_id'];
+
     this.isPc = isPlatform().isPc;
     this.initDataCard();
   },
@@ -427,6 +431,11 @@ export default {
         if(this.search_group_name) params.filters.material_name = this.search_group_name;
         this.getGreetingCardList(params)
           .then(res=>{
+            //过滤未配置模版
+            res.data.list = res.data.list.filter(item=>{
+              return  (item.material_cover_config && item.material_detail_config)
+            });
+
             if(this.custom_active_item) {
               res.data.list = this.custom_active_item.concat(res.data.list.filter(item=>{
                 return item.id !== this.custom_active_material_id
@@ -483,8 +492,9 @@ export default {
           debugger
           this.$message({message:'操作成功！',type:"success"});
           window['xdLocalStore'].set('xd-card-x-material-id', res.data.x_material_id || this.custom_x_material_id);
+          window['xdLocalStore'].set('xd-card-active', 1);
           setTimeout(()=>{
-            this.$router.back();
+            this.$router.push(`/cards/edit/${this.bless_id}`);
           },1500)
           loading.close()
         })
@@ -602,18 +612,15 @@ export default {
     handleEditCard(key){
       if(key === this.mainActive) return;
       this.clearEditCard();
-      setTimeout(()=>{
-        this.mainActive = key;
-        this.initForm(this.getFromParams())
-      },50)
-
+      this.mainActive = key;
+      this.initForm(this.getFromParams(),Loading.service({}))
     },
 
     getFromParams(){
       return this[this.materialCoverKey[this.mainActive]];
     },
 
-    initForm(params={}){
+    initForm(params={},loading){
       let defaultHeight = 760;
       let defaultImage = this.defaultCoverImage
       let defaultTop = 470;
@@ -739,6 +746,11 @@ export default {
       ].filter(i=>i);
       this.status = true;
       this.listValueKey = Date.now();
+      this.$nextTick(()=>{
+        setTimeout(()=>{
+          if(loading) loading.close()
+        }, this.$xdHelper.random(5,10) * 100)
+      })
     },
 
     setMaterialData(item, key = null){
@@ -985,6 +997,10 @@ export default {
       position: relative;
       cursor: pointer;
 
+      &.noCursor {
+        cursor: default!important;
+      }
+
       &.active::after {
         content: ' ';
         position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {