jufubao-food 1.0.15-beta4 → 1.0.15-beta51

package/package.json

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

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -98,7 +98,7 @@
       </view>
       <view v-if="isShowPlusSaveMoney" class="section">
         <xd-list-item label="" paddingLR="60rpx" size="small">
-          <view slot="label" style="color: #86541E;">PLUS专享立减</view>
+          <view slot="label" style="color: #86541E;">PLUS会员立减</view>
           <xd-unit :price="-plus_saving_money" :largeZero="false" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
         </xd-list-item>
       </view>

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,15 @@
         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.$configProject['isPreview']){
+          this.p_getFoodShopList();
+        }else{
+          this.$xdAlert({
+            content: '请配置品牌ID',
+          })
+        }
       },
       /**
        * @description 监听事件变化
@@ -538,12 +546,22 @@
         })
       },
       toSwitchShopPage(){
+        if(this.shopList.length===0){
+          this.p_getFoodShopList(false);
+        }
         this.showTakeoutShop = true;
       },
       handleSwitchShop(){
-        this.$xdUniHelper.navigateTo({
-          url: this.switchStorePath + "?brand_id=" + this.brand_id + "&resource_shop_id=" + this.resource_shop_id,
+        //切换门店
+        let curPage = this.$xdUniHelper.getCurrentPages();
+        let query = {...curPage.query};
+        let callback= Base64.encode(curPage.path + '?' + this.$xdUniHelper.jsonToParams(query));
+        this.$xdUniHelper.redirectTo({
+          url: this.switchStorePath + '?brand_id=' + this.brand_id + '&callback=' + callback
         })
+        // this.$xdUniHelper.navigateTo({
+        //   url: this.switchStorePath + "?brand_id=" + this.brand_id + "&resource_shop_id=" + this.resource_shop_id,
+        // })
       },
       setCurShop(index){
         if(this.curShopIndex !== index){
@@ -552,7 +570,7 @@
         }
         this.showTakeoutShop = false;
       },
-      p_getFoodShopList(){
+      p_getFoodShopList(loadFirstShop=true){
         jfbRootExec("getFoodShopList", {
           vm: this,
           data: {
@@ -566,8 +584,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 +599,13 @@
           }
         })
       },
-      p_getFoodShopDetail(){
-        let curShop = this.shopList[this.curShopIndex];
+      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,
@@ -1029,6 +1052,10 @@
   .jfb-food-product-list {
     &__body{
       background-color: #FFFFFF;
+      ::v-deep .xd-up-drawer__warper{
+        border-radius: 24rpx 24rpx 0 0 !important;
+        overflow: hidden;
+      }
       .empty_shop{
         background-color: #FFFFFF;
         height: 100%;
@@ -1337,7 +1364,7 @@
             .prod_specs{
               padding-top: unit(10, rpx);
               display: block;
-              font-size: 28rpx;
+              font-size: 24rpx;
               color: #999999;
               line-height: unit(32, rpx);
             }