From 2d88676a862d41abfb1f471f2cf071a5bc839adf Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 06 一月 2025 12:01:40 +0800
Subject: [PATCH] feat(活码支付): 金额和商户信息直接从活码查询

---
 pay/scanpay.vue |   62 ++++++++++++++-----------------
 1 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 1322081..eb489a4 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -15,13 +15,7 @@
           <view class="u-font-28 color-666">閲戦</view>
           <view v-if="!onlineId" @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>
-          <view class="u-flex-1 u-flex u-col-bottom u-m-l-10" style="height: 80rpx;">
-            <view class="money-num lh-1">{{ smoney }}</view>
-          </view>
-        </view>
-        <view v-else class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
+        <view 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>
           <view class="u-flex-1 u-flex u-col-bottom u-m-l-10" style="height: 80rpx;">
             <view v-if="money" class="money-num lh-1">{{ money }}</view>
@@ -157,8 +151,8 @@
 } from 'common/config.js';
 import {
   queryShopByCid,
-  queryShopByShopId,
-  getOnlineId,
+  queryShopByOnlineId,
+  queryShopByActQrId,
   userLogin,
   queryUseSweepPayCoupon,
   getWechatConfigInfo,
@@ -171,7 +165,6 @@
 export default {
   data() {
     return {
-      smoney: '',
       tips: '璇ュ晢鎴锋殏鏈紑閫氭敮浠樺姛鑳�',
       loading: false,
       remark: '',
@@ -189,6 +182,7 @@
         cusid: '',
         shopName: '',
         logoImage: '',
+        checkLocation: false,
         scanFlag: -1,
         useScoreFlag: -1, //鍟嗛摵鏄惁鍙敤绉垎 0鍚� 1鏄�
         userCouponFlag: -1, //鍟嗛摵鏄惁鍙敤浼樻儬鍒� 0鍚� 1鏄�
@@ -255,29 +249,27 @@
   onLoad(opt) {
     uni.setStorageSync('CID', opt.cid)
     uni.setStorageSync('SHOPID', opt.shopId)
-    uni.setStorageSync('SMONEY', opt.smoney)
     uni.setStorageSync('AQCI', opt.activityQrcodeId)
     this.UNIONID = uni.getStorageSync('UNIONID') || null
     this.isNew = uni.getStorageSync('IS_NEW')
-    if (opt.smoney) {
-      this.smoney = opt.smoney
-      this.money = opt.smoney
-    }else if (opt.onlineId) {
+
+    if (opt.cid) {
+      this.bordShow = true
+      this.cid = opt.cid
+      this.init()
+    } else if (opt.onlineId) {
       this.onlineId = opt.onlineId
       this.init()
     } else if (opt.activityQrcodeId) {
       this.activityQrcodeId = opt.activityQrcodeId
-    } else {
-      this.bordShow = true
-    }
-    if (opt.shopId) {
       this.shopId = opt.shopId
       this.init()
+    } else {
+      this.shopInfo.scanFlag = 0
+      this.loading = false
+      this.tips = '璇锋壂鎻忓唨椹夸粯鐮佺墝锛�'
     }
-    if (opt.cid) {
-      this.cid = opt.cid
-      this.init()
-    }
+
     if (opt.code || opt.auth_code || opt.userAuthCode) {
       let params = {
         code: opt.code
@@ -360,7 +352,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 || ''}&onlineId=${this.onlineId||''}`)
+        const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${this.cid || ''}&activityQrcodeId=${this.activityQrcodeId || ''}&onlineId=${this.onlineId||''}`)
         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`
@@ -382,6 +374,10 @@
     },
     // 灞曠ず閿洏
     showBord() {
+      if(this.onlineId||this.activityQrcodeId){
+        this.bordShow = false;
+        return
+      }
       this.bordShow = true;
     },
     init() {
@@ -401,14 +397,14 @@
           cid: this.cid
         }
       }
-      if (this.shopId) {
-        api = queryShopByShopId
+      if (this.activityQrcodeId) {
+        api = queryShopByActQrId
         params = {
-          shopId: this.shopId
+          activityQrcodeId: this.activityQrcodeId
         }
       }
       if (this.onlineId) {
-        api = getOnlineId
+        api = queryShopByOnlineId
         params = {
           onlineId: this.onlineId
         }
@@ -423,8 +419,10 @@
           res.logoImage = config.baseURL + res.logoImage
         }
         this.shopInfo = res
+        if(res.total){
+          this.money = this.$utils.fenToYuan(res.total)
+        }
         if(this.onlineId){
-          this.smoney = this.$utils.fenToYuan(res.totalPrice)
           this.money = this.$utils.fenToYuan(res.totalPrice)
           if(res.couponId){
             this.couponInfo = {
@@ -458,15 +456,11 @@
           });
           wx.ready( ()=> {
             wx.hideAllNonBaseMenuItem();
-            if(CHECK_LOCATION){
-              this.wxGetLocation(null)
-            }
           })
         })
       }
-      if(this.payWay == 5&&CHECK_LOCATION){
+      if(this.payWay == 5){
         ap.hideOptionButton();
-        this.apGetLocation(null)
       }
     },
     apGetLocation(callback){

--
Gitblit v1.9.1