Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

xuxueyang

2024-09-24 5525ed0398c496b43a09377d0c59d143e7ff3e98

 sub_pages/customer/shopping/confirm.vue

@@ -23,20 +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)
            }

         }

      },
@@ -50,6 +71,9 @@
         if (this.cache_coupon && this.cache_coupon.id) {
            this.dto.couponRecordId = this.cache_coupon.id
            this.dto.couponRecordStr = this.cache_coupon.couponName
         } else if (this.cache_coupon && !this.cache_coupon.id) {
            this.dto.couponRecordId = ''
            this.dto.couponRecordStr = ''
         }
         //兑换券
         this.dto.goodsRecordIdListStr = ''
@@ -159,8 +183,16 @@
      methods: {
         toSelectCoupon() {
            //跳转去列表页面进行选择
            var total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this
                  .current_transport.fee ||
                  0) || 0)
               .toFixed(2)
            // if (total >= this.cache_coupon.minOrderAmount) {
            //    return this.cache_coupon.couponDiscountValue || 0
            // }

            uni.navigateTo({
               url: '/sub_pages/customer/coupon/coupon-self?source=shopping'
               url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`
            })
         },
         toSelectGood() {
@@ -220,7 +252,7 @@
            var goodsRecordIds = []
            if (this.dto.goodsRecordIdListStr) {
               for (var t of this.cache_goods) {
                  t.push(t.id)
                  goodsRecordIds.push(t.id)
               }
            }

@@ -343,7 +375,8 @@
            </view>
            <view class="price">
               <view class="m-l-a m-r-0 text-right">
                  共{{ dto.flowers.length }}件，小计<span class="t-red">￥{{ dto.totalMemberAmount ||  dto.totalAmount || 0 }}</span>
                  共{{ dto.flowers.length }}件，小计<span
                     class="t-red">￥{{ dto.totalMemberAmount ||  dto.totalAmount || 0 }}</span>
               </view>
            </view>
         </view>
@@ -438,14 +471,17 @@
               </view>
            </view>
            <view class="form-item  flex  flex-wrap-normal">
               <view class="label">兑换券</view>
               <view class="label" style="min-width: 130rpx;">兑换券</view>

               <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">
                  {{dto.goodsRecordIdListStr|| '请选择'}}
                  <view class="word-e" style="max-width: 400rpx;"> {{dto.goodsRecordIdListStr|| '请选择'}}
                  </view>
                  <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
                  <u-icon class="m-l-a" name="arrow-right"></u-icon>
                  <view class="m-t-4">
                     <u-icon class="m-l-a" name="arrow-right"></u-icon>
                  </view>
               </view>
            </view>
         </view>
@@ -486,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">