Merge remote-tracking branch 'origin/master'

rk

2026-03-11 0e4b49f4bee160790b1830e6a8606e739b32fc3b

 mini-program/pages/confirm-order/confirm-order.vue

@@ -89,7 +89,7 @@
            <view class="info-item">
               <view class="info-item-label">商品总价</view>
               <view class="info-item-price">
                  <text>{{orderInfo.amount}}</text>
                  <text>{{((orderInfo.amount || 0)-(orderInfo.mailAmount || 0)).toFixed(2)}}</text>
               </view>
            </view>
            <view class="info-item">
@@ -113,7 +113,7 @@
            <view class="info-item">
               <view class="info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;">应付款</view>
               <view class="info-item-price2">
                  <text>{{orderInfo.payAmount}}</text>
                  <text>{{(orderInfo.payAmount || 0).toFixed(2)}}</text>
               </view>
            </view>
         </view>
@@ -201,7 +201,7 @@
                  <view :class="item.active ? 'dian active' : 'dian'" @click="seleShop(index)" v-for="(item, index) in shopList" :key="index">
                     <view class="dian-top">
                        <view class="dian-top-image">
                           <image :src="item.imgFullUrl" mode="widthFix"></image>
                           <image :src="item.imgFullUrl || '/static/icon/default2.png'" mode="widthFix"></image>
                        </view>
                        <view class="dian-top-info">
                           <view class="dian-top-info-title">
@@ -424,7 +424,6 @@
               titlePrice: this.orderInfo.payAmount,
               shopId: this.shopId ? this.shopId.id : null
            }).then(res => {
               this.loading = false
               if (res.code === 200) {
                  // 积分抵扣
                  if (res.data.payType === 1) {
@@ -449,13 +448,15 @@
                        },
                        fail (err) {
                           uni.$emit('shuaxin')
                           uni.navigateTo({
                           uni.redirectTo({
                              url: '/pagesA/pages/order/order?userType=0&status=1'
                           })
                        }
                     })
                  }
               }
            }).finally(() => {
               this.loading = false
            })
         },
         // 确定使用积分
@@ -724,7 +725,7 @@
            font-weight: 500;
            font-size: 32rpx;
            color: #FFFFFF;
            margin-top: 60rpx;
            margin: 60rpx 0 30rpx 0;
         }
         .coupon-content {
            width: 100%;