jufubao-mall 2.0.27-beta6 → 2.0.27-beta8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.27-beta6",
+  "version": "2.0.27-beta8",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -75,7 +75,7 @@
             </view>
             <!-- 配送信息 -->
             <view v-if="shop.support_delivery_method_options.length" class="delivery">
-              <xd-list-item v-if="shop.sub_show_delivery_method==='Y'" label="配送方式" showRight paddingLR="48rpx" paddingTB="24rpx" showBottom size="large">
+              <xd-list-item v-if="shop.sub_show_delivery_method==='Y'" label="配送方式" showRight paddingLR="48rpx" paddingTB="24rpx" showBottom size="large" class="xd-my-list-item">
                 <picker @change="e => bindPickerChange(e, shopIndex)"
                   range-key="label" :range="shop.support_delivery_method_options"
                   :value="shop.support_delivery_method_options.findIndex(ll => ll.value == shop.deliveryPickValue)"
@@ -84,22 +84,22 @@
                 </picker>
               </xd-list-item>
               <template>
-                <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom paddingLR="48rpx" paddingTB="24rpx">
+                <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom paddingLR="48rpx" paddingTB="24rpx" class="xd-my-list-item">
                   <xd-unit :price="shop.user_logistics_amount_origin" :fontSize="28" :isOld="false"></xd-unit>
                 </xd-list-item>
-                <xd-list-item v-if="shop.deliveryPickValue === 'samecity'" 
+                <xd-list-item v-if="shop.deliveryPickValue === 'samecity'" class="xd-my-list-item"
                   :label="shop.time_label" showRight paddingLR="48rpx" paddingTB="24rpx" showBottom
                   @click="toSetSelectTime(shopIndex,shop)">
                   {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
                 </xd-list-item>
                 <template v-if="shop.deliveryPickValue === 'takeout'" >
                   <!-- 配送方式：到店自提 -->
-                  <xd-list-item label="选择门店" show-right paddingLR="48rpx" paddingTB="24rpx" showBottom @click="toSetSelectShop(shopIndex)">
+                  <xd-list-item label="选择门店" show-right paddingLR="48rpx" paddingTB="24rpx" showBottom @click="toSetSelectShop(shopIndex)" class="xd-my-list-item">
                   <view style="text-overflow: ellipsis;overflow: hidden;white-space: nowrap;width: 460rpx;text-align: right;">
                     {{shop.choseShop ? shop.choseShop.resource_shop_name : "请选择"}}
                   </view>
                   </xd-list-item>
-                  <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right paddingLR="48rpx" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)">
+                  <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right paddingLR="48rpx" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)" class="xd-my-list-item">
                     <view style="">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
                   </xd-list-item>
                 </template>
@@ -375,6 +375,9 @@
   import CusPrice from '@/components/CusPrice/CusPrice'
   import CusVipList from "@/components/CusVipList/CusVipList"
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
     name: "JfbMallConfirm",
     components: {
       XdFontIcon,
@@ -785,18 +788,6 @@
           this.jwxSDK = res.jwxSDK;
         })
         // #endif
-
-        if(this.ticketPositionStatus === 'Y'){
-          this.$nextTick(() => {
-            setTimeout(() => {
-              uni.pageScrollTo({
-                scrollTop: 10000,
-                duration: 200
-              })
-            }, 1000)
-          })
-          
-        }
       },
       /**
        * @description 监听事件变化
@@ -948,11 +939,14 @@
       },
       handleCardChoseAlert(){
         this.hasAlertCardChose = true;
-        //滚动到底部
-        uni.pageScrollTo({
-          scrollTop: 99999,
-          duration: 0
-        })
+        if(this.ticketPositionStatus === 'Y'){
+          //滚动到底部
+          uni.pageScrollTo({
+            scrollTop: 99999,
+            duration: 0
+          })
+        }
+        
       },
       handleCardInit(cardList){
         this.cardList = cardList;
@@ -1603,16 +1597,8 @@
       }
       .order_fee{
         overflow: hidden;
-        // padding: var(--order-line-height) 0;
         ::v-deep .xd-my-list-item{
-          // padding-bottom: var(--order-line-height) !important;
-          // padding-top: var(--order-line-height) !important;
-          // padding-top: 0 !important;
-          // padding-bottom: 0 !important;
-
-          &.logistics_discount{
-            // padding-top: var(--order-line-height) !important;
-          }
+          &.logistics_discount{}
         }
 
         .money_box{
@@ -1621,7 +1607,6 @@
           &:last-child{
             margin-bottom: 0;
           }
-          // padding: var(--order-line-height) 0;
         }
       }
       .shipping-address{
@@ -1693,9 +1678,18 @@
           font-size: 24rpx;
         }
         .delivery{
+          // #ifdef H5
           ::v-deep .xd-my-list-item:last-child{
             border-bottom: none !important;
           }
+          // #endif
+          // #ifdef MP-WEIXIN
+          .xd-my-list-item:last-child{
+            ::v-deep .xd-my-list-item{
+              border-bottom: none !important;
+            }
+          }
+          // #endif
         }
         .shop_name{
           padding: 24rpx 48rpx;
@@ -1714,7 +1708,6 @@
             width: 180rpx;
             height: 180rpx;
             margin-right: 24rpx;
-            background: #DDD;
             image{
               width: 100%;
               height: 100%;

package/src/components/JfbMallConfirm/shopList.vue

@@ -143,6 +143,10 @@ export default {
     align-items: center;
     margin-left: 8rpx;
 
+    // #ifdef MP-WEIXIN
+    padding: 8rpx 32rpx;
+    // #endif
+
     ::v-deep .uni-input-placeholder{
       color: #999999;
     }