jufubao-food 1.0.12 → 1.0.13-beta2

package/package.json

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

package/src/components/JfbFoodProductInfo/JfbFoodProductInfo.vue

@@ -177,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;

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/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>
@@ -107,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">
@@ -137,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>
@@ -211,6 +212,7 @@
         cartPrice: 0,
         cartCount: 0,
         cartProductShow: false,
+        scrollTopTimer: null,
 
         //商品列表
         column_num: 1,
@@ -307,13 +309,20 @@
       },
       handleCartNumChange(val, prod){
         console.log("handleCartNumChange", val, prod)
+        let product = {
+          product_id: prod.product_id,
+          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: {
             xnamespace: this.xnamespace,
             shop_id: this.shopInfo.shop_id,
             consume_mode: this.consume_mode,
-            product: prod
+            product: product
           }
         }).then(res => {
           this.p_getFoodCartCount();
@@ -335,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(){
@@ -378,6 +387,7 @@
       },
       //获取门店分类信息
       p_getFoodShopCategory(){
+        this.$xdShowLoading({})
         jfbRootExec("getFoodShopCategory", {
           vm: this,
           data: {
@@ -386,6 +396,7 @@
             consume_mode: this.consume_mode
           }
         }).then(res => {
+          this.$xdHideLoading();
           this.categoryList = res.categories.map(item => {
             item.productList = [];
             return item;
@@ -458,7 +469,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(() => {
@@ -474,18 +485,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();
 
@@ -496,6 +506,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}`;
       },
@@ -519,7 +537,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){
@@ -928,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);