jufubao-admin-library 1.1.30 → 1.1.32

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

@@ -2,13 +2,13 @@ import Layout from '@/layout'
 
 import {setModuleName} from "@/utils/xd.base";
 import roles from '@/constant/permissions';
-//const enterprise_buy = roles.enterprise_buy
+const greetingCard = roles.greetingCard
 
 
 const greetingCardRouter = {
   path: '/greeting_card',
   component: Layout,
-  sort: 80,
+  sort: 90,
   name: '贺卡管理',
   alwaysShow: false,
   // #ifdef  saas-admin
@@ -19,7 +19,7 @@ const greetingCardRouter = {
     title: '贺卡管理',
     icon: 'el-icon-collection',
     iconSize: 20,
-    //roles: []
+    roles: [greetingCard.getGreetingCardList]
   },
   children: [
     // #ifdef  admin
@@ -30,7 +30,7 @@ const greetingCardRouter = {
       meta: {
         title: '贺卡管理',
         icon: 'el-icon-document',
-        //roles: []
+        roles: [greetingCard.getGreetingCardList]
       }
     },
     // #endif
@@ -42,7 +42,7 @@ const greetingCardRouter = {
       meta: {
         title: '贺卡配置',
         icon: 'el-icon-s-platform',
-        roles: [],
+        roles:  [greetingCard.setGreetingCardBaseConfig],
         // #ifdef  admin
         activeMenu: "/greeting_card/list",
         // #endif

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

@@ -48,7 +48,7 @@ module.exports = {
         page_size: ['页长', 'number', '必选'],
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_LIST',
     },
     {
       title: '贺卡管理 - 创建贺卡',
@@ -71,7 +71,7 @@ module.exports = {
         item:['贺卡记录对象', 'Object', '必填'],
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_EDIT',
       method: 'put'
     },
     {
@@ -84,7 +84,7 @@ module.exports = {
         group_id:['复制到分组ID', 'Object', '必填'],
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_COPY',
     },
     {
       title: '贺卡管理 - 获取贺卡信息',
@@ -100,14 +100,14 @@ 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', '必填'],
         item: ['素材配置对象', 'string|number', '必填']
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_CONFIG',
       method: 'put'
     },
 
@@ -121,7 +121,7 @@ module.exports = {
         x_material_id:['素材ID', 'string|number', '必填'],
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_CUSTOM_CONFIG',
     },
     {
       title: '贺卡管理 - 创建自定义素材',

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>
@@ -76,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>
@@ -146,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
     },
@@ -179,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: '',
@@ -210,6 +210,7 @@ export default {
 
 
       //编辑模式下使用变量
+      bless_id:null,//祝福ID
       mainActive:'', //编辑时候区分是封面还是详情原始快
       materialCoverKey:{
         material_cover_config:'materialCoverConfig',
@@ -256,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();
   },
@@ -426,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
@@ -482,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()
         })
@@ -601,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;
@@ -738,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){
@@ -984,6 +997,10 @@ export default {
       position: relative;
       cursor: pointer;
 
+      &.noCursor {
+        cursor: default!important;
+      }
+
       &.active::after {
         content: ' ';
         position: absolute;

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

@@ -42,13 +42,14 @@
               <img v-if="item['custom_material_cover']" :src="item['custom_material_cover']" :alt="item['material_name']">
               <i v-else class="iconfont icontuxiangma"></i>
               <div class="btn">
-                <el-button round @click="handleSetting(item)">设置贺卡</el-button>
+                <el-button round v-if="isConfig" @click="handleSetting(item)">设置贺卡</el-button>
                 <el-button round @click="handleEdit(item)">编辑贺卡</el-button>
-                <el-button round @click="handleCopy(item)">复制贺卡</el-button>
+                <el-button round v-if="isCopy" @click="handleCopy(item)">复制贺卡</el-button>
               </div>
             </div>
             <div class="card-list-item__title">{{item['material_name']}}</div>
             <div class="card-list-item__desc">{{item['material_desc']}}</div>
+            <div class="card-list-item__status" :class="{open:item.material_status === 'Y',close:item.material_status !== 'Y'}">{{item.material_status === 'Y'?'正常':'禁用'}}</div>
           </div>
         </div>
       </div>
@@ -109,6 +110,8 @@ import XdTableImage from "@/components/XdTableImage.vue";
 import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
 import {mapActions, mapState} from "vuex";
 import {Loading} from "element-ui";
+import greetingCard from '@/constant/modules/greetingCard'
+import checkPermission from "@/utils/permission"
 
 export default {
   name: "InfoMessage",
@@ -120,6 +123,15 @@ export default {
     XdBaseDynamicField,
     XdTableImage
   },
+  computed:{
+    isCopy(){
+      return checkPermission(greetingCard.copyGreetingCard)
+    },
+
+    isConfig(){
+      return checkPermission(greetingCard.setGreetingCardBaseConfig)
+    }
+  },
 
   data() {
     return {
@@ -600,6 +612,7 @@ export default {
       margin-bottom: 20px;
       overflow: hidden;
       cursor: pointer;
+      position: relative;
 
       .btn {
         display: none;
@@ -669,6 +682,27 @@ export default {
         -webkit-line-clamp: 1;
         -webkit-box-orient: vertical;
       }
+
+      &__status {
+        color: #fff;
+        height: 14px;
+        padding: 3px 10px;
+        line-height: 14px;
+        position: absolute;
+        bottom: 0;
+        right:0;
+        font-size: 12px;
+        border-radius: 8px 0 0 0;
+        box-sizing: content-box;
+        &.open {
+          background: $green;
+        }
+        &.close {
+          background: $pink;
+        }
+      }
+
+
     }
   }
   @media screen and (max-width: 768px) {

package/library/viewModules/viewsAccounts/router/mAccounts.js

@@ -1,5 +1,6 @@
 import Layout from '@/layout'
-// import role from '@/constant/permissions' //引用权限值
+import role from '@/constant/permissions' //引用权限值
+const mAccounts = role.mAccounts;
 
 const accountsRouter = {
   path: '/m-accounts',
@@ -10,9 +11,9 @@ const accountsRouter = {
   meta: {
     title: '账号管理',
     icon: 'xdicon_guanliyuan',
-    // roles: [
-    //   role.account.accountList
-    // ]
+    roles: [
+      mAccounts.getSaasUserList
+    ]
   },
   children: [
     {
@@ -22,9 +23,9 @@ const accountsRouter = {
       meta: {
         title: '账号列表',
         icon: 'xdicon_guanliyuan',
-        // roles: [
-        //   role.account.accountList
-        // ]
+        roles: [
+         mAccounts.getSaasUserList
+        ]
       }
     }
   ]

package/library/viewModules/viewsAccounts/viewsAccounts/list.vue

@@ -14,7 +14,7 @@
       ></xd-search>
     </el-card>
     <el-card class="app-container__list">
-      <div class="app-container__list-pagination">
+      <div class="app-container__list-pagination" v-if="isCreate">
         <div></div>
         <div>
           <el-button icon="el-icon-edit" type="primary" @click="openDialog">新增账号</el-button>
@@ -72,6 +72,7 @@ import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
 import XdDialog from "@/components/XdDialog.vue";
 import {mapActions} from 'vuex'
 import {createPwd} from "@/utils/xd.base";
+import mAccounts from '@/constant/modules/mAccounts'
 
 export default {
   name: "PartnerAccountList",
@@ -93,14 +94,17 @@ export default {
         { "type": "normal", "prop": "created_time", "align": "center", "width": 180, "label": "创建时间" },
         { "type": "normal", "prop": "updated_time", "align": "center", "width": 180, "label": "修改时间" },
         { "type": "status", "prop": "status", "align": "center", "width": 100, "label": "状态" },
-        {
+        checkPermission(mAccounts.createSaasUser) && {
           "type": "operate", "align": "center", "width": 100, "label": "操作",
           "values": [
             { "ui": "text-button", "name": "编辑", "type": "primary", "event": 'edit' }
           ].filter(i => i)
         }
       ]
-    }
+    },
+    isCreate(){
+      return checkPermission(mAccounts.createSaasUser)
+    },
   },
   data () {
     return {
@@ -187,7 +191,13 @@ export default {
           if(form.user_id) delete form.user_id;
           let company = this.$xdHelper.cloneDeep(form['company'])
           if(form['company']) delete form['company'];
-          let params ={
+          let password = '';
+          if( form.password) {
+            password =form.password;
+            delete form.password;
+          }
+          let params = {
+            password: password,
             user: {
               ...form,
               // #ifdef partner-saas
@@ -311,6 +321,20 @@ export default {
             { required: true, message: "请选择客户名称",trigger: ['change']}
           ]
         },
+        // #ifdef partner-saas
+        {
+          label: 'SaaS后台是否:',
+          ele: 'xd-radio',
+          valueKey: 'is_show_saas',
+          value: params['is_show_saas'] || 'N',
+          backValueType: '1',
+          placeholder: '请选SaaS后台是否显示',
+          list: [
+            {label: '不可见', value: 'N'},
+            {label: '可见', value: 'Y'}
+          ],
+        },
+        // #endif
         {
           label: '状态:',
           ele: 'xd-radio-status',
@@ -358,8 +382,10 @@ export default {
         role_ids: row.role_ids,
         status: row.status,
         // #ifdef partner-saas
-        company:[{label: row.company_name, value: row.company_id}]
+        company:[{label: row.company_name, value: row.company_id}],
+        is_show_saas: row.is_show_saas,
         // #endif
+
       };
       this.initForm(info);
       this.dialog = true;

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

@@ -1,6 +1,7 @@
 import Layout from '@/layout'
 import {setModuleName} from "@/utils/xd.base";
-// import role from '@/constant/permissions' //引用权限值
+import role from '@/constant/permissions' //引用权限值
+const mCompany = role.mCompany
 
 const companyRouter = {
   path: '/m-company',
@@ -11,7 +12,7 @@ const companyRouter = {
   meta: {
     title: '客户管理',
     icon: 'xdicon_jiamengshangyonghu',
-    roles: []
+    roles: [mCompany.getSaasCompanyList]
   },
   children: [
     {
@@ -21,7 +22,7 @@ const companyRouter = {
       meta: {
         title: '客户管理',
         icon: 'xdicon_jiamengshangyonghu',
-        roles: []
+        roles: [mCompany.getSaasCompanyList]
       }
     }
   ]

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

@@ -65,6 +65,7 @@ import checkPermission from "@/utils/permission"
 import {mapActions,} from 'vuex'
 import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
 import XdDialog from "@/components/XdDialog.vue";
+import mCompany from '@/constant/modules/mCompany'
 
 export default {
   name: "ModuleCompanyList",
@@ -84,7 +85,7 @@ export default {
         { "type": "normal", "prop": "created_time", "align": "center", "width": 180, "label": "创建时间" },
         { "type": "normal", "prop": "updated_time", "align": "center", "width": 180, "label": "修改时间" },
         { "type": "status", "prop": "company_status", "align": "center", "width": 100, "label": "状态" },
-        {
+        checkPermission(mCompany.updateSaasCompany) && {
           "type": "operate", "align": "center", "width": 100, "label": "操作",
           "values": [
             { "ui": "text-button", "name": "配置客户", "type": "primary", "event": 'edit' }
@@ -214,11 +215,11 @@ export default {
           ]
         },
         params['site_id'] && {
-          label: '指定站点应用',
+          label: '默认进入应用',
           ele: 'xd-remote-select-list',
           valueKey: 'index_path',
           value: params['index_path'] || null,
-          placeholder: '请选择指定站点应用：',
+          placeholder: '请选择默认进入应用：',
           setting: {  multiple: false,},
           className: 'input80',
           handleCustom:({action, data}) =>{
@@ -237,7 +238,7 @@ export default {
               })
           },
           rules: [
-            { required: true, message: "请选择指定站点",trigger: ['change']}
+            { required: true, message: "请选择默认进入应用",trigger: ['change']}
           ]
         },
         {

package/package.json

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