jufubao-food 1.0.15-beta4 → 1.0.15-beta6

package/package.json

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

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -17,7 +17,7 @@
     <!-- #endif -->
     <view class="jfb-food-product-list__body" :style="[bodyStyleComp]">
       <view v-if="shopInfo">
-        <view class="shop_info" :style="{top: layoutInfo.top+'rpx'}" @click="toSwitchShopPage">
+        <view class="shop_info" :style="{top: layoutInfo.top+'rpx'}" @click="handleSwitchShop">
           <view class="flex-center">
             <xd-font-icon icon="icona-Buy2"  size="36" style="margin-right: 8rpx;"></xd-font-icon>
             <view class="shop_name">{{ shopInfo.shop_name }}</view><text style="margin:0 20rpx;">|</text> <text class="_distance">{{ shopInfo.distance }}</text>
@@ -269,7 +269,7 @@
         scrollTopTimer: null,
         brand_id: "",
         shopList: [],
-        curShopIndex: 0,
+        curShopIndex: -1,
 
         //商品列表
         column_num: 1,
@@ -437,7 +437,11 @@
         this.resource_shop_id = options.resource_shop_id;
         this.consume_mode = options.consume_mode || 'HDSELF';
         this.brand_id = options.brand_id;
-        this.p_getFoodShopList();
+        if(this.resource_shop_id){
+          this.p_getFoodShopDetail(this.resource_shop_id);
+        }else if(this.brand_id){
+          this.p_getFoodShopList();
+        }
       },
       /**
        * @description 监听事件变化
@@ -538,6 +542,9 @@
         })
       },
       toSwitchShopPage(){
+        if(this.shopList.length===0){
+          this.p_getFoodShopList(false);
+        }
         this.showTakeoutShop = true;
       },
       handleSwitchShop(){
@@ -552,7 +559,7 @@
         }
         this.showTakeoutShop = false;
       },
-      p_getFoodShopList(){
+      p_getFoodShopList(loadFirstShop=true){
         jfbRootExec("getFoodShopList", {
           vm: this,
           data: {
@@ -566,8 +573,13 @@
         }).then(res => {
           if(res.list && res.list.length > 0){
             this.shopList = res.list;
-            this.curShopIndex = 0;
-            this.p_getFoodShopDetail();
+            if(loadFirstShop){
+              this.curShopIndex = 0;
+              this.p_getFoodShopDetail();
+            }else{
+              let findShopIndex = this.shopList.findIndex(item => item.resource_shop_id == this.resource_shop_id);
+              this.curShopIndex = findShopIndex;
+            }
             if(!this.$configProject['isPreview']){
               this.showTakeoutShop = true;
             }
@@ -576,13 +588,13 @@
           }
         })
       },
-      p_getFoodShopDetail(){
+      p_getFoodShopDetail(resource_shop_id){
         let curShop = this.shopList[this.curShopIndex];
         jfbRootExec("getFoodShopDetail", {
           vm: this,
           data: {
             xnamespace: this.xnamespace,
-            resource_shop_id: curShop.resource_shop_id,
+            resource_shop_id: resource_shop_id || curShop.resource_shop_id,
             consume_mode: this.consume_mode,
             latitude: this.stateLocation.latitude,
             longitude: this.stateLocation.longitude,