Merge remote-tracking branch 'origin/v2' into v2

陶杰

2024-09-10 dd2922d3facbfba5add501f35de5649b80b6cf05

 sub_pages/customer/shopping/confirm.vue

@@ -25,7 +25,8 @@
               if (this.cache_coupon.couponDiscountType === 'zero') {
                  return this.cache_coupon.couponDiscountValue || 0
               } else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
                  var total = ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0)
                  var total = ((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
@@ -51,14 +52,14 @@
            this.dto.couponRecordStr = this.cache_coupon.couponName
         }
         //兑换券
         this.dto.couponRecordStr = ''
         this.dto.goodsRecordIdListStr = ''
         if (this.cache_goods && this.cache_goods.length > 0) {
            this.dto.couponRecordStr = ''
            this.dto.goodsRecordIdListStr = ''
            var names = []
            for (var tmp of this.cache_goods) {
               names.push(tmp.name || tmp.title || '')
            }
            this.dto.couponRecordStr = names.join(',')
            this.dto.goodsRecordIdListStr = names.join(',')
         }
      },
      onLoad(options) {
@@ -216,6 +217,12 @@
               return
            }
            this.dto.addressId = this.address.id
            var goodsRecordIds = []
            if (this.dto.goodsRecordIdListStr) {
               for (var t of this.cache_goods) {
                  t.push(t.goodsId)
               }
            }

            let tmp = this
            wx.login({
@@ -229,7 +236,8 @@
                     } = await tmp.$http.request('post', '/api/customer/flower/order/commit', {
                        data: {
                           ...tmp.dto,
                           wxcode: res.code
                           wxcode: res.code,
                           goodsRecordIdList: goodsRecordIds
                        }
                     })
                     tmp.$message.hideLoading()
@@ -464,8 +472,8 @@
               {{ (current_transport.fee || 0) }}
            </view>
         </view>
         <view class="desc flex">
            <view>优惠:</view>
         <view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
            <view>优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):</view>
            <view class="m-l-a m-r-0 text-right">
               -{{ coupon_fee || 0 }}
            </view>