jufubao-food 1.0.15-beta5 → 1.0.15-beta7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.15-beta5",
+  "version": "1.0.15-beta7",
   "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>
@@ -548,9 +548,16 @@
         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){
@@ -1041,6 +1048,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%;
@@ -1349,7 +1360,7 @@
             .prod_specs{
               padding-top: unit(10, rpx);
               display: block;
-              font-size: 28rpx;
+              font-size: 24rpx;
               color: #999999;
               line-height: unit(32, rpx);
             }