陶杰
2024-09-19 52c0cc56e20ddb454812fa89e0fa38c785ef79f8
sub_pages/customer/shopping/confirm.vue
@@ -23,21 +23,41 @@
            if (this.dto.couponRecordId && this.cache_coupon) {
               //计算优惠券
               if (this.cache_coupon.couponDiscountType === 'zero') {
                  return this.cache_coupon.couponDiscountValue || 0
                  return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
               } else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
                  var total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0) + (this.dto.packing || 0) +
                        (this.current_transport.fee ||
                           0) || 0)
                     .toFixed(2)
                  var total = (this.dto.totalMemberAmount || this.dto.totalAmount || 0).toFixed(2)
                  // + (this.dto.packing || 0) +
                  //    (this.current_transport.fee ||
                  //       0) || 0)
                  // .toFixed(2)
                  if (total >= this.cache_coupon.minOrderAmount) {
                     return this.cache_coupon.couponDiscountValue || 0
                     return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
                  } else {
                  }
               } else {
                  return this.cache_coupon.couponDiscountValue || 0
                  return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
               }
            }
            return 0
         },
         order_fee() {
            // 如果订单-优惠券<0,就等于0 +打包+运费,如果还等于0,那么就0.01
            var m1 = parseFloat(this.dto.totalMemberAmount || this.dto.totalAmount || 0)
            var m2 = parseFloat((this.dto.packing || 0) + (this.current_transport.fee || 0))
            if (m1 <= parseFloat(this.coupon_fee)) {
               if (m2 > 0) {
                  return (m2).toFixed(2)
               } else {
                  return '0.01'
               }
            } else {
               return ((m1 - parseFloat(this.coupon_fee)) + m2).toFixed(2)
            }
         }
      },
@@ -456,10 +476,10 @@
               <view class="m-l-a m-r-0 flex" style="word-break: break-all;"
                  :class="[!dto.goodsRecordIdList||dto.goodsRecordIdList.length==0?'desc-gray':'']"
                  @click="toSelectGood">
                  <view> {{dto.goodsRecordIdListStr|| '请选择'}}
                  <view class="word-e" style="max-width: 400rpx;"> {{dto.goodsRecordIdListStr|| '请选择'}}
                  </view>
                  <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
                  <view style="min-width: 60rpx;">
                  <view class="m-t-4">
                     <u-icon class="m-l-a" name="arrow-right"></u-icon>
                  </view>
               </view>
@@ -502,7 +522,7 @@
      <view class="bottom-price flex">
         <view class="m-t-12 m-l-0 m-r-a">
            合计 <span class="t-red">¥
               {{ (( dto.totalMemberAmount || dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) - coupon_fee || 0).toFixed(2) }}
               {{ order_fee }}
            </span>元
         </view>
         <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">