jufubao-base 1.0.254-beta1 → 1.0.254-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.254-beta1",
+  "version": "1.0.254-beta2",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -378,8 +378,8 @@
           let data = {
             shop_id: this.shop_id,
             temp_order_id: this.temp_order_id,
-            business_code: this.xnamespace,
-            resource_shop_id: this.resource_shop_id
+            // business_code: this.xnamespace,
+            // resource_shop_id: this.resource_shop_id
           }
           if(data.resource_shop_id) delete data.shop_id
           jfbRootExec("getConsumpCode", {

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -187,6 +187,19 @@ export default {
               });
           }
 
+          //获取展示方式
+          if (action === 'adShowGroupType') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
+              .then(res => {
+                loading.close();
+                data.cb(res['ad_show_group'])
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
           //发布
           if (action === 'publish') {
             console.log('publish', data.params)
@@ -248,30 +261,16 @@ export default {
         ]
       },
       {
-        label: '展示位置:',
+        label: '是否开启展示方式过滤:',
         ele: 'xd-radio',
-        valueKey: 'systemType',
+        valueKey: 'is_order_by_show_group',
         groupKey:'content',
-        value: data['systemType'] || 'fuli',
-        placeholder: '请选择展示位置',
+        value: data['is_order_by_show_group'] || 'N',
+        placeholder: '请选择是否开启展示方式过滤',
         className: 'input60',
         list: [
-          { label: '福利系统', value: 'fuli' },
-          { label: 'plus系统', value: 'plus' },
-        ]
-      },
-      data['systemType']==='plus'&&{
-        label: '展示方式:',
-        ele: 'xd-radio',
-        valueKey: 'showGroup',
-        groupKey:'content',
-        value: data['showGroup'] || 'all',
-        placeholder: '请选择展示方式',
-        className: 'input60',
-        list: [
-          { label: '全部用户', value: 'all' },
-          { label: '仅会员', value: 'vip' },
-          { label: '非会员', value: 'notvip' },
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
         ]
       },
       {

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -85,8 +85,7 @@ export default {
       currentIndex: 0,
       contentList: [],
       number: '',
-      systemType: '',
-      showGroup: ''
+      is_order_by_show_group: '',
     };
   },
   watch: {
@@ -129,6 +128,7 @@ export default {
           page_id: this.pageAttr["page_id"], //页面ID
           container_id: this.containerId, //组件ID
           page_size: this.number, //数量
+          is_order_by_show_group: this.is_order_by_show_group
         },
       })
         .then((res) => {
@@ -147,21 +147,7 @@ export default {
               );
             }
             this.currentIndex = 0;
-            if(this.systemType === 'fuli'){
-              this.handlePop();
-            } else {
-              if(this.showGroup==='all') {
-                this.handlePop();
-              } else if(this.showGroup==='vip') {        
-                if(this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP') {
-                  this.handlePop();
-                }
-              } else if(this.showGroup==='notvip'){
-                if(!this.getTokenForKey('user_level')) {
-                  this.handlePop();
-                }
-              }
-            }
+            this.handlePop();
           }
         })
         .catch((error) => {
@@ -190,15 +176,10 @@ export default {
       );
       this.type = getContainerPropsValue(container, "content.type", "pop");
       this.number = getContainerPropsValue(container, "content.number", 1);
-      this.systemType = getContainerPropsValue(
-        container,
-        "content.systemType",
-        "fuli"
-      );
-      this.showGroup = getContainerPropsValue(
+      this.is_order_by_show_group = getContainerPropsValue(
         container,
-        "content.showGroup",
-        "all"
+        "content.is_order_by_show_group",
+        "N"
       );
     },
     handlePop() {