jufubao-food 1.0.12-beta12 → 1.0.12-beta14

package/package.json

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

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -94,6 +94,12 @@
           <xd-unit :price="orderInfo.product_total_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
         </xd-list-item>
       </view>
+      <view v-if="isShowPlusSaveMoney" class="section">
+        <xd-list-item label="" paddingLR="60rpx" size="small">
+          <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>
       
       <view class="section">
         <template v-for="item in otherPayMethod">
@@ -215,8 +221,8 @@
           </view>
         </view>
         <view slot="btn" style="display: flex;margin-top: 40rpx;">
-          <xd-button type="info" size="small" @click="handleChangeStop">更换门店</xd-button>
-          <xd-button type="primary" size="small" style="margin-left: 40rpx;" @click="handleCreatePayConfirm">就是这家</xd-button>
+          <xd-button v-if="shopInfo.is_switch_shop==='Y'"  style="margin-right: 40rpx;"type="info" size="small" @click="handleChangeStop">更换门店</xd-button>
+          <xd-button type="primary" size="small" @click="handleCreatePayConfirm">就是这家</xd-button>
         </view>
       </XdDailog>
 
@@ -247,6 +253,7 @@
   import XdWalletChose from "@/components/XdWalletChose/XdWalletChose"
   import CusCouponChose from '@/components/CusCouponChose/CusCouponChose'
   import XdDailog from "@/components/XdDailog/XdDailog"
+  import CusVipList from "@/components/CusVipList/CusVipList"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbFoodConfirmV2Mixin from "./JfbFoodConfirmV2Mixin";
   import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
@@ -265,13 +272,15 @@
       XdCardPayChose,
       XdWalletChose,
       CusCouponChose,
-      XdDailog
+      XdDailog,
+      CusVipList
     },
     mixins: [
       componentsMixins, extsMixins, JfbFoodConfirmV2Mixin, OrderMixin
     ],
     data() {
       return {
+        isVip: false,
         options: {},
         consume_mode: "",
         order_id: "", //订单ID
@@ -399,6 +408,11 @@
         let result = this.$xdUniHelper.cutFloatNumber(total_amount, total);
         return result;
       },
+      //是否展示vip减免
+      isShowPlusSaveMoney(){
+        if(this.is_show_vip_card_list === 'Y') return this.vip_card_id;
+        else return this.isVip && this.plus_saving_money;
+      },
     },
     watch: {
       container(value, oldValue) {
@@ -409,7 +423,7 @@
     created() {
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
       this.init(this.container);
-
+      this.isVip = this.getTokenForKey('user_level') === 'VIP';
       //todo
     },
     methods: {
@@ -527,7 +541,7 @@
         if(!this.meal_method && mealMethods.length){
           this.meal_method = mealMethods[0].value;
         }
-        this.plus_saving_money = res.plus_saving_money || 0;
+        this.plus_saving_money = res.order_info.plus_saving_money || 0;
         this.main_order_id = res.order_info.main_order_id
 
         //支付方式跟用户相关，与订单无关。
@@ -766,7 +780,7 @@
           return false;
         }
         return {
-          phone: this.buyer_phone_number,
+          buyer_phone_number: this.buyer_phone_number,
           comment: this.comment,
           meal_method: this.meal_method,
         };

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -78,7 +78,7 @@
                           <view v-else>
                             <xd-number v-if="item.num" v-model="item.num" circle @change="val => handleCartNumChange(val, item)"></xd-number>
                             <!-- <xd-font-icon v-else icon="iconaddcart" :color="mainColor" size="46"></xd-font-icon> -->
-                            <view class="icon_add_cart" v-else @click="handleCartNumChange(1, item)">+</view>
+                            <view class="icon_add_cart" v-else @click="toProductDetail(item)">+</view>
                           </view>
                         </view>
                       </view>