jufubao-food 1.0.13-beta3 → 1.0.13-beta4

package/package.json

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

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -76,7 +76,7 @@
         </view>
       </view>
       <!-- 订单备注信息 -->
-      <view v-if="showOrderComment == 'Y'" class="order_comment section">
+      <view v-if="showOrderComment === 'Y'" class="order_comment section">
         <view class="title">备注信息</view>
         <textarea v-model="comment" :maxlength="50" type="textarea" placeholder="备注信息，限50字以内"/>
       </view>
@@ -100,7 +100,7 @@
           <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">
           <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
@@ -140,13 +140,12 @@
           <xd-unit :price="orderInfo.real_total_amount" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
         </xd-list-item>
       </view>
-
        <view class="placeholderBottom" :style="bottomFixedStylePlaceholder"></view>
        <view v-if="orderInfo.order_status === 'N'" class="alert_bottom" :style="alertBottomStyleComp">
-        {{ orderInfo.error_tip }}
+         <view>{{ orderInfo.error_tip }}</view>
        </view>
        <!-- 靠低支付 -->
-      <view class="fixe_bottom" :style="prod_bottom">
+      <view class="fixe_bottom" id="pay-elx" :style="prod_bottom">
         <view class="fixed_bottom_body" :style="[bottomBoxStyle]">
           <view class="flex_l" :style="{
             justifyContent: bottomPricePosition
@@ -299,10 +298,10 @@
         plus_saving_money: 0,
         main_order_id: "",
         resource_shop_id: "",
-        
+
         showDialogConfirmShop: false,
         showDialogChangeShop: false,
-        
+
         validImageAPIUrl: "",
         jwxSDK: null,
         is_plus_site: false,
@@ -331,14 +330,10 @@
         bottomBtnRadius: 0,
         bottomBtnHeight: 60,
         bottomPayText: "",
-        bottomPricePosition: "",
+        payBtnHeight: 0,
 
         lrPadding: {},
         bottomPadding: {},
-        bottomBtnRadius: 0,
-        bottomBtnHeight: 60,
-        bottomPayText: "",
-        bottomPricePosition: "",
 
         payPath: "",
         paySuccessPath: "",
