From 044aa7f874f8fa37066e2da92901f40470b7090b Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 12 九月 2024 09:34:04 +0800
Subject: [PATCH] feat(支付): 修改系统名称

---
 pay/scanpay.vue |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 84d955b..b758326 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -39,14 +39,15 @@
                   font-size: 13px;
                   color: #999
                 }
+
                 .btn {
                   font-size: 13px;
                   color: #1E8BE0
                 }
               </style>
-              <span class="txt">寰俊鎼滅储鎴栫洿鎺ョ偣鍑绘墦寮�</span>
+              <span class="txt">寰俊鎼滅储鎴栫偣鍑绘墦寮�</span>
               <span class="btn">銆愬唨浼橀偖銆�</span>
-              <span class="txt">灏忕▼搴忥紝浜彈鏇村浼樻儬</span>
+              <span class="txt">灏忕▼搴忥紝浜洿澶氫紭鎯狅紒</span>
             </script>
           </wx-open-launch-weapp>
         </view>
@@ -208,7 +209,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
@@ -233,7 +234,7 @@
         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) { //鏀粯瀹�
@@ -288,19 +289,22 @@
     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)
       uni.setStorageSync('IS_NEW', res.isNew)
       this.isNew = res.isNew
-      if (!res.isNew) {
+      if (!res.isNew && !uni.$u.test.isEmpty(this.money)) {
         this.showCoupon()
       }
     },
@@ -316,6 +320,16 @@
     // 鏇存柊閲戦
     changeMoney(str) {
       this.money = str;
+      this.couponInfo = {
+        id: '',
+        discount: 0,
+        thresholdValue: 0
+      } // 浼樻儬鍒稿唴瀹�
+      this.checkCoupon = {
+        id: null,
+        discount: 0,
+        thresholdValue: 0
+      }
     },
     // 灞曠ず閿洏
     showBord() {
@@ -354,10 +368,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
       })
 
@@ -383,7 +397,11 @@
     },
     // 鑾峰彇浼氬憳鐩稿叧淇℃伅
     showCoupon() {
-      if(this.UNIONID){
+      if (this.UNIONID) {
+        if (uni.$u.test.isEmpty(this.money)) {
+          uni.$u.toast('璇疯緭鍏ラ噾棰濓紒')
+          return
+        }
         //鑾峰彇鐢ㄦ埛浼樻儬鍒�
         queryUseSweepPayCoupon({
           params: {
@@ -395,7 +413,7 @@
           this.couponList = res
           this.couponShow = true
         })
-      }else{
+      } else {
         this.toRegister()
       }
 
@@ -510,9 +528,11 @@
       });
     },
     closeOrder() {
-      closeOrder({params:{
-        id: this.orderId,
-      }}).then(res => {
+      closeOrder({
+        params: {
+          id: this.orderId,
+        }
+      }).then(res => {
       })
     }
   }

--
Gitblit v1.9.1