同步

miniprogram/pages/wallet/wallet.js

@@ -1,4 +1,5 @@
 const app = getApp()
+const soulBridge = require('../../utils/soulBridge.js')
 const { trackClick } = require('../../utils/trackClick')
 
 Page({
@@ -114,23 +115,22 @@ Page({
         })
         const params = (payRes && payRes.data && payRes.data.payParams) ? payRes.data.payParams : (payRes && payRes.payParams ? payRes.payParams : null)
         if (params) {
-          wx.requestPayment({
-            ...params,
-            success: async () => {
-              // Confirm the recharge
-              await app.request({
-                url: '/api/miniprogram/balance/recharge/confirm',
-                method: 'POST',
-                data: { orderSn: res.data.orderSn }
-              })
-              wx.showToast({ title: '充值成功', icon: 'success' })
-              this.loadBalance()
-              this.loadTransactions()
-            },
-            fail: () => {
-              wx.showToast({ title: '支付取消', icon: 'none' })
-            }
-          })
+          try {
+            await soulBridge.requestWxJsapiPayment(params)
+            await soulBridge.syncOrderStatusQuery(app, payRes.data && payRes.data.orderSn)
+            await app.request({
+              url: '/api/miniprogram/balance/recharge/confirm',
+              method: 'POST',
+              data: { orderSn: res.data.orderSn }
+            })
+            wx.showToast({ title: '充值成功', icon: 'success' })
+            this.loadBalance()
+            this.loadTransactions()
+          } catch (e) {
+            const msg = (e && e.errMsg) ? String(e.errMsg) : ''
+            if (msg.indexOf('cancel') !== -1) wx.showToast({ title: '支付取消', icon: 'none' })
+            else wx.showToast({ title: '支付失败', icon: 'none' })
+          }
         } else {
           wx.showToast({ title: '创建支付失败', icon: 'none' })
         }