jufubao-admin-library 1.1.28 → 1.1.30

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

@@ -10,7 +10,10 @@ const greetingCardRouter = {
   component: Layout,
   sort: 80,
   name: '贺卡管理',
-  alwaysShow: true,
+  alwaysShow: false,
+  // #ifdef  saas-admin
+  hidden: true,
+  // #endif
   redirect: '/greeting_card/list',
   meta: {
     title: '贺卡管理',

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

@@ -27,10 +27,14 @@
           <el-button type="primary" icon="el-icon-search" @click="handleSearch()"></el-button>
         </div>
         <div class="pages-left__content" v-if="leftGroupList !== null">
+          <!--#ifdef saas-admin-->
           <div class="pages-left__content-title" v-if="leftGroupList && leftGroupList.length === 0">【<span>{{custom_group_name}}</span>】可用模版列表</div>
+          <!--#endif-->
           <template v-for="(item,index) in leftGroupList" >
+            <!--#ifdef saas-admin-->
             <div class="pages-left__content-title" v-if="index ===0 && item.isSelected">当前使用模版</div>
             <div class="pages-left__content-title" v-if="index ===0 && !item.isSelected">【<span>{{custom_group_name}}</span>】可用模版列表</div>
+            <!--#endif-->
             <div
               class="pages-left__content-item"
               :key="item.value"
@@ -42,7 +46,9 @@
               </el-image>
               <div>{{item.label}}</div>
             </div>
+            <!--#ifdef saas-admin-->
             <div class="pages-left__content-title" v-if="index === 0 && item.isSelected">【<span>{{custom_group_name}}</span>】可用模版列表</div>
+            <!--#endif-->
           </template>
         </div>
         <div
@@ -181,12 +187,12 @@ export default {
 
 
       //自定义素材ID（SaaS后台）
-      custom_x_material_id:null,
-      custom_x_material_item: null,
-      custom_group_id: null,
-      custom_group_name:'',
-      custom_active_item: null,
-      custom_active_material_id: null,
+      custom_x_material_id:null, //自定义素材对象ID
+      custom_x_material_item: null, //获取自定义素材对象
+      custom_group_id: null, //分组ID
+      custom_group_name:'', //分组名称
+      custom_active_item: null, //自定义素材所使用到原始素材对象
+      custom_active_material_id: null,//自定义素材所使用到原始素材对象ID
 
       //search（SaaS后台）
       is_search_show: false,
@@ -198,10 +204,13 @@ export default {
 
 
       //main ---> material_cover_config/material_detail_config
-      active:'',//当前选择到素材ID
-      activeItem: null, //当前操作贺卡数据
+      active:'',//当前选中到素材ID
+      activeItem: null, //当前选中操作贺卡数据
       active_material_id:null, //原素材ID切换的参数
-      mainActive:'',
+
+
+      //编辑模式下使用变量
+      mainActive:'', //编辑时候区分是封面还是详情原始快
       materialCoverKey:{
         material_cover_config:'materialCoverConfig',
         material_detail_config:'materialDetailConfig'
@@ -211,12 +220,8 @@ export default {
         material_detail_config:{},//{"material_image": "", "material_height": 1334, "material_status": "Y", "material_nickname": "亲爱的 {{name}}!", "material_content": "", "material_end": "{{company}}", "material_color": "#F99E15", "material_margin": { "top": 450, "right": 100, "bottom": 0, "left": 100 } }
       },
       material_cover:null,//封面图
-
-      //封面配置信息
-      materialCoverConfig:{},
-
-      //详情配置信息
-      materialDetailConfig:{},
+      materialCoverConfig:{},  //封面配置信息
+      materialDetailConfig:{},    //详情配置信息
 
       //pages data
       materialDataTimer:null,
@@ -242,8 +247,9 @@ export default {
     let query = this.$route.query;
     if(params.group_id) this.group_id = params.group_id;
     if(params.material_id){
-      this.material_id = params.material_id;
+      this.material_id = Number(params.material_id);
       this.active_material_id = Number(params.material_id);
+      this.active = Number(params.material_id);
     }
 
     //自定义素材ID
@@ -283,12 +289,13 @@ export default {
         return item
       });
 
+      // #ifdef saas-admin
       this.search_group_list.map(item=>{
-        debugger
         if(item.value === this.custom_group_id+''){
           this.custom_group_name = item.label;
         }
       });
+      // #endif
 
       //设置当前选中
       if(activeItem){
@@ -325,7 +332,7 @@ export default {
       }
       this.getGreetingCardList(params)
         .then(res=>{
-          this.handleInitLeftData(res.data.list, this.material_id);
+          this.handleInitLeftData(res.data.list, this.active || this.material_id);
         }).catch();
     },
     handlePublish(){
@@ -339,6 +346,7 @@ export default {
           material_detail_config:JSON.stringify(this.materialDetailConfig),
         },
       }
+
       let loading = Loading.service({});
       this.setGreetingCardBaseConfig(params)
         .then(res=>{
@@ -473,6 +481,10 @@ export default {
         .then(res=>{
           debugger
           this.$message({message:'操作成功！',type:"success"});
+          window['xdLocalStore'].set('xd-card-x-material-id', res.data.x_material_id || this.custom_x_material_id);
+          setTimeout(()=>{
+            this.$router.back();
+          },1500)
           loading.close()
         })
         .catch(err=>{
@@ -496,7 +508,6 @@ export default {
     handleChange(item, init = false){
       if(item.value === this.active) return;
       if(init || this.active === '') {
-        debugger
         this.handleChangeClear();
         this.activeItem = this.$xdHelper.cloneDeep(item);
         this.active = item.value;
@@ -554,7 +565,7 @@ export default {
 
       // #ifdef saas-admin
       //封面数据
-      if(this.custom_x_material_item['material_cover_config']
+      if(this.custom_x_material_item && this.custom_x_material_item['material_cover_config']
         && item.id === this.custom_x_material_item['material_id']
       ) {
         this.materialCoverConfig = JSON.parse(this.custom_x_material_item['material_cover_config']);
@@ -562,7 +573,7 @@ export default {
       else this.materialCoverConfig = this.toJson(item['material_cover_config'],'material_cover_config');
 
       //详情
-      if(this.custom_x_material_item['material_detail_config']
+      if(this.custom_x_material_item && this.custom_x_material_item['material_detail_config']
         && item.id === this.custom_x_material_item['material_id']
       ) {
         this.materialDetailConfig = JSON.parse(this.custom_x_material_item['material_detail_config']);
@@ -780,6 +791,8 @@ export default {
         height: params['key'] === 'material_detail_config'?'1334px':`450px`,
         backgroundImage: `url(${thumb})`
       };
+
+
       if((this.mainActive || key)) {
         this.$set(this.materialData, this.materialCoverMap[this.mainActive || key], params);
       }
@@ -833,7 +846,7 @@ export default {
   &__content {
     width: 100%;
     &-item {
-      width: 280px;
+      width: 100%;
       padding: 5px;
       box-sizing: border-box;
       border-radius: 5px;

package/library/viewModules/viewCardsGift/viewCardsGift/list.vue

@@ -191,7 +191,7 @@ export default {
     },
 
     handleSubmit(){
-      this.$refs['form'].submit()
+      this.$refs['form'].submitAll()
         .then(res=>{
           let loading = Loading.service({})
           let form = this.$refs['form'].getAllFormData();
@@ -354,7 +354,7 @@ export default {
       }
       this.greetingCardListForm = [
         params['id'] && {
-          label: "分组名称",
+          label: "贺卡ID",
           ele: "el-input",
           value: params['id'],
           valueKey: "id",
@@ -362,13 +362,14 @@ export default {
           disabled: true,
         },
         {
-          label: "分组名称",
+          label: "贺卡名称",
           ele: "el-input",
           value: params['material_name'] || '',
           valueKey: "material_name",
           className: "input80",
+          placeholder: '请输入贺卡名称',
           rules: [
-            { required: true, message: "请输入分组名称" }
+            { required: true, message: "请输入贺卡名称" }
           ]
         },
         {
@@ -378,13 +379,15 @@ export default {
           type:'textarea',
           valueKey: "material_desc",
           className: "input80",
+          placeholder: '请输入贺卡描述',
         },
         {
-          label: "贺卡分组",
-          ele: "el-input",
-          value: this.getGroupActive().label,
-          disabled: true,
-          valueKey: "group_name",
+          label: '贺卡分组',
+          ele: 'xd-select-list',
+          valueKey: 'group_id',
+          value: params['group_id'] || this.getGroupActive().value,
+          list: this.groupList,
+          disabled: !params['id'],
           className: "input80",
         },
         {
@@ -431,14 +434,11 @@ export default {
       let form = this.$refs['formCard'];
       form.submitAll()
         .then(res=>{
-          debugger
           let loading = Loading.service({})
           let item = this.$xdHelper.cloneDeep(form.getAllFormData());
-          if(item['group_name']) delete item['group_name'];
           if(item['material_cover']) {
             item['material_cover'] = item['material_cover']['url'];
           }
-          item['group_id'] = Number(this.activeName);
           let params = {item:item};
           let fn = 'addGreetingCard';
           if(item.id) {

package/library/viewModules/viewsCompany/schemas/mCompany.js

@@ -15,6 +15,19 @@ module.exports = {
       disabled: true,
       role: '',
     },
+    {
+      title: '客户管理 - 获取站点所有应用',
+      mapFn: "getSaasSiteAppList",
+      isPublic: true,
+      path: '/editx/v1/platforms/all-platform-catelogs',
+      isRule: false,
+      params: {
+        site_id:['站点id', 'String', '必选'],
+      },
+      resultKey: "data",
+      disabled: true,
+      role: '',
+    },
     {
       title: '客户管理 - 设置',
       mapFn: "updateSaasCompany",

package/library/viewModules/viewsCompany/viewsCompany/list.vue

@@ -45,6 +45,7 @@
         label-width="120px"
         v-if="status"
         :list="listForm"
+        :key="key"
         @success="handleSuccess"
         @onApiSuccessUrl="handleApiSuccessUrl"
         @onGetParamsAndHeader="handleGetParamsAndHeader"
@@ -92,6 +93,11 @@ export default {
       ]
     }
   },
+  watch:{
+   'listValue.site_id'(){
+     this.initForm(this.listValue);
+   },
+  },
   data () {
     return {
       //分页参数
@@ -113,6 +119,7 @@ export default {
       listForm: [],
       status: false,
       id:null, //客户记录ID
+      key: Date.now()
     }
   },
 
@@ -123,7 +130,8 @@ export default {
     ...mapActions('mCompany', [
       'getSaasCompanyList',
       'getSaasSiteList',
-      'updateSaasCompany'
+      'updateSaasCompany',
+      'getSaasSiteAppList'
     ]),
 
     //create and edit
@@ -144,7 +152,6 @@ export default {
         .then(res=>{
           let form = this.$xdHelper.cloneDeep(this.$refs['form'].getAllFormData());
           let loading = Loading.service({});
-          debugger
           this.updateSaasCompany({id:this.id,item:form})
             .then(res=>{
               loading.close();
@@ -206,6 +213,33 @@ export default {
             { required: true, message: "请选择指定站点",trigger: ['change']}
           ]
         },
+        params['site_id'] && {
+          label: '指定站点应用',
+          ele: 'xd-remote-select-list',
+          valueKey: 'index_path',
+          value: params['index_path'] || null,
+          placeholder: '请选择指定站点应用：',
+          setting: {  multiple: false,},
+          className: 'input80',
+          handleCustom:({action, data}) =>{
+            this.getSaasSiteAppList({site_id: params['site_id']})
+              .then(res=>{
+                data.cb(res.data.items.map(item=>{
+                  return {
+                    label: item.label,
+                    value: item.route,
+                    id: item.value
+                  }
+                }))
+              })
+              .catch(err=>{
+                data.cb([])
+              })
+          },
+          rules: [
+            { required: true, message: "请选择指定站点",trigger: ['change']}
+          ]
+        },
         {
           label: '客户状态:',
           ele: 'xd-radio-status',
@@ -217,6 +251,7 @@ export default {
         },
       ].filter(ii => ii)
       this.status = true
+      this.key = Date.now()
     },
     //create and edit
 

package/package.json

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