jufubao-base 1.0.253 → 1.0.254-beta1

package/package.json

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

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -195,7 +195,8 @@
         jwxSDK: null,
         refresh: true, //onshow是否刷新数据
         showLocationDialog: false,
-        cityPath: ''
+        cityPath: '',
+        resource_shop_id: ''
       }
     },
     watch: {
@@ -252,7 +253,7 @@
       // #endif
     },
     methods: {
-      async onJfbLoad(options) {
+      async onJfbLoad(options) {        
         this.xnamespace = this.projectAttr.business_code
         this.getUserInfo()
         this.options = options
@@ -281,6 +282,7 @@
           }).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;
@@ -291,6 +293,7 @@
           })
         } else {
           this.shop_id = this.options.shop_id;
+          this.resource_shop_id = this.options.resource_shop_id;
           this.p_getAsyncStep();
         }
       },
@@ -372,12 +375,16 @@
       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: {
-              shop_id: this.shop_id,
-              temp_order_id: this.temp_order_id,
-            }
+            data: data
           }).then(res => {
             this.$xdHideLoading();
             this.plusDiscount = res.plus_discount

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -271,6 +271,7 @@ export default {
         list: [
           { label: '全部用户', value: 'all' },
           { label: '仅会员', value: 'vip' },
+          { label: '非会员', value: 'notvip' },
         ]
       },
       {

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -152,10 +152,14 @@ export default {
             } else {
               if(this.showGroup==='all') {
                 this.handlePop();
-              }else {        
+              } 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();
+                }
               }
             }
           }