From 53d549839c8568f6e45fe14ae1e8c4bebe159ead Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 03 九月 2024 16:48:35 +0800
Subject: [PATCH] feat(支付): 1、改为hash路由 2、页面显示错误原因
---
pay/scanpay.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index a4d685e..5b64e21 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -13,7 +13,7 @@
<view class="u-p-24 bg-fff u-m-32 u-br-10">
<view class="u-flex u-row-between">
<view class="u-font-28 color-666">閲戦</view>
- <view @click="showRemark=true" class="remark">娣诲姞澶囨敞</view>
+ <view @click="buyerNote='';showRemark=true;" class="remark">娣诲姞澶囨敞</view>
</view>
<view v-if="smoney" class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
<view class="money-icon color-333 lh-1">楼</view>
@@ -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
@@ -228,16 +230,19 @@
this.cid = opt.cid
this.init()
}
- if (opt.code || opt.auth_code) {
+ if (opt.code || opt.auth_code || opt.userAuthCode) {
let params = {
code: opt.code
}
let code = opt.code
- if (this.payWay == 2&&opt.state == 1 ) {
+ if (this.payWay == 2&&opt.state == 1 ) { //寰俊
params.getUserInfo = 1
}
- if (this.payWay == 5) {
+ if (this.payWay == 5) { //鏀粯瀹�
params.code = opt.auth_code
+ }
+ if (this.payWay == 15) { //浜戦棯浠�
+ code = opt.userAuthCode
}
const cd = uni.getStorageSync('cd')
if (code === cd) {
@@ -285,10 +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', res.aLiUserId)
+ }
+ if (res.cloudPayUserId) {
+ uni.setStorageSync('UNIONPAYID', res.cloudPayUserId)
}
this.UNIONID = res.unionid
uni.setStorageSync(ACCESSTOKEN, res.token)
@@ -301,7 +312,7 @@
/*鎺堟潈unionid*/
toRegister() {
if (this.payWay == 2) {
- const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${this.cid || ''}&shopId=${this.shopId || ''}&activityQrcodeId=${this.activityQrcodeId || ''}&smoney=${this.smoney || ''}`)
+ const redirect_uri = encodeURIComponent(`${config.webURL}/#/pay/scanpay?cid=${this.cid || ''}&shopId=${this.shopId || ''}&activityQrcodeId=${this.activityQrcodeId || ''}&smoney=${this.smoney || ''}`)
uni.clearStorageSync()
window.location.href =
`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${config.wx_appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=1#wechat_redirect`
@@ -348,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