1

xuxueyang

2024-09-11 aaa476929a2748f61804a23677d402e940c451b1

 sub_pages/customer/shopping/confirm.vue

@@ -25,7 +25,7 @@
               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 = ((this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
                  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) {
@@ -220,7 +220,7 @@
            var goodsRecordIds = []
            if (this.dto.goodsRecordIdListStr) {
               for (var t of this.cache_goods) {
                  t.push(t.goodsId)
                  t.push(t.id)
               }
            }

@@ -242,7 +242,7 @@
                     })
                     tmp.$message.hideLoading()
                     if (code === 0) {
				

                        //提交信息
                        console.log('pay,', data)
                        // /api/pub/init/callback?orderId=
@@ -273,9 +273,9 @@
                                 //返回上一页
                                 await tmp.$store.dispatch('sign_add', 'shopping')
                                 //清空优惠券
                                 this.$store.dispatch('cache_coupon_select', {})
                                 this.$store.dispatch('cache_goods_select', [])
											
                                 tmp.$store.dispatch('cache_coupon_select', {})
                                 tmp.$store.dispatch('cache_goods_select', [])

                                 tmp.$message.showToast('支付成功')
                                 setTimeout(() => {
                                    uni.navigateBack()
@@ -343,7 +343,7 @@
            </view>
            <view class="price">
               <view class="m-l-a m-r-0 text-right">
                  共{{ dto.flowers.length }}件，小计<span class="t-red">￥{{ dto.totalAmount || 0 }}</span>
                  共{{ dto.flowers.length }}件，小计<span class="t-red">￥{{ dto.totalMemberAmount ||  dto.totalAmount || 0 }}</span>
               </view>
            </view>
         </view>
@@ -407,7 +407,6 @@
         </view>

         <view class="p10 bg-white m-t-20 br-4">
            <!-- #ifdef PUB_CUSTOMER_DEV -->
            <view class="form-item  flex ">
               <view class="label">优惠券</view>

@@ -417,7 +416,6 @@
                  <u-icon class="m-l-a" name="arrow-right"></u-icon>
               </view>
            </view>
            <!-- #endif -->

            <view class="form-item  flex m-t-12">
               <view class="label">特殊需求</view>
@@ -439,18 +437,17 @@
                  </view>
               </view>
            </view>
            <!-- #ifdef PUB_CUSTOMER_DEV -->
            <view class="form-item  flex ">
            <view class="form-item  flex  flex-wrap-normal">
               <view class="label">兑换券</view>

               <view class="m-l-a m-r-0 flex "
               <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>
                  {{dto.goodsRecordIdListStr|| '请选择'}}
                  <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
                  <u-icon class="m-l-a" name="arrow-right"></u-icon>
               </view>
            </view>
            <!-- #endif -->
         </view>

      </view>
@@ -458,7 +455,7 @@
         <view class="desc flex">
            <view>商品金额:</view>
            <view class="m-l-a m-r-0 text-right">
               {{ (dto.totalAmount || 0)  || 0 }}
               {{ ( dto.totalMemberAmount || dto.totalAmount || 0)  || 0 }}
            </view>
         </view>
         <view class="desc flex">
@@ -474,7 +471,9 @@
            </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>
               优惠({{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>
@@ -487,7 +486,7 @@
      <view class="bottom-price flex">
         <view class="m-t-12 m-l-0 m-r-a">
            合计 <span class="t-red">￥
               {{ ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) - coupon_fee || 0).toFixed(2) }}
               {{ (( dto.totalMemberAmount || dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) - coupon_fee || 0).toFixed(2) }}
            </span>元
         </view>
         <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">