lex 2 年之前
父节点
当前提交
e161a1f6a2

+ 3 - 1
src/student/music-group/pre-apply/order-detail.tsx

@@ -172,7 +172,7 @@ export default defineComponent({
     }
 
     const beforeSubmit = () => {
-      const pt = state.config.paymentChannel
+      const pt = state.pay_channel
       let payCode = 'qrCode'
       // 判断当前浏览器
       if (browser().weixin) {
@@ -201,6 +201,7 @@ export default defineComponent({
     }
 
     const onSubmit = async () => {
+      clearInterval(state.orderTimer)
       if (orderType.value === 'VIP') {
         // onCallback()
         buyVip(onCallback)
@@ -258,6 +259,7 @@ export default defineComponent({
             receiveAddress: addressDetails.value.id
           }
         })
+        console.log(data)
         state.pay_channel = data.paymentChannel
         if (data.status === 'PAID') {
           showConfirmDialog({

+ 1 - 1
src/views/adapay/pay-define/index.tsx

@@ -38,7 +38,7 @@ export default defineComponent({
         if (state.pay_channel == 'wx_pub') {
           payMap.code = state.code
         }
-
+        console.log(payMap, 'payMap')
         const { data } = await request.post('/api-student/open/userOrder/executePayment', {
           data: {
             ...payMap

+ 2 - 0
src/views/adapay/pay-result/index.tsx

@@ -100,6 +100,8 @@ export default defineComponent({
             ? data.expend.qrcode_url + '?payment_id=' + data.id + '&pay_channel=' + data.pay_channel
             : data.expend.qrcode_url
         window.location.href = url
+      } else if (state.pay_channel == 'alipay_wap') {
+        window.location.href = data.expend.pay_info
       } else if (state.pay_channel == 'wx_pub') {
         const tempPayInfo = JSON.parse(data.expend.pay_info)
         state.payInfo = tempPayInfo