fix

src/components/business/action-sheet-goods-buy/index.vue

@@ -186,7 +186,7 @@
     },
 		methods: {
       show() {
-        if (this.limitCount > 0) {
+        if (this.limitCount > -1) {
           this.qty = this.limitCount > 0 ? 1 : 0
         }
         this.showActionSheet()

src/models/basic/store.js

@@ -122,7 +122,11 @@ class Store {
           address_item: data.address_item,
           shop_name: data.shop_name
         }
-        resolve(address)
+        resolve({
+          address,
+          dates: res.data.dates,
+          times: res.data.times
+        })
       }).catch(err => {
         reject()
       })

src/pages/memberCard/memberCard.vue

@@ -538,7 +538,7 @@
   }
 
   .to_get_card {
-    border: 1rpx solid #fe5c4d;
+    border: 1px solid #fe5c4d;
     background-color: #fff !important;
     color: #fe5c4d !important;
     line-height: 2.55555556;
@@ -546,7 +546,7 @@
   }
 
   .to_get_card_btn{
-    border: 1rpx solid #fe5c4d;
+    border: 1px solid #fe5c4d;
     background-color: #fff !important;
     color: #fe5c4d !important;
     line-height: 2.55555556;
@@ -567,8 +567,9 @@
     height: 70rpx;
     border-radius: 10rpx;
     color: #fe5c4d;
-    border: 1rpx solid #fe5c4d;
+    border: 1px solid #fe5c4d;
     margin: 0 auto;
+    overflow: hidden;
   }
 
   .syn_wx2 text {

src/pages/order/afterPayDetail/index.vue

@@ -36,9 +36,7 @@
                     <text>{{item.name}}</text>
                   </view>
                   <view class="spec-wrap">
-                    <text class="label" v-for="(specItem, specIndex) in item.spec" :key="specItem">
-                      {{specItem}}
-                    </text>
+                    <text class="label" v-for="(specItem, specIndex) in item.spec" :key="specItem">{{specItem}}</text>
                     <text class="label" v-if="item.spec && item.property_str">+</text>
                     <text class="label" v-if="item.property_str">{{item.property_str}}</text>
                   </view>
@@ -76,6 +74,15 @@
           <view class="list-right">￥<text class="bold text-big">{{goodsAmount}}</text></view>
         </view>
         <view class="item-discount list-cir" v-if="(isEnjoyMinus == 0 && cardDiscount) || platformCouponCanNum || couponCanNum || (fullReduceDiscount && fullReduceDiscount !== '0.00') || isEnjoyMinus == 1">
+          <view class="item" v-if="fullReduceDiscount && fullReduceDiscount !== '0.00'">
+            <view class="item-left">
+              <text class="label label-full-reduce">减</text>满减优惠
+            </view>
+            <view class="item-right">
+              <text class="orange small">-￥</text>
+              <text class="orange text-big">{{fullReduceDiscount}}</text>
+            </view>
+          </view>
           <view class="item item-arrow" v-if="isEnjoyMinus == 0 && cardDiscount"  @click="navMemberCard">
             <view class="item-left">
               <text class="label label-card">卡</text>{{cardDiscount}}折会员卡
@@ -112,15 +119,6 @@
               <text class="tag" v-else>{{couponCanNum}}张可用</text>
             </view>
           </view>
-          <view class="item" v-if="fullReduceDiscount && fullReduceDiscount !== '0.00'">
-            <view class="item-left">
-              <text class="label label-full-reduce">减</text>满减优惠
-            </view>
-            <view class="item-right">
-              <text class="orange small">-￥</text>
-              <text class="orange text-big">{{fullReduceDiscount}}</text>
-            </view>
-          </view>
           <view class="item" v-if="isEnjoyMinus == 1">
             <view class="item-left">
               <text class="label label-card">享</text>新客专享折扣
@@ -300,6 +298,16 @@
           this.platformCouponId = calcInfo.agent_coupon_id
 
           businessUtil.filterGoodsList(res.data.order_items.items).then(orderItem => {
+            // 处理商品属性
+            orderItem.forEach(tItem => {
+              tItem.item.forEach(item => {
+                item.property_str = ''
+                item.properties.forEach(cItem => {
+                  item.property_str += cItem.value + '+'
+                })
+                item.property_str = item.property_str.slice(0, item.property_str.length - 1)
+              })
+            })
             this.orderItem
           })
           this.calcHaveDiscount(this.couponDiscount, this.platformCouponDiscount, this.cardMinus)

src/pages/order/detail/index.vue

@@ -82,8 +82,8 @@
             </view>
           </view>
           <view class="list">
-            <view class="list-left gray">自提时间</view>
-            <view class="list-right">随时</view>
+            <view class="list-left gray">自提时间<text class="mini-label">(自提需致电商家确认)</text></view>
+            <view class="list-right">{{orderDetail.self_pick_time || '随时'}}</view>
           </view>
           <view class="list">
             <view class="list-left gray">预留电话</view>
@@ -270,40 +270,40 @@
           <view class="list-right">￥{{orderDetail.good_amount}}</view>
         </view>
         <view class="item-discount list-cir" v-if="(orderDetail.is_enjoy_minus == 0 && orderDetail.card_minus !== '0.00') || (orderDetail.coupon_discount && orderDetail.coupon_discount !== '0.00') || (orderDetail.full_reduce_discount && orderDetail.full_reduce_discount !== '0.00') || orderDetail.is_enjoy_minus == 1">
-          <view class="item" v-if="orderDetail.is_enjoy_minus == 0 && orderDetail.card_minus !== '0.00'">
+          <view class="item" v-if="orderDetail.full_reduce_discount && orderDetail.full_reduce_discount !== '0.00'">
             <view class="item-left">
-              <text class="label label-card">卡</text>会员卡
+              <text class="label label-full-reduce">减</text>满减优惠
             </view>
             <view class="item-right">
               <text class="orange small">-￥</text>
-              <text class="orange">{{!orderDetail.is_newer_price ? orderDetail.card_minus : 0.00}}</text>
+              <text class="orange">{{orderDetail.full_reduce_discount}}</text>
             </view>
           </view>
-          <view class="item" v-if="orderDetail.coupon_discount && orderDetail.coupon_discount !== '0.00'">
+          <view class="item" v-if="orderDetail.is_enjoy_minus == 1">
             <view class="item-left">
-              <text class="label label-voucher">券</text>优惠券
+              <text class="label label-card">享</text>新客专享折扣
             </view>
             <view class="item-right">
               <text class="orange small">-￥</text>
-              <text class="orange">{{orderDetail.coupon_discount}}</text>
+              <text class="orange">{{orderDetail.card_minus ? orderDetail.card_minus : '0.00'}}</text>
             </view>
           </view>
-          <view class="item" v-if="orderDetail.full_reduce_discount && orderDetail.full_reduce_discount !== '0.00'">
+          <view class="item" v-if="orderDetail.is_enjoy_minus == 0 && orderDetail.card_minus !== '0.00'">
             <view class="item-left">
-              <text class="label label-full-reduce">减</text>满减优惠
+              <text class="label label-card">卡</text>会员卡
             </view>
             <view class="item-right">
               <text class="orange small">-￥</text>
-              <text class="orange">{{orderDetail.full_reduce_discount}}</text>
+              <text class="orange">{{!orderDetail.is_newer_price ? orderDetail.card_minus : 0.00}}</text>
             </view>
           </view>
-          <view class="item" v-if="orderDetail.is_enjoy_minus == 1">
+          <view class="item" v-if="orderDetail.coupon_discount && orderDetail.coupon_discount !== '0.00'">
             <view class="item-left">
-              <text class="label label-card">享</text>新客专享折扣
+              <text class="label label-voucher">券</text>优惠券
             </view>
             <view class="item-right">
               <text class="orange small">-￥</text>
-              <text class="orange">{{orderDetail.card_minus ? orderDetail.card_minus : '0.00'}}</text>
+              <text class="orange">{{orderDetail.coupon_discount}}</text>
             </view>
           </view>
         </view>
@@ -735,6 +735,11 @@
     color: #999;
   }
 
+  .gray .mini-label {
+    font-size: 24rpx;
+    color: #202020;
+  }
+
   .text-small {
     font-size: 26rpx;
   }

src/pages/pay/orderDetails/orderDetails.vue

@@ -287,6 +287,8 @@
               this.isShowPayAfterAdvert = !has_give_card && !has_give_coupon
               // #endif
               this.isLoadReady = true
+              // 更新用户会员卡信息
+              memberModel.info()
             }).catch(err => {
               this.showCouponModal = !!has_give_coupon
               // #ifdef MP-WEIXIN

src/pages/pay/pay.vue

@@ -801,7 +801,7 @@
   }
 
   .store-wrapper {
-    padding: 40rpx 50rpx 50rpx 50rpx;
+    padding: 40rpx 60rpx 50rpx 60rpx;
     display: flex;
     margin-bottom: -40rpx;
     background:#f8f8f8;

src/pages/pay/paying/paying.vue

@@ -801,7 +801,7 @@
   }
 
   .store-wrapper {
-    padding: 40rpx 50rpx 50rpx 50rpx;
+    padding: 40rpx 60rpx 50rpx 60rpx;
     display: flex;
     margin-bottom: -40rpx;
     background:#f8f8f8;