@@ -366,7 +361,8 @@
         return this.fixedStyle({paddingBottom: 106, zIndex: 110})
       },
       bottomFixedStylePlaceholder() {
-        let tipAlert = this.orderInfo && this.orderInfo.order_status==='N' ? 120: 0
+        let tipAlert = this.orderInfo && this.orderInfo.order_status==='N' ? 72: 0;
+        tipAlert = tipAlert + this.payBtnHeight;
         return this.fixedStyle({paddingBottom: tipAlert, zIndex: 110}, 'bottom', false);
       },
       bottomBoxStyle(){
@@ -454,7 +450,7 @@
       init(container) {
         this.bgColor = this.$colorChange(this.warningColor).alpha(0.1).toString();
         this.bgColor2 = this.$colorChange(this.mainColor).alpha(0.1).toString();
-        
+
         this.xnamespace = getContainerPropsValue(container, 'content.xnamespace', this.projectAttr.business_code);
         this.showBuyer = getContainerPropsValue(container, 'content.showBuyer', "Y");
         this.showOrderComment = getContainerPropsValue(container, 'content.showOrderComment', "Y");
@@ -467,7 +463,7 @@
         this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
         this.guidePay = getContainerPropsValue(container, "content.guidePay", "");
         this.skipToPay = getContainerPropsValue(container, "content.skipToPay", "N");
-        if(this.skipToPay === 'Y'){
+        if(this.skipToPay === 'N'){
           this.hasAlertCardChose = true;
         }
 
@@ -480,6 +476,20 @@
         this.bottomBtnHeight = gCPVal(container, 'bottomBtnHeight', [60], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPayText = gCPVal(container, 'bottomPayText', ["支付"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPricePosition = gCPVal(container, 'bottomPricePosition', ['flex-start'], {sKey: "btnPriceStatus", fields: ['bottomPricePosition']});
+
+        this.$nextTick(()=>{
+          let time = 500;
+          //#ifdef H5
+          time = 10
+          //#endif
+          setTimeout(()=>{
+            this.$xdUniHelper.getWindowHeight(['#pay-elx'], this)
+              .then(res=>{
+                this.payBtnHeight = res['#pay-elx'].height  * this.$pxNum;
+              })
+              .catch()
+          }, time)
+        });
       },
       p_getVipList(){
         jfbRootExec("getVipList", {
@@ -611,7 +621,7 @@
         this.choseCoupon = data;
         this.showCouponChose = false;
       },
-      
+
       //选择卡片
       toChoseCard(){
         if(this.choseCoupon && this.choseCoupon.cardPayPrice) return
@@ -997,7 +1007,7 @@
         }
       }
       .placeholderBottom{
-        
+
       }
       .alert_bottom{
         background: rgba(255, 244, 191, 0.9);

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -25,7 +25,7 @@
           <xd-font-icon icon="iconxiangyou_xian" color="#666666" size="28"></xd-font-icon>
         </view>
       </view>
-      <view style="height: 104rpx;"></view>
+      <view style="height: 100rpx;"></view>
 
       <view class="section_main" :style="[sectionMainStyleComp]">
         <view class="left_nav">
@@ -52,7 +52,7 @@
               :id="getID(cate)"
               :data-next="cate.nextHeight"
             >
-              <view class="group_title">{{ cate.category_name }}</view>
+              <view class="group_title" :style="[contGroupTitleStyle]">{{ cate.category_name }}</view>
               <view class="product_list" v-if="cate.productList.length">
                 <view v-for="item in cate.productList" :key="item.key" :style="[contProductStyles]">
                   <view class="product_item">
@@ -201,6 +201,7 @@
         pointerScroll: true,
         prodScrollIntoView: "",
         prodScrollTop: 0,
+        oldProdScrollTop: 0,
         scrollUpTimer: null,
         scrollTimer: null,
 
@@ -248,10 +249,15 @@
         return {
           backgroundColor: this.itemBgcColor,
           marginBottom: this.rowSpacing + 'rpx',
-          padding: '16rpx',
+          padding: '16rpx 32rpx',
           borderRadius: '16rpx',
         }
       },
+      contGroupTitleStyle(){
+        return {
+          paddingLeft: '32rpx',
+        }
+      },
       bodyStyleComp(){
         return {
           '--main-color': this.mainColor
@@ -260,7 +266,7 @@
       sectionMainStyleComp(){
         console.log(this.layoutInfo)
         return {
-          height: (this.layoutInfo.bodyMinHeightRpx - 158 - this.layoutInfo.bottom) + 'rpx',
+          height: (this.layoutInfo.bodyMinHeightRpx - 220) + 'rpx',
         }
       },
       fixed_bottom() {
@@ -539,7 +545,8 @@
         let scrollTop = e.detail.scrollTop;
         if(this.scrollTopTimer) clearTimeout(this.scrollTopTimer);
         this.scrollTopTimer = setTimeout(()=>{
-          this.prodScrollTop = scrollTop;
+          // this.prodScrollTop = scrollTop;
+          this.oldProdScrollTop = scrollTop;
         },50)
         //手动点击tab定位不触发
         if(!this.pointerScroll) return false;
@@ -795,6 +802,7 @@
         align-items: center;
       }
       .shop_info{
+        height: 100rpx;
         display: flex;
         align-items: center;
         font-size: 32rpx;
@@ -802,9 +810,8 @@
         justify-content: space-between;
         background-color: #FFFFFF;
         box-sizing: border-box;
-        margin-bottom: 20rpx;
         border-bottom: 1px solid #F8F8F8;
-        padding: 30rpx;
+        padding: 0 30rpx;
         position: fixed;
         top: 0;
         width: 100%;
@@ -865,7 +872,7 @@
         }
         .right_product{
           flex: 1;
-          margin: 0 16rpx 0 32rpx;
+          margin: 0;
 
           .product_group{
             .group_title{
@@ -877,7 +884,7 @@
               height: 64rpx;
               line-height: 64rpx;
               border-radius: 16rpx;
-              padding-left: 16rpx;
+              padding-left: 32rpx;
             }
             .product_list{
               .product_loading{
@@ -905,9 +912,9 @@
                 }
 
                 .prod_img{
-                  width: 200rpx;
-                  height: 200rpx;
-                  margin-right: 16rpx;
+                  width: 180rpx;
+                  height: 180rpx;
+                  margin-right: 24rpx;
                   background: #f8f8f8;
                   // border-radius: 16rpx;
                   image{
@@ -1021,9 +1028,9 @@
             border-bottom: 1px solid #F5F5F5;
 
             .prod_img{
-              width: 200rpx;
-              height: 200rpx;
-              margin-right: 24rpx;
+              width: 180rpx;
+              height: 180rpx;
+              margin-right: 16rpx;
               // background: #DDD;
               image{
                 width: 100%;