合并

MrShi

20 小时以前 825418425a91c4cf95e56c3fbaf06ea9fb5a37d8

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

@@ -398,6 +398,14 @@
         // 支付
         payment() {
            var that = this;
            if (that.receiveType === 0 && !that.addr) return uni.showToast({
               title: '请选择收货地址',
               icon: 'none'
            })
            if (that.receiveType === 1 && !that.shopId) return uni.showToast({
               title: '请选择门店',
               icon: 'none'
            })
            this.$u.api.orderPay({
               addressId: this.addr ? this.addr.id : null,
               couponId: this.couponId,
@@ -411,15 +419,9 @@
               if (res.code === 200) {
                  // 积分抵扣
                  if (res.data.payType === 1) {
                     // if (this.receiveType === 0) {
                        uni.redirectTo({
                           url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
                        })
                     // } else {
                     //    uni.reLaunch({
                     //       url: `/pages/payment-successful/payment-successful?id=${res.data.orderId}&userType=0`
                     //    })
                     // }
                     uni.redirectTo({
                        url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
                     })
                  } else {
                     wx.requestPayment({
                        timeStamp: res.data.response.timeStamp,
@@ -429,15 +431,9 @@
                        paySign: res.data.response.paySign,
                        success (pay) {
                           if (pay.errMsg === "requestPayment:ok") {
                              // if (that.receiveType === 0) {
                                 uni.redirectTo({
                                    url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
                                 })
                              // } else {
                              //    uni.reLaunch({
                              //       url: `/pages/payment-successful/payment-successful?id=${res.data.orderId}&userType=0`
                              //    })
                              // }
                              uni.redirectTo({
                                 url: `/pagesA/pages/order-details/order-details?id=${res.data.orderId}&userType=0`
                              })
                           } else {
                              uni.showToast({ title: '订单取消支付', icon: 'none' })
                           }
@@ -1041,6 +1037,10 @@
            height: 144rpx;
            display: flex;
            align-items: center;
            margin-bottom: 20rpx;
            &:last-child {
               margin: 0 !important;
            }
            .item-image {
               flex-shrink: 0;
               width: 144rpx;