jufubao-base 1.0.254-beta2 → 1.0.254

package/package.json

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

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -195,8 +195,7 @@
         jwxSDK: null,
         refresh: true, //onshow是否刷新数据
         showLocationDialog: false,
-        cityPath: '',
-        resource_shop_id: ''
+        cityPath: ''
       }
     },
     watch: {
@@ -253,7 +252,7 @@
       // #endif
     },
     methods: {
-      async onJfbLoad(options) {        
+      async onJfbLoad(options) {
         this.xnamespace = this.projectAttr.business_code
         this.getUserInfo()
         this.options = options
@@ -282,7 +281,6 @@
           }).then(res => {
             if (res && res.list.length > 0) {
               this.shop_id = res.list[0].shop_id;
-              this.resource_shop_id = res.list[0].resource_shop_id;
               this.shopName = res.list[0].resource_shop_name;
               this.showMask = true;
               this.showDialog = true;
@@ -293,7 +291,6 @@
           })
         } else {
           this.shop_id = this.options.shop_id;
-          this.resource_shop_id = this.options.resource_shop_id;
           this.p_getAsyncStep();
         }
       },
@@ -375,16 +372,12 @@
       p_getQuickPayQRCode() {
         return new Promise((resolve, reject) => {
           this.$xdShowLoading({});
-          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
-          }
-          if(data.resource_shop_id) delete data.shop_id
           jfbRootExec("getConsumpCode", {
             vm: this,
-            data: data
+            data: {
+              shop_id: this.shop_id,
+              temp_order_id: this.temp_order_id,
+            }
           }).then(res => {
             this.$xdHideLoading();
             this.plusDiscount = res.plus_discount

package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlay.vue

@@ -20,7 +20,6 @@
         <iframe frameborder="0" v-if="iframe" :src="iframe" class="jfb-base-map-overlay__body-iframe"></iframe>
         <xd-baidu-overlay v-else :defaultOverlays="overlays" :level="11"></xd-baidu-overlay>
       </template>
-
       <!-- #endif -->
       <!-- #ifdef MP -->
       <xd-map-overlay :defaultOverlays="overlays" :level="11"></xd-map-overlay>
@@ -114,25 +113,27 @@
           if(res['is_ifream'] === 'Y') {
             // #ifdef MP
             if(!res.url){
-              return this.$xdAlert({
+              this.$xdAlert({
                 content: 'URL不存在',
                 time: 2500,
                 isClose: false,
                 zIndex: 5000
               });
+              return;
             }
             this.$xdUniHelper.redirectTo({
-              url: url,
+              url: res.url,
             })
             // #endif
             // #ifdef H5
             this.iframe = res.url
             // #endif
           }
+          //本页面打开
           else{
             this.overlays = res.data;
+            this.loaded = true;
           }
-          this.loaded = true;
         })
       },
       gcj02tobd09(lng, lat) {

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -187,19 +187,6 @@ 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)
@@ -261,16 +248,29 @@ export default {
         ]
       },
       {
-        label: '是否开启展示方式过滤:',
+        label: '展示位置:',
         ele: 'xd-radio',
-        valueKey: 'is_order_by_show_group',
+        valueKey: 'systemType',
         groupKey:'content',
-        value: data['is_order_by_show_group'] || 'N',
-        placeholder: '请选择是否开启展示方式过滤',
+        value: data['systemType'] || 'fuli',
+        placeholder: '请选择展示位置',
         className: 'input60',
         list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
+          { 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' },
         ]
       },
       {

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -85,7 +85,8 @@ export default {
       currentIndex: 0,
       contentList: [],
       number: '',
-      is_order_by_show_group: '',
+      systemType: '',
+      showGroup: ''
     };
   },
   watch: {
@@ -128,7 +129,6 @@ 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,7 +147,17 @@ export default {
               );
             }
             this.currentIndex = 0;
-            this.handlePop();
+            if(this.systemType === 'fuli'){
+              this.handlePop();
+            } else {
+              if(this.showGroup==='all') {
+                this.handlePop();
+              }else {        
+                if(this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP') {
+                  this.handlePop();
+                }
+              }
+            }
           }
         })
         .catch((error) => {
@@ -176,10 +186,15 @@ export default {
       );
       this.type = getContainerPropsValue(container, "content.type", "pop");
       this.number = getContainerPropsValue(container, "content.number", 1);
-      this.is_order_by_show_group = getContainerPropsValue(
+      this.systemType = getContainerPropsValue(
         container,
-        "content.is_order_by_show_group",
-        "N"
+        "content.systemType",
+        "fuli"
+      );
+      this.showGroup = getContainerPropsValue(
+        container,
+        "content.showGroup",
+        "all"
       );
     },
     handlePop() {