From d113dc3d1e5f3b42ea414e8be538ce2442ffc899 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 30 七月 2024 17:43:05 +0800
Subject: [PATCH] feat(支付): 支持C扫B动态码支付
---
pay/login.vue | 2
manifest.json | 2
pay/scanpay.vue | 48 +++++++++++++++++++----
common/api/index.js | 12 +++---
4 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/common/api/index.js b/common/api/index.js
index f899fb6..e802088 100644
--- a/common/api/index.js
+++ b/common/api/index.js
@@ -4,10 +4,13 @@
const http = uni.$u.http;
const URL = config.baseURL;
-/* 鑾峰彇鍟嗛摵淇℃伅 */
-export const queryShop = (params, config = {}) => http.get(URL +
+/* 鏍规嵁cid鑾峰彇鍟嗛摵淇℃伅 */
+export const queryShopByCid = (params, config = {}) => http.get(URL +
'/payfour-merchant/v1/web/aggregatePayAllin/queryShopById', params, config)
+/* 鏍规嵁shopId鑾峰彇鍟嗛摵淇℃伅 */
+export const queryShopByShopId = (params, config = {}) => http.get(URL +
+ '/payfour-merchant/v1/web/aggregatePayAllin/queryShopByShopId', params, config)
/* 鑾峰彇绉垎浠峰�� */
export const getScoreWorth = (params, config = {}) => http.get(URL +
'/payfour-merchant/v1/web/aggregatePayAllin/getScoreWorth', params, config)
@@ -29,6 +32,7 @@
/* 鑾峰彇鐢ㄦ埛鍙敤浼樻儬鍒� 闈㈠�兼渶澶х殑*/
export const queryMyUseSweepPayMaxCoupon = (params, config = {}) => http.get(URL +
'/payfour-merchant/v1/web/aggregatePayAllin/queryMyUseSweepPayMaxCoupon', params, config = {});
+
/* 鑾峰彇鐢ㄦ埛鍙敤浼樻儬鍒� */
export const queryUseSweepPayCoupon = (params, config = {}) => http.get(URL +
'/payfour-merchant/v1/web/aggregatePayAllin/queryUseSweepPayCoupon', params, config = {});
@@ -50,8 +54,4 @@
'/payfour-merchant/v1/web/aggregatePayAllin/getWxOrderInfo',
params, config = {});
-/* 鑾峰彇閾惰鍗￠厤缃� */
-export const bankCardStyle = (params, config = {}) => http.get(URL +
- '/payfour-base/v1/base/pc/global/config/bankCardStyle',
- params, config = {});
diff --git a/manifest.json b/manifest.json
index b88dd59..31c1648 100644
--- a/manifest.json
+++ b/manifest.json
@@ -79,7 +79,7 @@
"devServer" : {
"proxy" : {
"/dev-api" : {
- "target" : "http://172.16.2.117:8080",
+ "target" : "http://172.16.2.119:8080",
"changeOrigin" : true,
"secure" : false,
"pathRewrite" : {
diff --git a/pay/login.vue b/pay/login.vue
index 70d0ba6..1789eb0 100644
--- a/pay/login.vue
+++ b/pay/login.vue
@@ -19,7 +19,7 @@
this.opt = opt
},
onShow() {
- let redirect_uri = `${config.webURL}/pay/scanpay?cid=${this.opt.cid||''}&shopId=${this.opt.shopId||''}&smoney=${this.opt.smoney||''}`
+ let redirect_uri = `${config.webURL}/pay/scanpay?cid=${this.opt.cid||''}&shopId=${this.opt.shopId||''}&activityQrcodeId=${this.opt.activityQrcodeId||''}&smoney=${this.opt.smoney||''}`
if(uni.getStorageSync('OPENID'+this.platform)){
window.location.href = redirect_uri
return
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 398e1d7..2ac6a37 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -140,7 +140,8 @@
ACCESSTOKEN
} from 'common/config.js';
import {
- queryShop,
+ queryShopByCid,
+ queryShopByShopId,
userLogin,
queryUseSweepPayCoupon,
getWechatConfigInfo,
@@ -161,7 +162,9 @@
showRemark: false,
UNIONID: null,
payWay: this.$utils.getPlat(),
- cid: '',
+ cid: '', //鐮佺墝id C鎵獴闈欐�佺爜鏃舵湁
+ activityQrcodeId: '', //鍔ㄦ�佹敹娆剧爜 C鎵獴鍔ㄦ�佺爜鏃舵湁
+ shopId: '', //鍟嗘埛id C鎵獴鍔ㄦ�佺爜鏃舵湁
bordShow: false, // 鏄剧ず閿洏
shopInfo: {
cusid: '',
@@ -209,6 +212,14 @@
this.money = opt.smoney
}else{
this.bordShow = true
+ }
+ if (opt.activityQrcodeId) {
+ this.activityQrcodeId = opt.activityQrcodeId
+ // this.getOrderInfo()
+ }
+ if (opt.shopId) {
+ this.shopId = opt.shopId
+ this.init()
}
if (opt.cid) {
this.cid = opt.cid
@@ -305,11 +316,25 @@
this.tips = '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
this.loading = false
}, 2000)
+ let api = queryShopByCid
+ let params = {
+ cid: this.cid
+ }
+ if(this.cid){
+ api = queryShopByCid
+ params = {
+ cid: this.cid
+ }
+ }
+ if(this.activityQrcodeId){
+ api = queryShopByShopId
+ params = {
+ shopId: this.shopId
+ }
+ }
//鑾峰彇鍟嗛摵淇℃伅
- queryShop({
- params: {
- cid: this.cid
- }
+ api({
+ params
}).then(res => {
clearTimeout(timer)
this.loading = false
@@ -385,14 +410,19 @@
// 閲戦 this.money
uni.showLoading()
const params = {
- money: Number(this.money * 100),
- shopId: this.shopInfo.id,
- cid: this.cid,
payWay: this.payWay,
buyerNote: this.buyerNote,
score: 0,
couponDetailId: this.couponInfo.id
}
+ if(this.activityQrcodeId){
+ params.activityQrcodeId = this.activityQrcodeId
+ }
+ if(this.cid){
+ params.money = Number(this.money * 100)
+ params.shopId = this.shopInfo.id
+ params.cid = this.cid
+ }
//鐢熸垚璁㈠崟
saveOrder(params).then(res => {
uni.hideLoading()
--
Gitblit v1.9.1