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 | 408 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 305 insertions(+), 103 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 00125c9..eb489a4 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -13,15 +13,9 @@
<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="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>
- <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>
@@ -39,27 +33,33 @@
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>
</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> -->
<view class="u-font-32 u-flex-1 u-m-h-16">浼樻儬鍒�</view>
<view @click="showCoupon" class="u-flex">
- <view v-if="couponInfo.id" class="tag-pain">
- 婊{ parseFloat((couponInfo.thresholdValue / 100).toFixed(2)) }}鍏冨噺{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}鍏�
- </view>
+ <block v-if="couponInfo.id">
+ <view v-if="couponInfo.discountType==1" class="tag-pain">
+ 婊{ $utils.fenToYuan(couponInfo.thresholdValue) }}鍏冨噺{{ $utils.fenToYuan(couponInfo.discount) }}鍏冨埜
+ </view>
+ <view v-if="couponInfo.discountType==2" class="tag-pain">
+ {{ $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>
@@ -81,43 +81,58 @@
</view>
</view>
</block>
- <button class="pay-it" @click="pay">浠樻</button>
+ <button class="pay-it" @click="checkLocation">浠樻</button>
+ <view v-if="bordShow" style="height: 470rpx"></view>
<!-- 鏁板瓧閿洏 -->
<u-popup zIndex="500" :show="bordShow" :overlay="false" @close="bordShow = false">
- <key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
+ <key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="checkLocation"></key-bord>
</u-popup>
<!-- 浼樻儬鍒稿脊绐� -->
<u-popup v-if="payWay==2" mode="bottom" :closeable="true" :show="couponShow" @close="couponShow = false" :round="10">
<view class="u-font-32 color-333 u-text-center u-p-t-30">浼樻儬鍒�</view>
<view v-if="checkCoupon.id" class="choose-coupon">
- 宸查�夋嫨浼樻儬鍒�1寮狅紝鍏辨姷鎵ｏ骏{{ parseFloat((checkCoupon.discount / 100).toFixed(2)) }}
+ 宸查�夋嫨浼樻儬鍒�1寮狅紝鍙姷鎵ｏ骏{{ discount1 }}
</view>
<scroll-view scroll-y class="u-p-30 coupon-list">
- <view @click="clickCoupon(item)" class="u-m-b-24 u-flex coupon" v-for="(item, index) in couponList" :key="index">
- <view style="color: #D31F28;" class="u-p-h-28">
- <view class="font-bold">
- <text class="u-font-36">锟�</text>
- <text class="money">{{ parseFloat(item.discount / 100) }}</text>
- </view>
- <view class="u-font-24 u-m-t-20">婊{ parseFloat(item.thresholdValue / 100) }}鍏冧娇鐢�</view>
- </view>
- <view class="butt"></view>
- <view class="u-p-30 u-flex-1 u-flex">
- <view class="u-flex-1">
- <view class="u-font-28 color-333 u-line-2">{{ item.name }}</view>
- <view class="u-font-22 color-999 u-m-t-20">
- 鏈夋晥鏈熻嚦锛歿{ $u.timeFormat(item.outTime, 'yyyy-mm-dd hh:MM') }}
+ <u-loadmore v-if="!couponList" status="loading"/>
+ <u-empty v-else-if="couponList.length===0" mode="coupon" icon="/static/no_coupon.png" text="鏆傛棤浼樻儬鍒稿彲鐢�!"></u-empty>
+ <block v-else>
+ <view @click="clickCoupon(item)" class="u-m-b-24 u-flex coupon" v-for="(item, index) in couponList" :key="index">
+ <view class="num-box">
+ <view v-if="item.discountType==1" class="font-bold" style="color: #D31F28;">
+ <text class="u-font-36">锟�</text>
+ <text class="money">{{ $utils.fenToYuan(item.discount) }}</text>
</view>
+ <view v-if="item.discountType==2" class="font-bold" style="color: #D31F28;">
+ <text class="money">{{ $utils.accMul(item.discount, 10) }}</text>
+ <text class="u-font-36">鎶�</text>
+ </view>
+ <view v-if="item.orderMax" class="u-font-24 u-m-t-20">浣庝簬{{ $utils.fenToYuan(item.orderMax) }}鍏冨彲鐢�</view>
+ <view v-else-if="item.thresholdValue" class="u-font-24 u-m-t-20">婊{ $utils.fenToYuan(item.thresholdValue) }}鍏冨彲鐢�</view>
+ <view v-else class="u-font-24 u-m-t-20">鏃犻棬妲�</view>
</view>
- <u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="20">
- </u-icon>
+ <view class="butt"></view>
+ <view class="u-p-30 u-flex-1 u-flex">
+ <view class="u-flex-1">
+ <view class="u-font-32 color-333 u-line-2">{{ item.name }}</view>
+ <view class="u-font-22 color-999 u-m-t-20">
+ 鏈夋晥鏈熻嚦锛歿{ $u.timeFormat(item.outTime, 'yyyy-mm-dd hh:MM') }}
+ </view>
+ </view>
+ <u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="24">
+ </u-icon>
+ </view>
</view>
- </view>
+ </block>
</scroll-view>
<view @click="getCoupon" class="coupon-btn">纭畾</view>
</u-popup>
+ <!-- 澶囨敞寮圭獥 -->
<u-modal showCancelButton :show="showRemark" title="澶囨敞" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="showRemark = false">
- <u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" count></u--textarea>
+ <view style="border: 1rpx solid #eee;width: 100%">
+ <u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" maxlength="100" none count></u--textarea>
+ </view>
+
</u-modal>
</block>
<view v-if="shopInfo.scanFlag==0" class="empty-box">
@@ -131,11 +146,13 @@
<script>
import {
config,
- ACCESSTOKEN
+ ACCESSTOKEN,
+ CHECK_LOCATION
} from 'common/config.js';
import {
queryShopByCid,
- queryShopByShopId,
+ queryShopByOnlineId,
+ queryShopByActQrId,
userLogin,
queryUseSweepPayCoupon,
getWechatConfigInfo,
@@ -148,33 +165,36 @@
export default {
data() {
return {
- smoney: '',
tips: '璇ュ晢鎴锋殏鏈紑閫氭敮浠樺姛鑳�',
loading: false,
remark: '',
buyerNote: '',
showRemark: false,
UNIONID: null,
- payWay: this.$utils.getPlat(), //2 缁翠俊 5鏀粯瀹�
+ payWay: this.$utils.getPlat(), //2 寰俊鍏紬鍙� 3寰俊灏忕▼搴� 5鏀粯瀹� 15浜戦棯浠�
cid: '', //鐮佺墝id C鎵獴闈欐�佺爜鏃舵湁
activityQrcodeId: '', //鍔ㄦ�佹敹娆剧爜 C鎵獴鍔ㄦ�佺爜鏃舵湁
shopId: '', //鍟嗘埛id C鎵獴鍔ㄦ�佺爜鏃舵湁
bordShow: false, // 鏄剧ず閿洏
- orderId: '',
+ onlineId: '', //鍐�浼橀偖绾夸笂璁㈠崟id
+ orderId: '', //
shopInfo: {
cusid: '',
shopName: '',
logoImage: '',
+ checkLocation: false,
scanFlag: -1,
useScoreFlag: -1, //鍟嗛摵鏄惁鍙敤绉垎 0鍚� 1鏄�
userCouponFlag: -1, //鍟嗛摵鏄惁鍙敤浼樻儬鍒� 0鍚� 1鏄�
},
+ lat: '', //绾害
+ lng: '', //缁忓害
money: '', // 閲戦
token: null,
isNew: false, // 鏄惁鏂扮敤鎴凤紝鏂扮敤鎴锋煡璇笉鍒扮Н鍒嗗拰閾惰鍗�
canReset: false,
couponShow: false, // 浼樻儬鍒稿脊绐�
- couponList: [], // 浼樻儬鍒�
+ couponList: null, // 浼樻儬鍒�
couponInfo: {
id: '',
discount: 0,
@@ -188,53 +208,81 @@
};
},
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
+ }
+ if (this.checkCoupon.discountType == 1) {
+ const num = this.$utils.fenToYuan(this.checkCoupon.discount)
+ return parseFloat(num);
+ }
+ const dis = 1 - parseFloat(this.checkCoupon.discount)
+ const dic = Math.floor(this.$utils.accMul(this.money,100) * dis)
+ return this.$utils.fenToYuan(dic).toFixed(2);
+ },
discount() {
- let num = 0;
- num = (this.couponInfo.discount / 100).toFixed(2);
- return parseFloat(num);
+ if(!(this.money || 0)||!this.couponInfo.id){
+ return 0
+ }
+ if (this.couponInfo.discountType == 1) {
+ const num = this.$utils.fenToYuan(this.couponInfo.discount)
+ return parseFloat(num);
+ }
+ const dis = 1 - parseFloat(this.couponInfo.discount)
+ const dic = Math.floor(this.$utils.accMul(this.money,100) * dis)
+ return this.$utils.fenToYuan(dic).toFixed(2);
},
payMoney() {
- let num = 0;
- num = Number((this.money || 0) * 100) - this.couponInfo.discount;
- num = num > 0 ? (num / 100).toFixed(2) : '0.00';
- return parseFloat(num);
+ if(this.discount===0||!Number(this.money || 0)){
+ return 0
+ }
+ const num = this.$utils.accMul(this.money,100) - this.$utils.accMul(this.discount,100);
+ return this.$utils.fenToYuan(num).toFixed(2);
}
},
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' + this.payWay) || null
+ this.UNIONID = uni.getStorageSync('UNIONID') || null
this.isNew = uni.getStorageSync('IS_NEW')
- if (opt.smoney) {
- this.smoney = opt.smoney
- 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.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
+ this.shopId = opt.shopId
+ this.init()
+ } else {
+ this.shopInfo.scanFlag = 0
+ this.loading = false
+ this.tips = '璇锋壂鎻忓唨椹夸粯鐮佺墝锛�'
}
- if (opt.code || opt.auth_code) {
+
+ if (opt.code || opt.auth_code || opt.userAuthCode) {
let params = {
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) {
+ if (this.payWay == 5) { //鏀粯瀹�
params.code = opt.auth_code
+ }
+ if (this.payWay == 15) { //浜戦棯浠�
+ code = opt.userAuthCode
}
const cd = uni.getStorageSync('cd')
if (code === cd) {
@@ -282,23 +330,29 @@
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', 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) {
- this.showCoupon()
+ 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 || ''}&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`
@@ -307,9 +361,23 @@
// 鏇存柊閲戦
changeMoney(str) {
this.money = str;
+ this.couponInfo = {
+ id: '',
+ discount: 0,
+ thresholdValue: 0
+ } // 浼樻儬鍒稿唴瀹�
+ this.checkCoupon = {
+ id: null,
+ discount: 0,
+ thresholdValue: 0
+ }
},
// 灞曠ず閿洏
showBord() {
+ if(this.onlineId||this.activityQrcodeId){
+ this.bordShow = false;
+ return
+ }
this.bordShow = true;
},
init() {
@@ -330,9 +398,15 @@
}
}
if (this.activityQrcodeId) {
- api = queryShopByShopId
+ api = queryShopByActQrId
params = {
- shopId: this.shopId
+ activityQrcodeId: this.activityQrcodeId
+ }
+ }
+ if (this.onlineId) {
+ api = queryShopByOnlineId
+ params = {
+ onlineId: this.onlineId
}
}
//鑾峰彇鍟嗛摵淇℃伅
@@ -345,10 +419,24 @@
res.logoImage = config.baseURL + res.logoImage
}
this.shopInfo = res
- }).catch(() => {
+ if(res.total){
+ this.money = this.$utils.fenToYuan(res.total)
+ }
+ if(this.onlineId){
+ 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
- this.tips = '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
+ this.tips = err.description || '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
this.loading = false
})
@@ -363,33 +451,105 @@
timestamp: res.timestamp, // 蹇呭～锛岀敓鎴愮鍚嶇殑鏃堕棿鎴�
nonceStr: res.noncestr, // 蹇呭～锛岀敓鎴愮鍚嶇殑闅忔満涓�
signature: res.signature, // 蹇呭～锛岀鍚�
- jsApiList: ['hideAllNonBaseMenuItem'], // 蹇呭～锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
+ jsApiList: ['hideAllNonBaseMenuItem','getLocation'], // 蹇呭～锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
openTagList: ['wx-open-launch-weapp'] //鍙�夛紝闇�瑕佷娇鐢ㄧ殑寮�鏀炬爣绛惧垪琛�
});
- wx.ready(function () {
+ wx.ready( ()=> {
wx.hideAllNonBaseMenuItem();
})
})
}
+ if(this.payWay == 5){
+ ap.hideOptionButton();
+ }
+ },
+ 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({
+ type: 'gcj02', // 榛樿涓簑gs84鐨刧ps鍧愭爣锛屽鏋滆杩斿洖鐩存帴缁檕penLocation鐢ㄧ殑鐏槦鍧愭爣锛屽彲浼犲叆'gcj02'
+ complete: (res)=> {
+ if(res.errMsg==="getLocation:ok"){
+ 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.wxGetLocation(callback)
+ }else{
+ this.clickDone()
+ }
+ }
+ })
+ }
+ }
+ });
},
// 鑾峰彇浼氬憳鐩稿叧淇℃伅
showCoupon() {
- if(this.UNIONID){
- //鑾峰彇鐢ㄦ埛浼樻儬鍒�
- queryUseSweepPayCoupon({
- params: {
- applyPayWayStr: this.payWay,
- cusid: this.shopInfo.id,
- money: Number(this.money * 100),
- }
- }).then(res => {
- this.couponList = res
- this.couponShow = true
- })
- }else{
+ if(this.onlineId){
+ return
+ }
+ if (this.UNIONID||this.payWay==5) {
+ if (uni.$u.test.isEmpty(this.money)) {
+ uni.$u.toast('璇疯緭鍏ラ噾棰濓紒')
+ return
+ }
+ this.couponList = null
+ this.couponShow = true
+ this.queryUseSweepPayCoupon()
+ } else {
this.toRegister()
}
-
+ },
+ //鑾峰彇鐢ㄦ埛浼樻儬鍒�
+ queryUseSweepPayCoupon() {
+ //2 寰俊 5鏀粯瀹� 15浜戦棯浠�
+ const applyPayWayStr = {
+ 2: 1,
+ 5: 2,
+ 15: 3
+ }
+ queryUseSweepPayCoupon({
+ params: {
+ score: 0,
+ applyPayWayStr: applyPayWayStr[this.payWay],
+ cusid: this.shopInfo.id,
+ money: this.$utils.accMul(this.money,100),
+ }
+ }).then(res => {
+ this.couponList = res
+ }).catch(() => {
+ this.couponList = []
+ })
},
//閫夋嫨浼樻儬鍒�
clickCoupon(item) {
@@ -409,6 +569,26 @@
this.couponInfo = this.checkCoupon;
this.couponShow = false;
},
+ checkLocation(){
+ if(!CHECK_LOCATION){
+ this.pay()
+ return
+ }
+ if (uni.$u.test.isEmpty(this.money)) {
+ uni.$u.toast('璇疯緭鍏ラ噾棰濓紒')
+ return
+ }
+ if(!this.lat){
+ if(this.payWay == 2){
+ this.wxGetLocation(this.pay)
+ }
+ if(this.payWay == 5){
+ this.apGetLocation(this.pay)
+ }
+ }else{
+ this.pay()
+ }
+ },
//纭鏀粯
pay() {
if (uni.$u.test.isEmpty(this.money)) {
@@ -417,20 +597,28 @@
}
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,
buyerNote: this.buyerNote,
score: 0,
- couponDetailId: this.couponInfo.id
+ couponDetailId: this.couponInfo.id,
+ lat: this.lat,
+ lng: this.lng
}
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
+ }
+ if (this.onlineId) {
+ params = {payWay: this.payWay,onlineId: this.onlineId}
}
//鐢熸垚璁㈠崟
saveOrder(params).then(res => {
@@ -444,6 +632,9 @@
}
if (this.payWay == 5) {
this.aliPay(res.paymentData)
+ }
+ if (this.payWay == 15) {
+ this.aliPay(res.paymentUrl)
}
} catch (e) {
//TODO handle the exception
@@ -501,9 +692,18 @@
});
},
closeOrder() {
- closeOrder({params:{
- id: this.orderId,
- }}).then(res => {
+ uni.showLoading({
+ title: '鍙栨秷鏀粯涓�',
+ mask: true
+ })
+ closeOrder({
+ params: {
+ id: this.orderId,
+ }
+ }).then(res => {
+ uni.hideLoading()
+ }).catch(()=>{
+ uni.hideLoading()
})
}
}
@@ -532,7 +732,6 @@
.money {
font-size: 40rpx;
- color: #333;
}
@@ -697,7 +896,10 @@
position: relative;
overflow: hidden;
}
-
+.num-box{
+ width: 200rpx;
+ text-align: center;
+}
.choose-coupon {
margin: 32rpx 32rpx 0;
border-radius: 10rpx;
@@ -709,7 +911,7 @@
.coupon-list {
box-sizing: border-box;
- height: calc(50vh - 44px);
+ height: calc(60vh - 44px);
}
--
Gitblit v1.9.1