From 517840ff199063419bbda4d1d4ef2b0ebc49e71d Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 25 十二月 2024 11:23:53 +0800
Subject: [PATCH] feat(支持线上订单支付 ):
---
pay/index.vue | 2 +-
pay/scanpay.vue | 57 ++++++++++++++++++++++++++++++++++++---------------------
2 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/pay/index.vue b/pay/index.vue
index 0b2d5a5..e3716bf 100644
--- a/pay/index.vue
+++ b/pay/index.vue
@@ -19,7 +19,7 @@
this.opt = opt
},
onShow() {
- let redirect_uri = `${config.webURL}/pay/scanpay?cid=${this.opt.cid||''}&shopId=${this.opt.shopId||''}&activityQrcodeId=${this.opt.activityQrcodeId||''}&smoney=${this.opt.smoney||''}`
+ let redirect_uri = `${config.webURL}/pay/scanpay?cid=${this.opt.cid||''}&shopId=${this.opt.shopId||''}&activityQrcodeId=${this.opt.activityQrcodeId||''}&onlineId=${this.opt.onlineId||''}`
if(this.platform==2&&uni.getStorageSync('OPENID')){
window.location.href = redirect_uri
return
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index afecb67..fcf8f4c 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="buyerNote='';showRemark=true;" class="remark">娣诲姞澶囨敞</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>
@@ -52,7 +52,7 @@
</wx-open-launch-weapp>
</view>
</view>
- <block v-if="payWay==2&&shopInfo.userCouponFlag==1">
+ <block v-if="useCoupon">
<view class="bg-fff u-m-32 u-br-10">
<view class="u-flex u-p-24 u-border-bottom">
<!-- <u-icon name="coupon-fill" size="60rpx" color="#D31F28"></u-icon> -->
@@ -183,7 +183,8 @@
activityQrcodeId: '', //鍔ㄦ�佹敹娆剧爜 C鎵獴鍔ㄦ�佺爜鏃舵湁
shopId: '', //鍟嗘埛id C鎵獴鍔ㄦ�佺爜鏃舵湁
bordShow: false, // 鏄剧ず閿洏
- orderId: '', //鍐�浼橀偖绾夸笂璁㈠崟id
+ onlineId: '', //鍐�浼橀偖绾夸笂璁㈠崟id
+ orderId: '', //
shopInfo: {
cusid: '',
shopName: '',
@@ -213,6 +214,12 @@
};
},
computed: {
+ useCoupon() {
+ if(this.onlineId){
+ return this.couponInfo.id!=''
+ }
+ return this.payWay==2&&this.shopInfo.userCouponFlag==1
+ },
discount1() {
if(!(this.money || 0)||!this.checkCoupon.id){
return 0
@@ -248,7 +255,6 @@
onLoad(opt) {
uni.setStorageSync('CID', opt.cid)
uni.setStorageSync('SHOPID', opt.shopId)
- uni.setStorageSync('ORDERID', opt.orderId)
uni.setStorageSync('SMONEY', opt.smoney)
uni.setStorageSync('AQCI', opt.activityQrcodeId)
this.UNIONID = uni.getStorageSync('UNIONID') || null
@@ -256,15 +262,13 @@
if (opt.smoney) {
this.smoney = opt.smoney
this.money = opt.smoney
+ }else if (opt.onlineId) {
+ this.onlineId = opt.onlineId
+ this.init()
+ } else if (opt.activityQrcodeId) {
+ this.activityQrcodeId = opt.activityQrcodeId
} else {
this.bordShow = true
- }
- if (opt.orderId) {
- this.orderId = opt.orderId
- this.init()
- }
- if (opt.activityQrcodeId) {
- this.activityQrcodeId = opt.activityQrcodeId
}
if (opt.shopId) {
this.shopId = opt.shopId
@@ -349,14 +353,14 @@
uni.setStorageSync(ACCESSTOKEN, res.token)
uni.setStorageSync('IS_NEW', res.isNew)
this.isNew = res.isNew
- if (!res.isNew && !uni.$u.test.isEmpty(this.money)) {
+ if (!this.onlineId&&!res.isNew && !uni.$u.test.isEmpty(this.money)) {
this.queryUseSweepPayCoupon()
}
},
/*鎺堟潈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 || ''}`)
+ const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${this.cid || ''}&shopId=${this.shopId || ''}&activityQrcodeId=${this.activityQrcodeId || ''}&smoney=${this.smoney || ''}&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`
@@ -403,10 +407,10 @@
shopId: this.shopId
}
}
- if (this.orderId) {
+ if (this.onlineId) {
api = getOnlineId
params = {
- onlineId: this.orderId
+ onlineId: this.onlineId
}
}
//鑾峰彇鍟嗛摵淇℃伅
@@ -419,8 +423,9 @@
res.logoImage = config.baseURL + res.logoImage
}
this.shopInfo = res
- if(this.orderId){
- this.money = res.totaPrice
+ if(this.onlineId){
+ this.smoney = this.$utils.fenToYuan(res.totalPrice)
+ this.money = this.$utils.fenToYuan(res.totalPrice)
if(res.couponId){
this.couponInfo = {
id: res.couponId,
@@ -516,7 +521,7 @@
},
// 鑾峰彇浼氬憳鐩稿叧淇℃伅
showCoupon() {
- if(this.orderId){
+ if(this.onlineId){
return
}
if (this.UNIONID||this.payWay==5) {
@@ -598,7 +603,10 @@
}
this.bordShow = false
// 閲戦 this.money
- uni.showLoading()
+ uni.showLoading({
+ title: '涓嬪崟涓�',
+ mask: true
+ })
let params = {
money: this.$utils.accMul(this.money,100),
shopId: this.shopInfo.id,
@@ -615,8 +623,8 @@
if (this.cid) {
params.cid = this.cid
}
- if (this.orderId) {
- params = {onlineId: this.onlineId}
+ if (this.onlineId) {
+ params = {payWay: this.payWay,onlineId: this.onlineId}
}
//鐢熸垚璁㈠崟
saveOrder(params).then(res => {
@@ -690,11 +698,18 @@
});
},
closeOrder() {
+ uni.showLoading({
+ title: '鍙栨秷鏀粯涓�',
+ mask: true
+ })
closeOrder({
params: {
id: this.orderId,
}
}).then(res => {
+ uni.hideLoading()
+ }).catch(()=>{
+ uni.hideLoading()
})
}
}
--
Gitblit v1.9.1