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 |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 00125c9..c90f8f0 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>
@@ -117,7 +119,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">
@@ -205,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
@@ -225,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) {
@@ -282,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)
@@ -329,7 +343,7 @@
           cid: this.cid
         }
       }
-      if (this.activityQrcodeId) {
+      if (this.shopId) {
         api = queryShopByShopId
         params = {
           shopId: this.shopId
@@ -345,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