jufubao-food 1.0.12-beta9 → 1.0.13-beta1

package/package.json

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

package/src/components/JfbFoodConfirmV2/Api.js

@@ -15,11 +15,25 @@ module.exports = [
       cart_order_id: ['cart_order_id', 'String', true],
       delivery_method: ['投递方式', 'String', false],
       blessings: ['祝福语', 'String', false],
-      subscribeTimeInfo: ['配送时间', 'String', false]
+      subscribeTimeInfo: ['配送时间', 'String', false],
+      switch_resource_shop_id: ['切换门店的资源id', 'String', false]
     },
     isConsole: true,
     disabled: true
   },
+  {
+    title: "购物车 - 清空购物车",
+    path: "/hourdash/v1/:xnamespace/:shop_id/cart/clear",
+    mapFnName: "clearFoodCart",
+    data: {
+      xnamespace: ["命名空间", "String", "必选"],
+      shop_id: ["门店id", "String", "必选"],
+      consume_mode: ["消费模式", "String", "必选"],
+      cart_order_id: ["购物车订单id", "String", "必选"]
+    },
+    isConsole: true,
+    disabled: true,
+  },
   {
     mapFnName: 'getFoodCardList',
     title: '展示可选卡列表',

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -18,7 +18,7 @@
     <view class="jfb-food-confirm-v-2__body" :style="[bodyStyleComp]">
       <view class="section">
         <view class="delivery_wrap">
-          <view class="shop_wrap" @click="handleSwitchShop">
+          <view class="shop_wrap" @click="toSwitchShop">
             <view class="shop_info">
               <view class="_name"><xd-font-icon icon="iconshouye" :color="mainColor" size="36" style="margin-right: 8rpx;"></xd-font-icon>{{ shopInfo.shop_name }}</view>
               <view class="_dist">{{ shopInfo.distance_conversion}}
@@ -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>
 
@@ -229,7 +235,7 @@
           </view>
         </view>
         <view slot="btn" style="display: flex;margin-top: 40rpx;">
-          <xd-button type="info" size="small" @click="showDialogChangeShop=false">放弃更换</xd-button>
+          <xd-button type="info" size="small" @click="giveUpChange">放弃更换</xd-button>
           <xd-button type="primary" size="small" style="margin-left: 40rpx;" @click="handleSwitchShop">继续更换</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,17 @@
       XdCardPayChose,
       XdWalletChose,
       CusCouponChose,
-      XdDailog
+      XdDailog,
+      CusVipList
     },
     mixins: [
       componentsMixins, extsMixins, JfbFoodConfirmV2Mixin, OrderMixin
     ],
     data() {
       return {
+        isVip: false,
+        options: {},
+        consume_mode: "",
         order_id: "", //订单ID
         comment: "", //订单备注
         buyer_phone_number: "", //订购人手机号
@@ -287,6 +298,7 @@
         vip_card_id: "",
         plus_saving_money: 0,
         main_order_id: "",
+        resource_shop_id: "",
         
         showDialogConfirmShop: false,
         showDialogChangeShop: false,
@@ -331,6 +343,7 @@
         payPath: "",
         paySuccessPath: "",
         switchStorePath: "",
+        productListPath: "",
       }
     },
     computed: {
@@ -395,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) {
@@ -405,13 +423,17 @@
     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: {
       async onJfbLoad(options) {
+        this.options = options || {};
         this.setNameSpace(options);
+        this.consume_mode = options.consume_mode || 'HDSELF';
         this.order_id = options.order_id || '';
+        this.resource_shop_id = options.resource_shop_id || '';
+        this.main_order_id = options.main_order_id || '';
         await this.p_getCartConfirm();
         this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
         // #ifdef H5
@@ -439,6 +461,7 @@
         this.payPath = getContainerPropsValue(container, 'content.payPath', { value: "/system/system/pay" }).value;
         this.paySuccessPath = getContainerPropsValue(container, 'content.paySuccessPath', {value: "/system/order/success"}).value;
         this.switchStorePath = getContainerPropsValue(container, 'content.switchStorePath',{value: ""}).value;
+        this.productListPath = getContainerPropsValue(container, 'content.productListPath', {value: ""}).value;
 
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
         this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
@@ -487,7 +510,8 @@
               longitude: this.stateLocation.longitude,
               card_id: this.vip_card_id,
               meal_method: this.meal_method,
-              main_order_id: this.main_order_id
+              main_order_id: this.main_order_id,
+              switch_resource_shop_id: this.resource_shop_id
             }
           }).then(res => {
             this.$xdHideLoading();
@@ -499,6 +523,10 @@
         },150)
       },
       handlerConfirmRes(res){
+        //更换门店后，价格有变动
+        if(res.is_price_change === 'Y'){
+          this.showDialogChangeShop = true;
+        }
         // this.is_first_use_card = res.is_first_use_card || "Y";
         // this.is_use_jfb_pay = res.is_use_jfb_pay || "Y";
         this.is_show_vip_card_list = res.is_show_vip_card_list;
@@ -513,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
 
         //支付方式跟用户相关，与订单无关。
@@ -606,15 +634,49 @@
           duration: 0
         })
       },
