From 90169550c9f6836e715360b3fc2163e159432814 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 04 十一月 2024 17:52:01 +0800
Subject: [PATCH] feat(支付): 增加校验经纬度功能，暂时先关闭
---
manifest.json | 2
common/config.js | 6 ++-
pay/scanpay.vue | 76 ++++++++++++++++++++++++++++++++-----
3 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/common/config.js b/common/config.js
index f6e35cb..1d50911 100644
--- a/common/config.js
+++ b/common/config.js
@@ -24,8 +24,10 @@
}
module.exports = {
- config: process.env.NODE_ENV === 'development' ? dev : prod,
+ config: process.env.NODE_ENV === 'development' ? dev : test,
ACCESSTOKEN: "Authorization",
/* 鏄惁鎵撳嵃璇锋眰鏃ュ織 */
- DEBUG: false
+ DEBUG: false,
+ /* 鏄惁鏍￠獙浣嶇疆缁忕含搴� */
+ CHECK_LOCATION: false
}
diff --git a/manifest.json b/manifest.json
index e243e55..1088a6e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -74,7 +74,7 @@
"devServer" : {
"proxy" : {
"/dev-api" : {
- "target" : "http://172.16.2.117:8080",
+ "target" : "http://172.16.2.121:8080",
"changeOrigin" : true,
"secure" : false,
"pathRewrite" : {
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 4256502..bcffe02 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -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">
@@ -153,7 +153,8 @@
<script>
import {
config,
- ACCESSTOKEN
+ ACCESSTOKEN,
+ CHECK_LOCATION
} from 'common/config.js';
import {
queryShopByCid,
@@ -165,8 +166,7 @@
saveOrder,
} from 'common/api/index'
-import wx from 'weixin-js-sdk';
-import {accMul, fenToYuan} from 'common/util' // 浣跨敤js-sdk
+import wx from 'weixin-js-sdk'; // 浣跨敤js-sdk
export default {
data() {
@@ -192,6 +192,8 @@
useScoreFlag: -1, //鍟嗛摵鏄惁鍙敤绉垎 0鍚� 1鏄�
userCouponFlag: -1, //鍟嗛摵鏄惁鍙敤浼樻儬鍒� 0鍚� 1鏄�
},
+ lat: '', //绾害
+ lng: '', //缁忓害
money: '', // 閲戦
token: null,
isNew: false, // 鏄惁鏂扮敤鎴凤紝鏂扮敤鎴锋煡璇笉鍒扮Н鍒嗗拰閾惰鍗�
@@ -216,7 +218,7 @@
return 0
}
if (this.checkCoupon.discountType == 1) {
- const num = this.$utils.fenToYuan(this.couponInfo.discount)
+ const num = this.$utils.fenToYuan(this.checkCoupon.discount)
return parseFloat(num);
}
const dis = 1 - parseFloat(this.checkCoupon.discount)
@@ -425,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
@@ -450,10 +482,15 @@
},
//鑾峰彇鐢ㄦ埛浼樻儬鍒�
queryUseSweepPayCoupon() {
+ const applyPayWayStr = {
+ 2: 1,
+ 5: 2,
+ 15: 3
+ }
queryUseSweepPayCoupon({
params: {
score: 0,
- applyPayWayStr: this.payWay,
+ applyPayWayStr: applyPayWayStr[this.payWay],
cusid: this.shopInfo.id,
money: this.$utils.accMul(this.money,100),
}
@@ -481,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)) {
@@ -496,7 +548,9 @@
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