jufubao-admin-library 1.1.81 → 1.1.83

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -952,24 +952,6 @@ export default {
             { required: true, message: '请输入数值', trigger: 'blur' },
           ],
         },
-        {
-          label: '小数点保留位数:',
-          ele: 'xd-select-list',
-          valueKey: 'price_bit',
-          value: params.price_bit || 2,
-          placeholder: '请选择小数点保留位数',
-          multiple: false,
-          list: [
-            { "label": "零位", "value": -1 },
-            { "label": "一位", "value": 1 },
-            { "label": "两位", "value": 2 },
-          ],
-          rules: [{
-            required: true,
-            message: '请选择小数点保留位数',
-            trigger: 'blur'
-          }],
-        },
       ].filter(i => i)
     },
 

package/library/viewModules/viewStat/router/productStat.js

@@ -8,7 +8,7 @@ const productStatRouter = {
   path: '/stat',
   sort: 99,
   component: Layout,
-  name: '在售商品销售统计',
+  name: '商品统计',
   redirect: '/stat/product',
   meta: {
     title: '在售商品销售统计',

package/library/viewModules/viewStat/viewsStat/product/components/table-product.vue

@@ -147,13 +147,6 @@ export default {
           width: 80,
           label: "商品类型",
         },
-        {
-          type: "normal",
-          prop: "supplier_belong_text",
-          align: "center",
-          width: 100,
-          label: "供应商归属",
-        },
         {
           type: "normal",
           prop: "supplier_name",

package/library/viewModules/viewWalking/router/walking.js

@@ -9,9 +9,12 @@ const walkingRouter = {
   path: '/walking',
   component: Layout,
   sort: 90,
-  name: 'SaaS管理',
-  alwaysShow: true,
+  // #ifdef  admin
+  name: '健步走',
+  // #endif
   // #ifdef  saas-admin
+  alwaysShow: true,
+  name: 'SaaS管理',
   hidden: true,
   // #endif
   redirect: '/walking/list',
@@ -29,7 +32,7 @@ const walkingRouter = {
       component: () => setModuleName(import('@/viewWalking/list'),'WalkingList'),
       meta: {
         title: '健步走',
-        icon: 'el-icon-document',
+        icon: 'iconhuodongtubiao',
         roles: [walking.getWalkingList]
       }
     },

package/library/viewModules/viewWalking/router/walking_config.js

@@ -20,7 +20,12 @@ const walkingConfigRouter = {
   },
   children: [
     {
+      // #ifdef saas-admin admin
       path: 'config/:map_id?/:activity_id?',
+      // endif
+      // #ifdef sms-walking
+      path: 'config/:map_id?/:activity_id?/:site_id?',
+      // endif
       name: 'ConfigMap',
       hidden: true,
       component: () => setModuleName(import('@/viewWalking/config.vue'),'ConfigMap'),

package/library/viewModules/viewWalking/schemas/walking.js

@@ -51,6 +51,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/@@@/v1/walking/x_map/item/:id',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map/item/:id',
+      // #endif
       isRule: false,
       params: {
         id:['模版ID', 'string', '必填']
@@ -106,6 +109,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/saas-app-company/v1/walking/x_map_point/items',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map_point/items',
+      // #endif
      
       isRule: false,
       data: {
@@ -125,6 +131,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/saas-app-company/v1/walking/x_map_point/item/:id',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map_point/item/:id',
+      // #endif
       isRule: false,
       params: {
         id:['id', 'String', '必填'],
@@ -141,6 +150,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/saas-app-company/v1/walking/x_map_point',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map_point',
+      // #endif
       isRule: false,
       data: {
         item:['模版对象', 'Object', '必填'],
@@ -157,6 +169,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/saas-app-company/v1/walking/x_map_point/:id',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map_point/:id',
+      // #endif
       isRule: false,
       data: {
         item:['模版对象', 'Object', '必填'],
@@ -187,6 +202,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/saas-app-company/v1/walking/activity/finish-make/:id',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/activity/finish-make/:id',
+      // #endif
       isRule: false,
       data: {
         id:['模版ID', 'string', '必填']
@@ -204,6 +222,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/saas-app-company/v1/walking/x_map/point-color/:id',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map/point-color/:id',
+      // #endif
       isRule: false,
       data: {
         id:['点位ID', 'string', '必填'],
@@ -222,6 +243,9 @@ module.exports = {
       // #ifdef saas-admin
       path: '/saas-app-company/v1/walking/x_map/point-size/:id',
       // #endif
+      // #ifdef sms-walking
+      path: '/saas-app-partner/v1/walking/x_map/point-size/:id',
+      // #endif
       isRule: false,
       data: {
         id:['点位ID', 'string', '必填'],
@@ -240,6 +264,9 @@ module.exports = {
        // #ifdef saas-admin
        path: '/saas-app-company/v1/walking/x_map_point/:id',
        // #endif
+       // #ifdef sms-walking
+       path: '/saas-app-partner/v1/walking/x_map_point/:id',
+      // #endif
       isRule: false,
       data: {
         id:['点位ID', 'string', '必填'],
@@ -248,5 +275,22 @@ module.exports = {
       role: '',
       method:'delete'
     },
+    // #ifdef sms-walking 
+    {
+      title: '奖品 - 电子码可绑活动',
+      mapFn: "getCodeActivityForForign",
+      isPublic:true,
+      path: '/code-partner/v1/code-activity-for-forign',
+      isRule: false,
+      params: {
+        id: ['activity_name', 'String', '非必填'],
+        id: ['activity_use_scene', 'String', '非必填'],
+        id: ['selected_activity_id', 'String', '非必填'],
+        id: ['site_id', 'String', '非必填'],
+      },
+      disabled: true,
+      role: '',
+    },
+    // #endif
   ],
 }

package/library/viewModules/viewWalking/viewWalking/config.vue

@@ -80,6 +80,7 @@
           :step="myStep"
           :radius-num="radius"
           :circle-color="color"
+          :site_id="siteId"
           @onDelete="handleItemDelete"
           @onSubmit="handleItemSubmit"
           v-model="item.model"
@@ -145,6 +146,7 @@ export default {
       yTop:0,
       yLeft:15.2,
       yHeight: 15.2,
+      siteId:'',
 
     };
   },
@@ -171,6 +173,9 @@ export default {
   created() {
     if(this.$route.params.map_id) this.map_id = Number(this.$route.params.map_id);
     if(this.$route.params.activity_id) this.activity_id = Number(this.$route.params.activity_id);
+    // #ifdef sms-walking
+    if(this.$route.params.site_id) this.siteId = this.$route.params.site_id;
+    // #endif
     if(this.map_id === null) throw new Error('参数错误');
     this.getInfo();
     this.$bus.$on('toggleSideBar',()=>{
@@ -421,7 +426,7 @@ export default {
         // #ifdef admin
         id:this.map_id,
         // #endif
-        // #ifdef saas-admin
+        // #ifdef saas-admin sms-walking
         id:this.activity_id,
         // #endif
       }
@@ -431,8 +436,8 @@ export default {
           // #ifdef admin
            this.$router.push('/walking/list')
           // #endif
-          // #ifdef saas-admin
-          this.$router.push('/activity/list')
+          // #ifdef saas-admin sms-walking
+          this.$router.push('/walking_activity/list')
           // #endif
         })
         .catch(err=>{

package/library/viewModules/viewWalking/viewWalking/create.vue

@@ -28,6 +28,7 @@ import {
 } from 'vuex';
 import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
 import {Loading} from "element-ui";
+import { getOptions } from "@/utils/options";
 
 
 
@@ -45,6 +46,7 @@ export default {
       listForm: [],
       listValue: {},
       status: false,
+      sceneData:[],
     }
   },
   created() {
@@ -52,22 +54,29 @@ export default {
     if(this.$route.params && this.$route.params.id) {
       this.id = this.$route.params.id;
     }
-
-    //编辑模式
-    if(this.id) {
-      let loading = Loading.service({});
-      this.getWalkingTemplate({id: this.id})
-        .then(res=>{
-          this.initForm(this.setParams(res.data))
-          loading.close()
-        })
-        .catch(err=>{
-          loading.close()
-        })
-    }
-    else {
-      this.initForm()
-    }
+    getOptions({
+      server: 'saas-app-public',
+      fn: 'map-show-scene',
+      path: 'p1',
+    },).then(res => {
+      this.sceneData = res.data.list;
+      //编辑模式
+      if(this.id) {
+        let loading = Loading.service({});
+        this.getWalkingTemplate({id: this.id})
+          .then(res=>{
+            this.initForm(this.setParams(res.data))
+            loading.close()
+          })
+          .catch(err=>{
+            loading.close()
+          })
+      }
+      else {
+        this.initForm()
+      }
+    })
+    
   },
   methods: {
     ...mapActions('walking', [
@@ -111,7 +120,8 @@ export default {
           slot: true,
           oneWidth: 250,
           oneHeight: 445,
-          tipsformet: '上传文件格式：@imageType@，不超过@size@MB，建议宽：750像素，高：667~1334像素',
+          pixelSize:'750',
+          tipsformet: '上传文件格式：@imageType@，不超过@size@MB，尺寸宽：750像素，高：667~1334像素',
           type: ['jpg', 'png', 'jpeg', 'gif'],
           styleType: 'one',
           uploadType: 'aliyun',
@@ -130,6 +140,17 @@ export default {
           placeholder: '请选择模版状态',
           list: 'status',
         },
+        {
+          label: '展示范围:', 
+          ele: 'xd-radio', 
+          valueKey: 'show_scene', 
+          value: params.show_scene||'', 
+          list: this.sceneData,
+          rules: [
+            {required: true, message: '请选择展示范围', trigger: ['blur', 'change']},
+          ],
+          // notice:'客户端活动列表展示范围，H5仅可在公众号H5界面展示；小程序可在公众号H5和小程序都展示。'
+        },
 
       ].filter(i=>i);
       this.status = true;
@@ -148,7 +169,8 @@ export default {
         id: data.id,
         map_image_url,
         map_name: data.map_name,
-        map_status: data.map_status
+        map_status: data.map_status,
+        show_scene:data.show_scene
       };
 
     },