+      toSwitchShop(){
+        if(this.shopInfo.is_switch_shop !== 'Y') return;
+
+        //切换门店
+        let curPage = this.$xdUniHelper.getCurrentPages();
+        let query = {...curPage.query};
+        if(this.main_order_id) query.main_order_id = this.main_order_id;
+        let callback= Base64.encode(curPage.path + '?' + this.$xdUniHelper.jsonToParams(query));
+        this.$xdUniHelper.redirectTo({
+          url: this.switchStorePath + '?brand_id=' + this.shopInfo.brand_id + '&callback=' + callback
+        })
+      },
+      //放弃更换
+      giveUpChange(){
+        this.showDialogChangeShop = false;
+        let curPage = this.$xdUniHelper.getCurrentPages();
+        let {resource_shop_id, ...otherParams} = curPage.query;
+        this.$xdUniHelper.redirectTo({
+          url: curPage.path + '?' + this.$xdUniHelper.jsonToParams(otherParams)
+        })
+      },
       handleSwitchShop(){
         this.showDialogChangeShop = false;
-        this.$xdUniHelper.navigateTo({
-          url: this.switchStorePath + '?brand_id=' + this.shopInfo.brand_id,
+        //清空购物车
+        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.$xdUniHelper.redirectTo({
+            url: this.productListPath + '?resource_shop_id=' + this.resource_shop_id,
+          })
         })
       },
       handleChangeStop(){
-        this.showDialogChangeShop = true;
         this.showDialogConfirmShop = false;
+        this.toSwitchShop();
       },
       async handleCardPay(){
         if(!this.getCreateOrderParams()) return false;
@@ -718,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/JfbFoodConfirmV2/cusAttr/advanced.js

@@ -41,6 +41,19 @@ export default (data)=>{
       groupKey:'advanced',
       className: 'input100',
     },
+    {
+      label: '商品列表',
+      ele: 'xd-select-pages-path',
+      valueKey: 'productListPath',
+      placeholder: '请选择商品列表页跳转地址',
+      value: data.productListPath || null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      labelInline: true,
+      groupKey:'advanced',
+      className: 'input100',
+    },
 
     {
       label: '版本号:',

package/src/components/JfbFoodProductInfo/JfbFoodProductInfo.vue

@@ -35,7 +35,7 @@
       <view class="prod_title_number">
         <view class="prod_title">{{ baseInfo.product_name }}</view>
         <view class="prod_number">
-          <xd-number v-model="number" :min="1" :max="99"></xd-number>
+          <xd-number v-model="number" :min="1" :max="99" circle></xd-number>
         </view>
       </view>
 
@@ -53,7 +53,7 @@
       <view class="fixed_bottom" :style="prod_bottom">
          <view class="prod_bottom_body">
           <view class="">
-            <CusPrice :isPlus="is_plus_site" type="order" :showPrice="productShowPrice"></CusPrice>
+            <CusPrice :isPlus="is_plus_site" type="order" salePriceFontSize="32" :showPrice="productShowPrice"></CusPrice>
           </view>
           <view class="btns" :style="[bottomBtnWrapStyle]">
             <xd-button
@@ -125,6 +125,9 @@
 
         is_plus_site: false,
         //面板
+        isShowDiscount: "Y",  //是否展示划线价
+        differ: 1,  //原价与现价的差值
+
         shopBtnBgColor: "",
         bottomBtnRadius: "100",
         bottomBtnHeight: "",
@@ -174,6 +177,7 @@
         return style;
       },
       productShowPrice(){
+        if(this.curSku && this.curSku.show_prices) return this.curSku.show_prices;
         let originPrice = JSON.parse(JSON.stringify(this.baseInfo.show_prices));
         return originPrice.map(item => {
           let p = item.p + this.specsPrice;
@@ -236,7 +240,8 @@
             product_id: this.product_id,
             category_id: this.category_id,
             consume_mode: this.consume_mode,
-            shop_id: this.shop_id
+            shop_id: this.shop_id,
+            is_show_uprice: this.isShowDiscount !== 'Y' ? 0 : this.multiply(this.differ),
           }
         }).then(res => {
           this.$xdHideLoading()
@@ -249,6 +254,9 @@
           this.$xdHideLoading()
         })
       },
