npm - jufubao-base - Versions diffs - 1.0.300 → 1.0.301-beta1 - Mend

jufubao-base 1.0.300 → 1.0.301-beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/package.json +1 -1
package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue +11 -2

package/package.json CHANGED Viewed

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

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue CHANGED Viewed

@@ -347,8 +347,17 @@
             this.showLocationDialog = false
           }
         }
-        if(this.options.shop_id || this.isPreview){
-          this.shop_id = this.options.shop_id;
+        let xParams = {};
+        if(options['x-params']){
+          let decodeParams = Base64.decode(options['x-params']);
+          decodeParams.split(",").forEach(item => {
+            let paramArr = item.split(":");
+            xParams[paramArr[0]] = paramArr[1];
+          })
+        }
+        let params_shop_id = options.shop_id || xParams['shop_id'] || '';
+        if(params_shop_id || this.isPreview){
+          this.shop_id = params_shop_id;
           this.resource_shop_id = this.options.resource_shop_id;
           let isFirst = true;
           this.p_getAsyncStep((err) => {