From 517840ff199063419bbda4d1d4ef2b0ebc49e71d Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 25 十二月 2024 11:23:53 +0800
Subject: [PATCH] feat(支持线上订单支付 ):
---
pay/scanpay.vue | 109 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 17 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index bcffe02..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> -->
@@ -66,7 +66,6 @@
{{ $utils.accMul(couponInfo.discount, 10) }}鎶樺埜
</view>
</block>
-
<view v-else class="u-font-28 lh-1 u-tips-color">璇烽�夋嫨</view>
<u-icon class="u-m-l-10" name="arrow-right" color="#999" size="16"></u-icon>
</view>
@@ -159,6 +158,7 @@
import {
queryShopByCid,
queryShopByShopId,
+ getOnlineId,
userLogin,
queryUseSweepPayCoupon,
getWechatConfigInfo,
@@ -178,12 +178,13 @@
buyerNote: '',
showRemark: false,
UNIONID: null,
- payWay: this.$utils.getPlat(), //2 缁翠俊 5鏀粯瀹� 15浜戦棯浠�
+ payWay: this.$utils.getPlat(), //2 寰俊 5鏀粯瀹� 15浜戦棯浠�
cid: '', //鐮佺墝id C鎵獴闈欐�佺爜鏃舵湁
activityQrcodeId: '', //鍔ㄦ�佹敹娆剧爜 C鎵獴鍔ㄦ�佺爜鏃舵湁
shopId: '', //鍟嗘埛id C鎵獴鍔ㄦ�佺爜鏃舵湁
bordShow: false, // 鏄剧ず閿洏
- orderId: '',
+ 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
@@ -255,12 +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.activityQrcodeId) {
- this.activityQrcodeId = opt.activityQrcodeId
- // this.getOrderInfo()
}
if (opt.shopId) {
this.shopId = opt.shopId
@@ -345,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`
@@ -399,6 +407,12 @@
shopId: this.shopId
}
}
+ if (this.onlineId) {
+ api = getOnlineId
+ params = {
+ onlineId: this.onlineId
+ }
+ }
//鑾峰彇鍟嗛摵淇℃伅
api({
params
@@ -409,6 +423,18 @@
res.logoImage = config.baseURL + res.logoImage
}
this.shopInfo = res
+ 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,
+ thresholdValue: res.thresholdValue,
+ discount: res.discount,
+ discountType: res.discountType,
+ }
+ }
+ }
}).catch((err) => {
clearTimeout(timer)
this.shopInfo.scanFlag = 0
@@ -433,11 +459,39 @@
wx.ready( ()=> {
wx.hideAllNonBaseMenuItem();
if(CHECK_LOCATION){
- this.wxGetLocation()
+ this.wxGetLocation(null)
}
})
})
}
+ if(this.payWay == 5){
+ ap.hideOptionButton();
+ this.apGetLocation(null)
+ }
+ },
+ apGetLocation(callback){
+ ap.getLocation((res)=> {
+ console.log('apGetLocation',res)
+ if(res.latitude){
+ this.lat = parseFloat(res.latitude).toFixed(6); // 绾害锛屾诞鐐规暟锛岃寖鍥翠负90 ~ -90
+ this.lng = parseFloat(res.longitude).toFixed(6); // 缁忓害锛屾诞鐐规暟锛岃寖鍥翠负180 ~ -180銆�
+ if(callback) callback()
+ }else{
+ uni.showModal({
+ title: '鎻愮ず',
+ content: "鑾峰彇鍦扮悊浣嶇疆澶辫触锛屾棤娉曡繘琛屾敮浠橈紒",
+ confirmText: '閲嶆柊鎺堟潈',
+ cancelText: '閫�鍑�',
+ success: ret=>{
+ if(ret.confirm){
+ this.apGetLocation(callback)
+ }else{
+ this.clickDone()
+ }
+ }
+ })
+ }
+ })
},
wxGetLocation(callback){
wx.getLocation({
@@ -455,19 +509,21 @@
cancelText: '閫�鍑�',
success: ret=>{
if(ret.confirm){
- this.wxGetLocation()
+ this.wxGetLocation(callback)
}else{
this.clickDone()
}
}
})
}
-
}
});
},
// 鑾峰彇浼氬憳鐩稿叧淇℃伅
showCoupon() {
+ if(this.onlineId){
+ return
+ }
if (this.UNIONID||this.payWay==5) {
if (uni.$u.test.isEmpty(this.money)) {
uni.$u.toast('璇疯緭鍏ラ噾棰濓紒')
@@ -482,6 +538,7 @@
},
//鑾峰彇鐢ㄦ埛浼樻儬鍒�
queryUseSweepPayCoupon() {
+ //2 寰俊 5鏀粯瀹� 15浜戦棯浠�
const applyPayWayStr = {
2: 1,
5: 2,
@@ -528,7 +585,12 @@
return
}
if(!this.lat){
- this.wxGetLocation(this.pay)
+ if(this.payWay == 2){
+ this.wxGetLocation(this.pay)
+ }
+ if(this.payWay == 5){
+ this.apGetLocation(this.pay)
+ }
}else{
this.pay()
}
@@ -541,8 +603,11 @@
}
this.bordShow = false
// 閲戦 this.money
- uni.showLoading()
- const params = {
+ uni.showLoading({
+ title: '涓嬪崟涓�',
+ mask: true
+ })
+ let params = {
money: this.$utils.accMul(this.money,100),
shopId: this.shopInfo.id,
payWay: this.payWay,
@@ -557,6 +622,9 @@
}
if (this.cid) {
params.cid = this.cid
+ }
+ if (this.onlineId) {
+ params = {payWay: this.payWay,onlineId: this.onlineId}
}
//鐢熸垚璁㈠崟
saveOrder(params).then(res => {
@@ -630,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