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

陶杰

2024-09-11 6fcfe40675f7eb14e820b9d7f13f73a87540999b

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

@@ -241,10 +242,7 @@
                     })
                     tmp.$message.hideLoading()
                     if (code === 0) {
                        //清空优惠券
                        this.$store.dispatch('cache_coupon_select', {})
                        this.$store.dispatch('cache_goods_select', [])

				
                        //提交信息
                        console.log('pay,', data)
                        // /api/pub/init/callback?orderId=
@@ -274,6 +272,10 @@
                                 // tmp.$message.showToast('支付成功')
                                 //返回上一页
                                 await tmp.$store.dispatch('sign_add', 'shopping')
                                 //清空优惠券
                                 this.$store.dispatch('cache_coupon_select', {})
                                 this.$store.dispatch('cache_goods_select', [])
											
                                 tmp.$message.showToast('支付成功')
                                 setTimeout(() => {
                                    uni.navigateBack()
@@ -331,7 +333,7 @@
                           style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ item.name || '-' }}
                     </view>
                     <view class="price">
                        {{ item.price || 0 }}*{{ item.num }}扎
                        {{ item.priceMember ||  item.price || 0 }}*{{ item.num }}扎
                     </view>
                     <view class="desc m-t-12">
                        <view class="m-r-15">每扎重量:{{ item.weight || 0 }}</view>
@@ -405,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>

@@ -415,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>
@@ -437,7 +437,6 @@
                  </view>
               </view>
            </view>
            <!-- #ifdef PUB_CUSTOMER_DEV -->
            <view class="form-item  flex ">
               <view class="label">兑换券</view>

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

      </view>
@@ -471,8 +469,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>