From 4d4848ecda65adf399cd15a83049a4435e9a06c7 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 08 八月 2024 11:35:21 +0800
Subject: [PATCH] feat(支付): 登录逻辑修噶
---
pay/scanpay.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 00125c9..84d955b 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>
@@ -117,7 +117,10 @@
<view @click="getCoupon" class="coupon-btn">纭畾</view>
</u-popup>
<u-modal showCancelButton :show="showRemark" title="澶囨敞" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="showRemark = false">
- <u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" count></u--textarea>
+ <view style="border: 1rpx solid #eee;width: 100%">
+ <u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" maxlength="100" none count></u--textarea>
+ </view>
+
</u-modal>
</block>
<view v-if="shopInfo.scanFlag==0" class="empty-box">
@@ -225,16 +228,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) {
@@ -287,6 +293,9 @@
if (res.unionid) {
uni.setStorageSync('UNIONID' + this.payWay, res.unionid)
}
+ if (res.aLiUserId) {
+ uni.setStorageSync('ALIUSERID' + this.payWay, res.aLiUserId)
+ }
this.UNIONID = res.unionid
uni.setStorageSync(ACCESSTOKEN, res.token)
uni.setStorageSync('IS_NEW', res.isNew)
@@ -329,7 +338,7 @@
cid: this.cid
}
}
- if (this.activityQrcodeId) {
+ if (this.shopId) {
api = queryShopByShopId
params = {
shopId: this.shopId
--
Gitblit v1.9.1