jufubao-admin-library 1.1.38 → 1.1.39

package/library/pageComponents/modules/JfbProductSku.vue

@@ -23,6 +23,14 @@
 			<template slot="volume" slot-scope="inScope">
 				{{$xdHelper.divisionFloatNumber(inScope.row.volume, 100)}}m³
 			</template>
+      <template slot="jfb_price_ratio" slot-scope="inScope">
+        <div>货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_jfb_discount_ratio, 1000)}}</span>折</div>
+        <div v-if="inScope.row.dist_div_jfb_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_jfb_discount_ratio, 1000)}}</span>折</div>
+      </template>
+       <template slot="market_price_ratio" slot-scope="inScope">
+        <div>货源：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.purchase_div_market_discount_ratio, 1000)}}</span>折</div>
+        <div v-if="inScope.row.dist_div_market_discount_ratio">平台：<span class="red">{{$xdHelper.divisionFloatNumber(inScope.row.dist_div_market_discount_ratio, 1000)}}</span>折</div>
+      </template>
 		</xd-table>
     <xd-dialog
       v-if="dialogSetPrices"
@@ -65,7 +73,9 @@
           {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
           {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},
           {"type": "price", "prop": "jfb_price", "align": "center", "min-width": 80, "label": "建议零售价"},
+          {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
           {"type": "price", "prop": "market_price", "align": "center", "min-width": 80, "label": "市场价"},
+          {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
           {"type": "normal", "prop": "init_num", "align": "left", "min-width": 80, "label": "库存"},
           {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
           {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},

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

@@ -2,23 +2,27 @@ 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: true,
+  // #ifdef  saas-admin
+  hidden: true,
+  // #endif
   redirect: '/greeting_card/list',
   meta: {
     title: '贺卡管理',
     icon: 'el-icon-collection',
     iconSize: 20,
-    //roles: []
+    roles: [greetingCard.getGreetingCardList, greetingCard.setGreetingCardBaseConfig]
   },
   children: [
+    // #ifdef  admin
     {
       path: 'list',
       name: 'GreetingCardList',
@@ -26,9 +30,10 @@ const greetingCardRouter = {
       meta: {
         title: '贺卡管理',
         icon: 'el-icon-document',
-        //roles: []
+        roles: [greetingCard.getGreetingCardList]
       }
     },
+    // #endif
     {
       path: 'config/:material_id?/:group_id?',
       name: 'GreetingCardConfig',
@@ -37,8 +42,13 @@ const greetingCardRouter = {
       meta: {
         title: '贺卡配置',
         icon: 'el-icon-s-platform',
-       // roles: [],
-        activeMenu: "/greeting_card/list"
+        //roles:  [greetingCard.setGreetingCardBaseConfig],
+        // #ifdef  admin
+        activeMenu: "/greeting_card/list",
+        // #endif
+        // #ifdef  saas-admin
+        activeMenu: '/cards/list'
+        // #endif
       }
     }
   ]

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

@@ -8,7 +8,6 @@ module.exports = {
     {
       title: '贺卡管理 - 组列表',
       mapFn: "getGreetingCardGroupList",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material_group/options',
       isRule: false,
       data: {},
@@ -18,7 +17,6 @@ module.exports = {
     {
       title: '贺卡管理 - 创建',
       mapFn: "AddGreetingCardGroup",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material_group',
       isRule: false,
       data: {
@@ -30,7 +28,6 @@ module.exports = {
     {
       title: '贺卡管理 - 删除',
       mapFn: "delGreetingCardGroup",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material_group/:group_id',
       isRule: false,
       data: {
@@ -43,7 +40,6 @@ module.exports = {
     {
       title: '贺卡管理 - 贺卡列表',
       mapFn: "getGreetingCardList",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material/items',
       isRule: false,
       data: {
@@ -52,12 +48,11 @@ module.exports = {
         page_size: ['页长', 'number', '必选'],
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_LIST',
     },
     {
       title: '贺卡管理 - 创建贺卡',
       mapFn: "addGreetingCard",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material',
       isRule: false,
       data: {
@@ -69,7 +64,6 @@ module.exports = {
     {
       title: '贺卡管理 - 编辑贺卡',
       mapFn: "updateGreetingCard",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material/:material_id',
       isRule: false,
       data: {
@@ -77,13 +71,12 @@ module.exports = {
         item:['贺卡记录对象', 'Object', '必填'],
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_EDIT',
       method: 'put'
     },
     {
       title: '贺卡管理 - 复制贺卡',
       mapFn: "copyGreetingCard",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material/copy/:copy_material_id',
       isRule: false,
       data: {
@@ -91,12 +84,11 @@ module.exports = {
         group_id:['复制到分组ID', 'Object', '必填'],
       },
       disabled: true,
-      role: '',
+      role: '@@@.CARD.TEMPLATE_COPY',
     },
     {
       title: '贺卡管理 - 获取贺卡信息',
       mapFn: "getGreetingCardById",
-      isPublic: true,
       path: '/saas-admin/v1/bless_material/item/:material_id',
       isRule: false,
       data: {
@@ -105,5 +97,55 @@ module.exports = {
       disabled: true,
       role: '',
     },
+    {
+      title: '贺卡管理 - 素材配置数据',
+      mapFn: "setGreetingCardBaseConfig",
+      path: '/saas-admin/v1/bless_material/config/:material_id',
+      isRule: false,
+      data: {
+        material_id:['素材ID', 'string|number', '必填'],
+        item: ['素材配置对象', 'string|number', '必填']
+      },
+      disabled: true,
+      role: '@@@.CARD.TEMPLATE_CONFIG',
+      method: 'put'
+    },
+
+    //custom
+    {
+      title: '贺卡管理 - 获取自定义素材信息',
+      mapFn: "getCustomMaterialInfo",
+      path: '/saas-company/v1/bless_x_material/item/:x_material_id',
+      isRule: false,
+      params: {
+        x_material_id:['素材ID', 'string|number', '必填'],
+      },
+      disabled: true,
+      role: '@@@.CARD.TEMPLATE_CUSTOM_CONFIG',
+    },
+    {
+      title: '贺卡管理 - 创建自定义素材',
+      mapFn: "createCustomMaterial",
+      path: '/saas-company/v1/bless_x_material',
+      isRule: false,
+      data: {
+        item: ['素材配置对象', 'string|number', '必填']
+      },
+      disabled: true,
+      role: '',
+    },
+    {
+      title: '贺卡管理 - 编辑自定义素材',
+      mapFn: "updateCustomMaterial",
+      path: '/saas-company/v1/bless_x_material/:x_material_id',
+      isRule: false,
+      data: {
+        x_material_id:['素材ID', 'string|number', '必填'],
+        item: ['素材配置对象', 'string|number', '必填']
+      },
+      disabled: true,
+      role: '',
+      method: 'put'
+    },
   ],
 }