2024.07.01

- 对通联支付方法更改跳转和提示的逻辑；

src/utils/payUtil.js

@@ -12,6 +12,10 @@ const isInWx = () => {
   // #endif
   return false
 }
+import {
+  MessageBox,
+  Message
+} from 'element-ui'
 
 // #ifdef H5
 // const jweixin = require('jweixin-module')
@@ -358,14 +362,18 @@ async function h5TonglianPay(data, payType, type, otherArgs) {
     }).then((res) => {
       console.log(JSON.stringify(res.data))
       if (type) {
-        uni.removeStorageSync(T_PAY_ORDER)
-        uni.setStorageSync(T_PAY_ORDER, {
+        localStorage.removeItem(T_PAY_ORDER)
+        localStorage.setItem(T_PAY_ORDER, {
           type,
           TL_ORDER_NO: data.orderSn
         })
       }
       if (!res.data.package) { // 零元支付情况
-        uni.redirectTo({ url: '/user/otherServe/payment-completed/index' })
+        MessageBox.alert('支付成功', '提示', {
+          confirmButtonText: '确定'
+        }).then(() => {
+          location.reload()
+        })
       } else {
         const payData = JSON.parse(res.data.package)
         const form = document.createElement('form')
@@ -385,22 +393,20 @@ async function h5TonglianPay(data, payType, type, otherArgs) {
     })
       .catch((e) => {
         console.log(e)
-        uni.showToast({ title: '支付失败', icon: 'none' })
-        setTimeout(() => {
-          if ([1, 2].includes(payType)) {
-            uni.switchTab({ url: '/pages/order/order' })
-          } else if ([3, 4, 5].includes(payType)) {
-            uni.redirectTo({ url: '/user/otherServe/payment-completed/index?state=fail' })
-          }
-        }, 2000)
+        MessageBox.alert('支付失败', '提示', {
+          confirmButtonText: '确定'
+        }).then(() => {
+          location.reload()
+        })
       })
       .finally((e) => {
-        uni.hideLoading()
       })
   } else {
+    MessageBox.alert('通联支付只支持微信环境！', '提示', {
+      confirmButtonText: '确定'
+    })
     await getPayMiniProgramQueryApi({
-      orderFormid: data.orderFormid, // 无此传参
-      orderNo: data.orderSn || data.orderFormid,
+      orderNo: data.orderSn,
       purchaseMode: payType,
       paymentMode: data.paymentMode,
       ...otherArgs
@@ -439,8 +445,7 @@ async function h5TonglianPay(data, payType, type, otherArgs) {
 
 async function wvTonglianPay(data, payType, type, otherArgs) {
   await getPayMiniProgramQueryApi({
-    orderFormid: data.orderFormid, // 无此传参
-    orderNo: data.orderSn || data.orderFormid,
+    orderNo: data.orderSn,
     purchaseMode: payType,
     paymentMode: data.paymentMode,
     ...otherArgs
@@ -486,7 +491,7 @@ async function wvTonglianPay(data, payType, type, otherArgs) {
 async function appTonglianPay(data, payType, type, otherArgs) {
   await getPayMiniProgramQueryApi({
     orderFormid: data.orderFormid, // 无此传参
-    orderNo: data.orderSn || data.orderFormid,
+    orderNo: data.orderSn,
     purchaseMode: payType,
     paymentMode: data.paymentMode,
     ...otherArgs