yuwenjun1997 3 vuotta sitten
vanhempi
commit
bdc8b20fc8

+ 6 - 4
pages/order/mixins/wechatPay.js

@@ -48,19 +48,21 @@ const wechatPay = {
                 const wechatCode = await authorize.getCode('weixin')
                 // 微信支付请求 返回支付信息
                 const response = await this.PayService.WeChatMiniWxPay({
-                    payAmount: data.payableAmount * 100,
+                    payAmount: data.payableAmount,
                     payWay: 'WEIXIN',
+                    payType: 'XCX',
                     code: wechatCode,
-                    orderId: data.orderId
+                    orderId: data.orderId,
+                    shopOrderId: data.shopOrderId
                 })
                 // 处理支付信息 调用微信支付
-                const payment = JSON.parse(response.data.data.payInfo)
+                const payment = JSON.parse(response.data.rt10_payInfo)
                 const payFlag = await wxRequestPayment(payment)
                 // debugger
                 // console.log(this.hanldOrder)
                 // 支付成功重定向
                 uni.setStorageSync('orderInfo', this.hanldOrder.order)
-                
+
                 if (payFlag) {
                     // 微信支付成功回调 在页面onload中通过this.$on监听orderPaySuccess事件回调
                     this.$emit('orderPaySuccess', this.hanldOrder.order)

+ 4 - 1
pages/order/order-create.vue

@@ -467,7 +467,10 @@ export default {
 					uni.redirectTo({ url: `/pages/order/order-pay?orderId=${response.data.orderId}` })
 				})
 				.catch(error => {
-					this.$util.msg(error.msg, 2000)
+					// this.$util.msg(error.msg, 2000)
+                    this.isSubLoading = false
+                    this.preventModal = true
+                    this.preventText = error.msg
 				})
 		}
 	}

+ 3 - 1
pages/order/order-pay.vue

@@ -112,6 +112,7 @@ export default {
     onLoad(option) {
         this.orderId = option.orderId
         this.getOrderDetail()
+        this.orderPaySuccess()
     },
     methods: {
         // 支付回调执行函数
@@ -126,8 +127,9 @@ export default {
                 }
             })
         },
-        handleModalConfirm() {
+        handleModalConfirm(e) {
             this.modal = false
+            if (!e.index) return
             this.miniWxPayFor(this.hanldOrder.order)
         },
         // 子订单支付

+ 1 - 1
services/pay.service.js

@@ -16,7 +16,7 @@ export default class PayService {
      */
     WeChatMiniWxPay(data = {}) {
         return this.AjaxService.post({
-            url: '/PayOrder/miniWxPay',
+            url: '/order/pay/online',
             data,
             isLoading: false,
         })