jufubao-mall 2.0.27-beta5 → 2.0.27-beta7

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -208,7 +208,7 @@
             }">
               <view>
                 <view class="t_price">实付：<xd-unit :price="orderNeedPayPrice" :isOld="false"></xd-unit></view>
-                <view v-if="isShowPlusSavingMoney" class="b_price">共省<xd-unit :price="orderFee.plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit></view>
+                <view v-if="orderDiscountPrice > 0" class="b_price">共省<xd-unit :price="orderDiscountPrice" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit></view>
               </view>
             </view>
             <view>
@@ -667,6 +667,16 @@
         let result = this.$xdUniHelper.cutFloatNumber(total_amount, total);
         return result;
       },
+      orderDiscountPrice(){
+        let total = 0;
+        if(this.orderFee.user_logistics_discount_amount){
+          total = this.$xdUniHelper.addFloatNumber(total, this.orderFee.user_logistics_discount_amount);
+        }
+        if(this.isShowPlusSavingMoney){
+          total = this.$xdUniHelper.addFloatNumber(total, this.orderFee.plus_saving_money);
+        }
+        return total;
+      },
       bottomBoxStyle(){
         return {
           padding: this.getMarginAndPadding(this.bottomPadding, 16)
@@ -775,18 +785,6 @@
           this.jwxSDK = res.jwxSDK;
         })
         // #endif
-
-        if(this.ticketPositionStatus === 'Y'){
-          this.$nextTick(() => {
-            setTimeout(() => {
-              uni.pageScrollTo({
-                scrollTop: 10000,
-                duration: 200
-              })
-            }, 1000)
-          })
-          
-        }
       },
       /**
        * @description 监听事件变化
@@ -938,11 +936,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;

package/src/components/JfbMallConfirm/shopList.vue

@@ -111,7 +111,7 @@ export default {
 <style lang="less" scoped>
   .chose_shop_list{
     background: #F7F7F7;
-    padding: 16rpx;
+    padding: 0 16rpx 16rpx;
     position: relative;
     height: 45vh;
   }
@@ -191,6 +191,7 @@ export default {
   .shop_list{
     height: 100%;
     overflow-y: auto;
+    padding-top: 16rpx;
     .shop_item{
       display: flex;
       background: #FFFFFF;