From 90169550c9f6836e715360b3fc2163e159432814 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 04 十一月 2024 17:52:01 +0800
Subject: [PATCH] feat(支付): 增加校验经纬度功能，暂时先关闭
---
pay/scanpay.vue | 104 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 80 insertions(+), 24 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index c9162ca..bcffe02 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -60,10 +60,10 @@
<view @click="showCoupon" class="u-flex">
<block v-if="couponInfo.id">
<view v-if="couponInfo.discountType==1" class="tag-pain">
- 婊{ parseFloat((couponInfo.thresholdValue / 100).toFixed(2)) }}鍏冨噺{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}鍏冨埜
+ 婊{ $utils.fenToYuan(couponInfo.thresholdValue) }}鍏冨噺{{ $utils.fenToYuan(couponInfo.discount) }}鍏冨埜
</view>
<view v-if="couponInfo.discountType==2" class="tag-pain">
- {{ parseFloat(couponInfo.discount * 10).toFixed(1) }}鎶樺埜
+ {{ $utils.accMul(couponInfo.discount, 10) }}鎶樺埜
</view>
</block>
@@ -88,11 +88,11 @@
</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">
@@ -108,14 +108,14 @@
<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">{{ parseFloat(item.discount / 100) }}</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">{{ parseFloat(item.discount * 10).toFixed(1) }}</text>
+ <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">浣庝簬{{ parseFloat(item.orderMax / 100) }}鍏冨彲鐢�</view>
- <view v-else-if="item.thresholdValue" class="u-font-24 u-m-t-20">婊{ parseFloat(item.thresholdValue / 100) }}鍏冨彲鐢�</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>
<view class="butt"></view>
@@ -153,7 +153,8 @@
<script>
import {
config,
- ACCESSTOKEN
+ ACCESSTOKEN,
+ CHECK_LOCATION
} from 'common/config.js';
import {
queryShopByCid,
@@ -191,6 +192,8 @@
useScoreFlag: -1, //鍟嗛摵鏄惁鍙敤绉垎 0鍚� 1鏄�
userCouponFlag: -1, //鍟嗛摵鏄惁鍙敤浼樻儬鍒� 0鍚� 1鏄�
},
+ lat: '', //绾害
+ lng: '', //缁忓害
money: '', // 閲戦
token: null,
isNew: false, // 鏄惁鏂扮敤鎴凤紝鏂扮敤鎴锋煡璇笉鍒扮Н鍒嗗拰閾惰鍗�
@@ -215,31 +218,31 @@
return 0
}
if (this.checkCoupon.discountType == 1) {
- const num = (this.checkCoupon.discount / 100).toFixed(2)
+ const num = this.$utils.fenToYuan(this.checkCoupon.discount)
return parseFloat(num);
}
const dis = 1 - parseFloat(this.checkCoupon.discount)
- const dic = Math.floor(Number((this.money || 0) * 100) * dis)
- return (dic / 100).toFixed(2);
+ const dic = Math.floor(this.$utils.accMul(this.money,100) * dis)
+ return this.$utils.fenToYuan(dic).toFixed(2);
},
discount() {
if(!(this.money || 0)||!this.couponInfo.id){
return 0
}
if (this.couponInfo.discountType == 1) {
- const num = (this.couponInfo.discount / 100).toFixed(2)
+ const num = this.$utils.fenToYuan(this.couponInfo.discount)
return parseFloat(num);
}
const dis = 1 - parseFloat(this.couponInfo.discount)
- const dic = Math.floor(Number((this.money || 0) * 100) * dis)
- return (dic / 100).toFixed(2);
+ const dic = Math.floor(this.$utils.accMul(this.money,100) * dis)
+ return this.$utils.fenToYuan(dic).toFixed(2);
},
payMoney() {
if(this.discount===0||!Number(this.money || 0)){
return 0
}
- const num = Number((this.money || 0) * 100) - Number(this.discount*100);
- return (num / 100).toFixed(2);
+ const num = this.$utils.accMul(this.money,100) - this.$utils.accMul(this.discount,100);
+ return this.$utils.fenToYuan(num).toFixed(2);
}
},
onLoad(opt) {
@@ -424,18 +427,48 @@
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(CHECK_LOCATION){
+ this.wxGetLocation()
+ }
})
})
}
},
+ 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()
+ }else{
+ this.clickDone()
+ }
+ }
+ })
+ }
+
+ }
+ });
+ },
// 鑾峰彇浼氬憳鐩稿叧淇℃伅
showCoupon() {
- if (this.UNIONID) {
+ if (this.UNIONID||this.payWay==5) {
if (uni.$u.test.isEmpty(this.money)) {
uni.$u.toast('璇疯緭鍏ラ噾棰濓紒')
return
@@ -449,11 +482,17 @@
},
//鑾峰彇鐢ㄦ埛浼樻儬鍒�
queryUseSweepPayCoupon() {
+ const applyPayWayStr = {
+ 2: 1,
+ 5: 2,
+ 15: 3
+ }
queryUseSweepPayCoupon({
params: {
- applyPayWayStr: this.payWay,
+ score: 0,
+ applyPayWayStr: applyPayWayStr[this.payWay],
cusid: this.shopInfo.id,
- money: (this.money * 100).toFixed(0),
+ money: this.$utils.accMul(this.money,100),
}
}).then(res => {
this.couponList = res
@@ -479,6 +518,21 @@
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){
+ this.wxGetLocation(this.pay)
+ }else{
+ this.pay()
+ }
+ },
//纭鏀粯
pay() {
if (uni.$u.test.isEmpty(this.money)) {
@@ -489,12 +543,14 @@
// 閲戦 this.money
uni.showLoading()
const params = {
- money: (this.money * 100).toFixed(0),
+ 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
--
Gitblit v1.9.1