+      multiply(num){
+        return this.$xdUniHelper.multiplyFloatNumber(num, 100);
+      },
       addCart(){
         let specs = [];
         if(this.$refs['mySpu']){

package/src/components/JfbFoodProductInfo/XdSku.vue

@@ -146,7 +146,7 @@ export default {
         let isExt = true;
         let standards = item.standards;
         checkedList.forEach((o1,ii) => {
-            let standItem = standards[ii];
+            let standItem = standards.find(stand => stand.name === o1.name);
             if(o1.value != standItem.value){
                 isExt = false;
             }
@@ -157,6 +157,7 @@ export default {
         this.currSku = rtList[0];
       }
     },
+
     checkHasProduct(i, ii){
       let curSku = this.skuList[i];
       let curStands = curSku.values[ii];

package/src/components/JfbFoodProductInfo/XdSpu.vue

@@ -10,9 +10,10 @@
           <image class="spec_img" :src="opt.image" mode=""></image>
           <view class="spec_main">
             <view class="spec_name">{{ opt.name }}</view>
-            <view class="spec_price">
+            <view v-if="item.showPrice" class="spec_price">
               <template v-if="opt.price">+{{ opt.price/100 }}元</template>
             </view>
+            <view v-else style="height: 16rpx;"></view>
             <view v-if="item.multiple" class="spec_num" @click.stop>
               <!-- <xd-number v-if="!checkIsDisabled(i, ii)" width="160" v-model="opt.num" :min="0" :max="99" @change="val => handleSpeNum(val, i, ii)"></xd-number> -->
               <view v-if="!checkIsDisabled(i, ii)" class="num_box">
@@ -76,10 +77,13 @@ export default {
     list: {
       handler(val){
         this.uiList = val.map(item => {
+          let showPrice = false;
           item.values = item.values.map(opt => {
             if(!opt.checked) opt.num = 0;
+            if(opt.price > 0) showPrice = true;
             return opt;
           })
+          item.showPrice = showPrice;
           return item;
         });
       },
@@ -213,6 +217,7 @@ export default {
       }
 
       .specs_img_item{
+        width: 212rpx;
         border: 1px solid #F8F8F8;
         border-radius: 8rpx;
         display: flex;
@@ -260,6 +265,9 @@ export default {
         }
         .spec_name{
           margin-top: 16rpx;
+          width: 100%;
+          text-align: center;
+          padding: 0 8rpx;
         }
         .spec_price{
           height: 28rpx;

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -68,7 +68,7 @@
                       <view class="prod_specs" v-if="item.sub_name">{{item.sub_name}}</view>
                       <view class="prod_price">
                         <view style="display:flex;align-items:center">
-                          <CusPrice :isPlus="is_plus_site" :isShowIcon="false" :showPrice="item.show_prices"></CusPrice>
+                          <CusPrice :isPlus="is_plus_site" :isShowIcon="false" salePriceFontSize="32" :showPrice="item.show_prices"></CusPrice>
                         </view>
                         <view style="font-size: 28rpx;color:#999">
                           <view v-if="item.has_choose" class="chose_spu" @click="toProductDetail(item)">
@@ -76,8 +76,9 @@
                             <view v-if="item.num" class="cart_edg">{{ item.num }}</view>
                           </view>
                           <view v-else>
-                            <xd-number v-if="item.num" v-model="item.num" @change="val => handleCartNumChange(val, item)"></xd-number>
-                            <xd-font-icon v-else icon="iconaddcart" :color="mainColor" size="46"></xd-font-icon>
+                            <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="toProductDetail(item)">+</view>
                           </view>
                         </view>
                       </view>
@@ -106,7 +107,8 @@
           <xd-unit :price="cartPrice" :isOld="false"></xd-unit>
         </view>
         <view>
-          <xd-button width="170rpx" size="small" type="primary" :disabled="!cartProductList.length" @click="handleSubmitCart">选好了</xd-button>
+          <xd-button v-if="cartProductList.length" width="170rpx" size="small" type="primary" @click="handleSubmitCart">选好了</xd-button>
+          <xd-button v-else width="170rpx" size="small" type="primary" :disabled="true">选好了</xd-button>
         </view>
       </view>
       <view class="cart_product_modal" v-if="cartProductShow">
@@ -136,7 +138,7 @@
                     <CusPrice :isPlus="is_plus_site" type="order" :showPrice="prod.show_prices"></CusPrice>
                   </view>
                   <view style="font-size: 28rpx;color:#999">
-                    <xd-number v-model="prod.num" @change="val => handleCartNumChange(val, prod)"></xd-number>
+                    <xd-number circle v-model="prod.num" @change="val => handleCartNumChange(val, prod)"></xd-number>
                   </view>
                 </view>
               </view>
@@ -210,6 +212,7 @@
         cartPrice: 0,
         cartCount: 0,
         cartProductShow: false,
+        scrollTopTimer: null,
 
         //商品列表
         column_num: 1,
@@ -227,6 +230,8 @@
         is_plus_site: false,
 
         //面板
+        isShowDiscount: "Y",  //是否展示划线价
+        differ: 1,  //原价与现价的差值
         foodDetailPath: "",
         confirmPath: "",
         switchStorePath: "",
@@ -304,13 +309,18 @@
       },
       handleCartNumChange(val, prod){
         console.log("handleCartNumChange", val, prod)
+        let product = {
+          product_id: prod.product_id,
+          num: val,
+          category_id: prod.category_id
+        }
         jfbRootExec("setFoodCartNum", {
           vm: this,
           data: {
             xnamespace: this.xnamespace,
             shop_id: this.shopInfo.shop_id,
             consume_mode: this.consume_mode,
-            product: prod
+            product: product
           }
         }).then(res => {
           this.p_getFoodCartCount();
@@ -375,6 +385,7 @@
       },
       //获取门店分类信息
       p_getFoodShopCategory(){
+        this.$xdShowLoading({})
         jfbRootExec("getFoodShopCategory", {
           vm: this,
           data: {
@@ -383,6 +394,7 @@
             consume_mode: this.consume_mode
           }
         }).then(res => {
+          this.$xdHideLoading();
           this.categoryList = res.categories.map(item => {
             item.productList = [];
             return item;
@@ -393,6 +405,10 @@
           }
         })
       },
+      // this.$xdUniHelper.multiplyFloatNumber(res.total_price, 1);
+      multiply(num){
+        return this.$xdUniHelper.multiplyFloatNumber(num, 100);
+      },
       getList(options = {}){
         return new Promise((resolve, reject) => {
           jfbRootExec("getFoodProductList", {
@@ -404,6 +420,7 @@
               page_token: options.page_token || 1,
               page_size: this.page_size,
               category_id: options.category_id,
+              is_show_uprice: this.isShowDiscount !== 'Y' ? 0 : this.multiply(this.differ),
               ...options,
             }
           }).then(res => {
@@ -450,7 +467,7 @@
         return new Promise((resolve,reject) => {
           this.getList(options).then(async res => {
             this.$xdHideLoading();
-            if(res.total_size < 3){
+            if(res.total_size <= 5){
               await this.loadNextCateProduct(this.loadCateIndex)
             }
             this.$nextTick(() => {
@@ -466,18 +483,17 @@
           })
         })
       },
-      setCategoryRect(){
-        console.log("setCategoryRect")
+      async setCategoryRect(){
         const query = uni.createSelectorQuery().in(this);
-        this.categoryList = this.categoryList.map(cate => {
+
+        for(let i = 0; i < this.categoryList.length; i++){
+          let cate = this.categoryList[i];
           let id = this.getID(cate);
-          query.select('#'+id).boundingClientRect(data => {
-            cate.height = data.height;
-          }).exec();
-          return cate;
-        })
+          let cateHeight = await this.syncGetEleHeight('#' + id);
+          this.$set(this.categoryList[i], 'height', cateHeight);
+        }
+
         query.select(".product_scroll").boundingClientRect(data => {
-          console.log(data, "product_scroll categoryList");
           this.scrollBoxHeight = data.height;
         }).exec();
 
@@ -488,6 +504,14 @@
           return item;
         })
       },
+      syncGetEleHeight(ele){
+        return new Promise((resolve, reject) => {
+          this.$xdUniHelper.getWindowHeight([ele], this).then(res => {
+            console.log(res);
+            resolve(res[ele].height);
+          })
+        })
+      },
       getID(cate) {
         return `category_${cate.category_id}`;
       },
@@ -511,7 +535,10 @@
       handleScroll(e){
         // console.log(e, 'handleScroll')
         let scrollTop = e.detail.scrollTop;
-        this.prodScrollTop = scrollTop;
+        if(this.scrollTopTimer) clearTimeout(this.scrollTopTimer);
+        this.scrollTopTimer = setTimeout(()=>{
+          this.prodScrollTop = scrollTop;
+        },50)
         //手动点击tab定位不触发
         if(!this.pointerScroll) return false;
         if(this.lastScrollTop > scrollTop){
@@ -920,6 +947,20 @@
                   display: flex;
                   align-items: flex-end;
                   justify-content: space-between;
+
+                  .icon_add_cart{
+                    background-color: var(--main-color);
+                    border: 1px solid var(--main-color);
+                    border-radius: 50%;
+                    color: #FFFFFF;
+                    font-size: 28rpx;
+                    width: 48rpx;
+                    height: 48rpx;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+                  }
                 }
               }
             }