jufubao-food 1.0.15-beta13 → 1.0.15-beta15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.15-beta13",
+  "version": "1.0.15-beta15",
   "private": false,
   "description": "聚福宝业务组件餐饮插件包",
   "main": "index.js",

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -455,6 +455,7 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
         this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: ""}).value;
         this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: ""}).value;
         this.switchStorePath = getContainerPropsValue(container, 'content.switchStorePath', { value: ''}).value;
@@ -559,8 +560,11 @@
         let curPage = this.$xdUniHelper.getCurrentPages();
         let query = {...curPage.query};
         let callback= Base64.encode(curPage.path + '?' + this.$xdUniHelper.jsonToParams(query));
+        let linkQuery = '?brand_id=' + (this.brand_id || this.shopInfo.brand_id);
+        let rShopId = this.shopInfo.resource_shop_id || this.resource_shop_id;
+        linkQuery = rShopId ? linkQuery + '&resource_shop_id=' + rShopId : linkQuery;
         this.$xdUniHelper.redirectTo({
-          url: this.switchStorePath + '?brand_id=' + (this.brand_id || this.shopInfo.brand_id) + '&callback=' + callback
+          url: this.switchStorePath + linkQuery + '&callback=' + callback
         })
         // this.$xdUniHelper.navigateTo({
         //   url: this.switchStorePath + "?brand_id=" + this.brand_id + "&resource_shop_id=" + this.resource_shop_id,