合并

MrShi

4 小时以前 bc5d79cdd957fcee510d7a1cee07f6775af65596

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

@@ -96,16 +96,16 @@
               <view class="info-item-label">运费</view>
               <view class="info-item-price1">¥{{orderInfo.mailAmount}}</view>
            </view>
            <view class="info-item">
            <view class="info-item" @click="show = true">
               <view class="info-item-label">优惠券</view>
               <view class="info-item-price1" @click="show = true">
               <view class="info-item-price1">
                  -¥{{orderInfo.couponAmount}}
                  <image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
               </view>
            </view>
            <view class="info-item">
            <view class="info-item" @click="show1 = true">
               <view class="info-item-label">积分抵扣</view>
               <view class="info-item-price1" @click="show1 = true">
               <view class="info-item-price1">
                  -¥{{orderInfo.integralAmount}}
                  <image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
               </view>
@@ -160,6 +160,7 @@
               </view>
            </scroll-view>
            <view class="coupon-btn" @click="confirmCoupon">确定</view>
            <view style="width: 100%; height: 30rpx;"></view>
         </view>
      </u-popup>
      <!-- 积分 -->
@@ -178,6 +179,7 @@
               </view>
            </view>
            <view class="coupon-btn" @click="confirmJF">确定</view>
            <view style="width: 100%; height: 30rpx;"></view>
         </view>
      </u-popup>
      <!-- 门店 -->
@@ -268,6 +270,7 @@
            isPosition: true,
            lat: '',
            lgt: '',
            loading: false,
         };
      },
      onLoad(option) {
@@ -409,6 +412,8 @@
               title: '请选择门店',
               icon: 'none'
            })
            if (this.loading) return;
            this.loading = true
            this.$u.api.orderPay({
               addressId: this.addr ? this.addr.id : null,
               couponId: this.couponId,
@@ -419,9 +424,11 @@
               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) {
                     uni.$emit('shuaxin')
                     uni.redirectTo({
                        url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
                     })
@@ -433,13 +440,18 @@
                        signType: res.data.response.signType,
                        paySign: res.data.response.paySign,
                        success (pay) {
                           uni.$emit('shuaxin')
                           if (pay.errMsg === "requestPayment:ok") {
                              uni.redirectTo({
                                 url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
                              })
                           } else {
                              uni.showToast({ title: '订单取消支付', icon: 'none' })
                           }
                        },
                        fail (err) {
                           uni.$emit('shuaxin')
                           uni.navigateTo({
                              url: '/pagesA/pages/order/order?userType=0&status=1'
                           })
                        }
                     })
                  }