jufubao-food 1.0.15-beta15 → 1.0.15-beta17

package/package.json

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

package/src/components/JfbFoodProductInfo/JfbFoodProductInfo.vue

@@ -116,6 +116,7 @@
         consume_mode: "",
         category_id: "",
         specsPrice: 0,
+        xnamespace: "",
 
         baseInfo: null,
         images: [],
@@ -222,6 +223,7 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
         this.foodProductListPath = getContainerPropsValue(container, 'content.foodProductListPath', {value: ""}).value;
         this.shopBtnBgColor = gCPVal(container, 'shopBtnBgColor', this.mainColor, {sKey:'cartBtnStatus',fields:['shopBtnBgColor']});
         this.showDiscount = gCPVal(container, 'showDiscount', "Y");

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -200,7 +200,7 @@
       </xd-down-drawer>
       <view v-if="showEmptyShop" class="empty_shop">
         <xd-no-data :scaleSize="2"  iconType="shop">附近暂无门店</xd-no-data>
-        <view class="empty_chose_btn" @click="handleSwitchShop">选择其他门店 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
+        <view class="empty_chose_btn" @click="handleSwitchCity">选择其他城市 <xd-font-icon icon="iconxiangyou_xian" :size="24"></xd-font-icon></view>
       </view>
     </view>
   </view>
@@ -238,6 +238,7 @@
     ],
     data() {
       return {
+        pageOptions: {},
         closeMask: true,
         isPreview: false,
         resource_shop_id: "",
@@ -305,6 +306,7 @@
         foodDetailPath: "",
         confirmPath: "",
         switchStorePath: "",
+        switchCityPath: "",
       }
     },
     computed: {
@@ -427,6 +429,11 @@
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
         if (this.$configProject['isPreview']) this.init(value)
       },
+      stateCity(n, o) {
+        if(n && JSON.stringify(n) !== JSON.stringify(o)){
+          this.onJfbLoad(this.pageOptions);
+        }
+      }
     },
     created() {
       this.init(this.container);
@@ -436,6 +443,7 @@
     },
     methods: {
       onJfbLoad(options) {
+        this.pageOptions = options;
         this.setNameSpace(options);
         this.resource_shop_id = options.resource_shop_id;
         this.consume_mode = options.consume_mode || 'HDSELF';
@@ -459,6 +467,7 @@
         this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: ""}).value;
         this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: ""}).value;
         this.switchStorePath = getContainerPropsValue(container, 'content.switchStorePath', { value: ''}).value;
+        this.switchCityPath = getContainerPropsValue(container, 'content.switchCityPath', { value: ''}).value;
         this.showDiscount = gCPVal(container, 'showDiscount', "Y");
         this.differ = gCPVal(container, 'differ', 1);
 
@@ -555,6 +564,11 @@
         }
         this.showTakeoutShop = true;
       },
+      handleSwitchCity(){
+        this.$xdUniHelper.navigateTo({
+          url: this.switchCityPath
+        })
+      },
       handleSwitchShop(){
         //切换门店
         let curPage = this.$xdUniHelper.getCurrentPages();
@@ -592,6 +606,7 @@
           }
         }).then(res => {
           if(res.list && res.list.length > 0){
+            this.showEmptyShop = false;
             this.shopList = res.list;
             if(loadFirstShop){
               this.curShopIndex = 0;

package/src/components/JfbFoodProductList/cusAttr/advanced.js

@@ -41,6 +41,19 @@ export default (data)=>{
       groupKey:'advanced',
       className: 'input100',
     },
+    {
+      label: '切换城市',
+      ele: 'xd-select-pages-path',
+      valueKey: 'switchCityPath',
+      placeholder: '请选择切换城市跳转地址',
+      value: data.switchCityPath || null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      labelInline: true,
+      groupKey:'advanced',
+      className: 'input100',
+    },
 
     {
       label: '版本号:',