From 8f09fcb6707915dd961e653dd2322a7cc673fe80 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 03 九月 2024 17:42:27 +0800
Subject: [PATCH] feat(支付): 1、改为history路由
---
pay/scanpay.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 84d955b..c90f8f0 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -44,9 +44,11 @@
color: #1E8BE0
}
</style>
- <span class="txt">寰俊鎼滅储鎴栫洿鎺ョ偣鍑绘墦寮�</span>
- <span class="btn">銆愬唨浼橀偖銆�</span>
- <span class="txt">灏忕▼搴忥紝浜彈鏇村浼樻儬</span>
+ <div>
+ <span class="txt">寰俊鎼滅储鎴栫洿鎺ョ偣鍑绘墦寮�</span>
+ <span class="btn">銆愬唨浼橀偖銆�</span>
+ <span class="txt">灏忕▼搴忥紝浜彈鏇村浼樻儬</span>
+ </div>
</script>
</wx-open-launch-weapp>
</view>
@@ -208,7 +210,7 @@
uni.setStorageSync('SHOPID', opt.shopId)
uni.setStorageSync('SMONEY', opt.smoney)
uni.setStorageSync('AQCI', opt.activityQrcodeId)
- this.UNIONID = uni.getStorageSync('UNIONID' + this.payWay) || null
+ this.UNIONID = uni.getStorageSync('UNIONID') || null
this.isNew = uni.getStorageSync('IS_NEW')
if (opt.smoney) {
this.smoney = opt.smoney
@@ -288,13 +290,16 @@
getToken(res) {
this.token = res.token
if (res.openid) {
- uni.setStorageSync('OPENID' + this.payWay, res.openid)
+ uni.setStorageSync('OPENID', res.openid)
}
if (res.unionid) {
- uni.setStorageSync('UNIONID' + this.payWay, res.unionid)
+ uni.setStorageSync('UNIONID', res.unionid)
}
if (res.aLiUserId) {
- uni.setStorageSync('ALIUSERID' + this.payWay, res.aLiUserId)
+ uni.setStorageSync('ALIUSERID', res.aLiUserId)
+ }
+ if (res.cloudPayUserId) {
+ uni.setStorageSync('UNIONPAYID', res.cloudPayUserId)
}
this.UNIONID = res.unionid
uni.setStorageSync(ACCESSTOKEN, res.token)
@@ -354,10 +359,10 @@
res.logoImage = config.baseURL + res.logoImage
}
this.shopInfo = res
- }).catch(() => {
+ }).catch((err) => {
clearTimeout(timer)
this.shopInfo.scanFlag = 0
- this.tips = '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
+ this.tips = err.description||'褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
this.loading = false
})
--
Gitblit v1.9.1