jufubao-food 1.0.13-beta1 → 1.0.13-beta3

package/package.json

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

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -655,20 +655,31 @@
           url: curPage.path + '?' + this.$xdUniHelper.jsonToParams(otherParams)
         })
       },
+      p_clearFoodCart(){
+        return new Promise((resolve, reject) => {
+          //清空购物车
+          this.$xdShowLoading({})
+          jfbRootExec("clearFoodCart", {
+            vm: this,
+            data: {
+              namespace: this.xnamespace,
+              shop_id: this.shopInfo.shop_id,
+              consume_mode: this.consume_mode,
+              cart_order_id: this.order_id
+            }
+          }).then(res => {
+            this.$xdHideLoading();
+            resolve(res);
+          }).catch(err => {
+            this.$xdHideLoading();
+            reject(err);
+          })
+        })
+      },
       handleSwitchShop(){
         this.showDialogChangeShop = false;
         //清空购物车
-        this.$xdShowLoading({})
-        jfbRootExec("clearFoodCart", {
-          vm: this,
-          data: {
-            namespace: this.xnamespace,
-            shop_id: this.shopInfo.shop_id,
-            consume_mode: this.consume_mode,
-            cart_order_id: this.order_id
-          }
-        }).then(res => {
-          this.$xdHideLoading();
+        this.p_clearFoodCart().then(res => {
           this.$xdUniHelper.redirectTo({
             url: this.productListPath + '?resource_shop_id=' + this.resource_shop_id,
           })

package/src/components/JfbFoodConfirmV2/orderMixin.js

@@ -196,14 +196,8 @@ export default {
           notify_provider_id: this.projectAttr['notify_provider_id'],
         }
       }).then(async res => {
+        this.p_clearFoodCart();
         successCb({...res, order_id: res.order_id })
-        // setTimeout(() => {
-        //   this.p_getOrderInfo(res, (res1) => {
-        //     successCb(res1)
-        //   });
-        // }, 1000)
-
-        // this.$xdHideLoading()
       }).catch(err => {
         this.$xdHideLoading()
         this.$xdLog.catch(err);

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -70,7 +70,7 @@
                         <view style="display:flex;align-items:center">
                           <CusPrice :isPlus="is_plus_site" :isShowIcon="false" salePriceFontSize="32" :showPrice="item.show_prices"></CusPrice>
                         </view>
-                        <view style="font-size: 28rpx;color:#999">
+                        <view class="p_r" style="font-size: 28rpx;color:#999">
                           <view v-if="item.has_choose" class="chose_spu" @click="toProductDetail(item)">
                             选规格
                             <view v-if="item.num" class="cart_edg">{{ item.num }}</view>
@@ -314,6 +314,8 @@
           num: val,
           category_id: prod.category_id
         }
+        if(prod.product_sku) product.product_sku = prod.product_sku;
+        if(prod.specs) product.specs = prod.specs;
         jfbRootExec("setFoodCartNum", {
           vm: this,
           data: {
@@ -342,7 +344,7 @@
       },
       handleSwitchShop(){
         this.$xdUniHelper.navigateTo({
-          url: this.switchStorePath + "?brand_id=" + this.shopInfo.brand_id,
+          url: this.switchStorePath + "?brand_id=" + this.shopInfo.brand_id + "&resource_shop_id=" + this.resource_shop_id,
         })
       },
       p_getFoodShopDetail(){
@@ -947,6 +949,13 @@
                   display: flex;
                   align-items: flex-end;
                   justify-content: space-between;
+                  position: relative;
+
+                  .p_r{
+                    position: absolute;
+                    right: 0;
+                    bottom: 0;
+                  }
 
                   .icon_add_cart{
                     background-color: var(--main-color);