From f14805e9e9550bb11e1f79bdbdec574237e92893 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 12 九月 2024 10:41:51 +0800
Subject: [PATCH] feat(支付): 修改键盘组件
---
pay/scanpay.vue | 253 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 190 insertions(+), 63 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 4c60469..b758326 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -13,9 +13,15 @@
<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 @click="buyerNote='';showRemark=true;" class="remark">娣诲姞澶囨敞</view>
</view>
- <view class="u-p-v-20 u-flex u-col-bottom u-border-bottom u-relative money-box">
+ <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="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>
@@ -25,16 +31,31 @@
</view>
<view class="mask" @click="showBord"></view>
</view>
- <!-- <image v-if="isNew&&(this.payWay == 2&&!UNIONID)" @click="toRegister" class="reg-btn" src="/static/register-btn.png" mode=""></image>-->
- <view v-if="shopInfo.userCouponFlag==0" class="u-font-26 u-tips-color u-p-t-24">寰俊鎼滅储鎴栫洿鎺ョ偣鍑绘墦寮�
- <text style="color: #1E8BE0">銆愬唨浼橀偖銆�</text>
- 灏忕▼搴忥紝浜彈鏇村浼樻儬
+ <view v-if="payWay==2" class="u-tips-color u-p-t-24">
+ <wx-open-launch-weapp id="launch-btn" appid="wx47b3b5ca64bc7d5d" path="pages/index/index">
+ <script type="text/wxtag-template">
+ <style>
+ .txt {
+ font-size: 13px;
+ color: #999
+ }
+
+ .btn {
+ font-size: 13px;
+ color: #1E8BE0
+ }
+ </style>
+ <span class="txt">寰俊鎼滅储鎴栫偣鍑绘墦寮�</span>
+ <span class="btn">銆愬唨浼橀偖銆�</span>
+ <span class="txt">灏忕▼搴忥紝浜洿澶氫紭鎯狅紒</span>
+ </script>
+ </wx-open-launch-weapp>
</view>
</view>
- <block v-if="shopInfo.userCouponFlag==1">
+ <block v-if="payWay==2&&shopInfo.userCouponFlag==1">
<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>-->
+ <!-- <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">
@@ -44,13 +65,9 @@
<u-icon class="u-m-l-10" name="arrow-right" color="#999" size="16"></u-icon>
</view>
</view>
- <view class="u-font-26 u-tips-color u-p-24">寰俊鎼滅储鎴栫洿鎺ョ偣鍑绘墦寮�
- <text style="color: #1E8BE0">銆愬唨浼橀偖銆�</text>
- 灏忕▼搴忥紝浜彈鏇村浼樻儬
- </view>
</view>
</block>
- <block v-if="shopInfo.userCouponFlag==1&&discount">
+ <block v-if="payWay==2&&shopInfo.userCouponFlag==1&&discount">
<view class="u-m-32 u-br-10 bg-fff">
<view class="u-p-24 u-flex u-row-between u-border-bottom">
<view class="u-font-32 color-333">鎶垫墸閲戦</view>
@@ -71,7 +88,7 @@
<key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
</u-popup>
<!-- 浼樻儬鍒稿脊绐� -->
- <u-popup zIndex="800" mode="bottom" :closeable="true" :show="couponShow" @close="couponShow = false" :round="10">
+ <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)) }}
@@ -100,13 +117,16 @@
</scroll-view>
<view @click="getCoupon" class="coupon-btn">纭畾</view>
</u-popup>
- <u-modal showCancelButton :show="showRemark" title="澶囨敞" cancelText="鍏抽棴" confirmText="娓呴櫎" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="buyerNote = ''">
- <u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" count></u--textarea>
+ <u-modal showCancelButton :show="showRemark" title="澶囨敞" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="showRemark = false">
+ <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">
<image src="/static/empty.png" class="empty"></image>
- <view class="tips">{{tips}}</view>
+ <view class="tips">{{ tips }}</view>
<view @click="clickDone" class="clickDone">鍏抽棴</view>
</view>
</view>
@@ -118,24 +138,33 @@
ACCESSTOKEN
} from 'common/config.js';
import {
- queryShop,
+ queryShopByCid,
+ queryShopByShopId,
userLogin,
queryUseSweepPayCoupon,
+ getWechatConfigInfo,
closeOrder,
saveOrder,
} from 'common/api/index'
+import wx from 'weixin-js-sdk'; // 浣跨敤js-sdk
+
export default {
data() {
return {
+ smoney: '',
tips: '璇ュ晢鎴锋殏鏈紑閫氭敮浠樺姛鑳�',
- loading: true,
+ loading: false,
+ remark: '',
buyerNote: '',
showRemark: false,
UNIONID: null,
- payWay: this.$utils.getPlat(),
- cid: '',
- bordShow: true, // 鏄剧ず閿洏
+ payWay: this.$utils.getPlat(), //2 缁翠俊 5鏀粯瀹�
+ cid: '', //鐮佺墝id C鎵獴闈欐�佺爜鏃舵湁
+ activityQrcodeId: '', //鍔ㄦ�佹敹娆剧爜 C鎵獴鍔ㄦ�佺爜鏃舵湁
+ shopId: '', //鍟嗘埛id C鎵獴鍔ㄦ�佺爜鏃舵湁
+ bordShow: false, // 鏄剧ず閿洏
+ orderId: '',
shopInfo: {
cusid: '',
shopName: '',
@@ -176,21 +205,52 @@
}
},
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') || 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.cid = opt.cid
this.init()
}
- if (opt.code || opt.auth_code) {
- let code = opt.code
- if (this.payWay == 5) {
- 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) { //寰俊
+ params.getUserInfo = 1
+ }
+ if (this.payWay == 5) { //鏀粯瀹�
+ params.code = opt.auth_code
+ }
+ if (this.payWay == 15) { //浜戦棯浠�
+ code = opt.userAuthCode
+ }
+ const cd = uni.getStorageSync('cd')
+ if (code === cd) {
+ return
+ }
+ uni.setStorageSync('cd', code)
userLogin({
platform: this.payWay,
- params: {
- code
- }
+ params
}).then(res => {
this.getToken(res)
})
@@ -198,10 +258,10 @@
},
methods: {
+ /*鍏抽棴椤甸潰*/
clickDone() {
let browser = navigator.userAgent.toLowerCase();
if (browser.match(/Alipay/i) == "alipay") {
- console.log("鏀粯瀹漚pp鐨勬祻瑙堝櫒");
//杩欎釜鍙互鍏抽棴瀹夊崜绯荤粺鐨勬墜鏈�
document.addEventListener("AlipayJSBridgeReady", function () {
AlipayJSBridge.call("closeWindow");
@@ -220,59 +280,87 @@
//杩欎釜鍙互鍏抽棴ios绯荤粺鐨勬墜鏈�
WeixinJSBridge.call("closeWindow");
} else {
- console.log("鍏跺畠娴忚鍣�");
- window.opener = null; //濡傛灉娌℃湁杩欒鍜屼笅闈㈢殑涓�琛屽垯浼氬嚭鐜颁笂闈㈢殑绗簩涓闂銆�
+ window.opener = null; //濡傛灉娌℃湁杩欒鍜屼笅闈㈢殑涓�琛屽垯浼氬嚭鐜颁笂闈㈢殑绗簩涓闂銆�
window.open(' ', '_self', ' ');
window.close()
}
},
+ /*鐧诲綍*/
getToken(res) {
this.token = res.token
if (res.openid) {
- uni.setStorageSync('OPENID' + this.payWay, res.token)
+ uni.setStorageSync('OPENID', res.openid)
}
if (res.unionid) {
- uni.setStorageSync('UNIONID' + this.payWay, res.token)
+ 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) {
+ if (!res.isNew && !uni.$u.test.isEmpty(this.money)) {
this.showCoupon()
}
},
+ /*鎺堟潈unionid*/
toRegister() {
- if (this.UNIONID) {
- uni.navigateTo({
- url: '/pay/register?cid=' + this.cid
- })
- }
if (this.payWay == 2) {
- const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${opt.query.cid}`)
+ const redirect_uri = encodeURIComponent(`${config.webURL}/pay/scanpay?cid=${this.cid || ''}&shopId=${this.shopId || ''}&activityQrcodeId=${this.activityQrcodeId || ''}&smoney=${this.smoney || ''}`)
+ 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=STATE#wechat_redirect`
+ `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`
}
-
},
// 鏇存柊閲戦
changeMoney(str) {
this.money = str;
+ this.couponInfo = {
+ id: '',
+ discount: 0,
+ thresholdValue: 0
+ } // 浼樻儬鍒稿唴瀹�
+ this.checkCoupon = {
+ id: null,
+ discount: 0,
+ thresholdValue: 0
+ }
},
// 灞曠ず閿洏
showBord() {
this.bordShow = true;
},
init() {
+ this.loading = true
let timer = setTimeout(() => {
this.shopInfo.scanFlag = 0
this.tips = '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
this.loading = false
}, 2000)
- //鑾峰彇鍟嗛摵淇℃伅
- queryShop({
- params: {
+ let api = queryShopByCid
+ let params = {
+ cid: this.cid
+ }
+ if (this.cid) {
+ api = queryShopByCid
+ params = {
cid: this.cid
}
+ }
+ if (this.shopId) {
+ api = queryShopByShopId
+ params = {
+ shopId: this.shopId
+ }
+ }
+ //鑾峰彇鍟嗛摵淇℃伅
+ api({
+ params
}).then(res => {
clearTimeout(timer)
this.loading = false
@@ -280,26 +368,55 @@
res.logoImage = config.baseURL + res.logoImage
}
this.shopInfo = res
- }).catch(()=>{
+ }).catch((err) => {
clearTimeout(timer)
this.shopInfo.scanFlag = 0
- this.tips = '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
+ this.tips = err.description || '褰撳墠鐢ㄦ埛杩囧锛岃绋嶅悗閲嶈瘯锝瀇锝�'
this.loading = false
})
+
+ if (this.payWay == 2) {
+ const uri = encodeURIComponent(window.location)
+ getWechatConfigInfo({
+ url: uri
+ }).then(res => {
+ wx.config({
+ debug: false, // 寮�鍚皟璇曟ā寮�
+ appId: res.appId, // 蹇呭～锛屽叕浼楀彿鐨勫敮涓�鏍囪瘑
+ timestamp: res.timestamp, // 蹇呭～锛岀敓鎴愮鍚嶇殑鏃堕棿鎴�
+ nonceStr: res.noncestr, // 蹇呭～锛岀敓鎴愮鍚嶇殑闅忔満涓�
+ signature: res.signature, // 蹇呭～锛岀鍚�
+ jsApiList: ['hideAllNonBaseMenuItem'], // 蹇呭～锛岄渶瑕佷娇鐢ㄧ殑JS鎺ュ彛鍒楄〃
+ openTagList: ['wx-open-launch-weapp'] //鍙�夛紝闇�瑕佷娇鐢ㄧ殑寮�鏀炬爣绛惧垪琛�
+ });
+ wx.ready(function () {
+ wx.hideAllNonBaseMenuItem();
+ })
+ })
+ }
},
// 鑾峰彇浼氬憳鐩稿叧淇℃伅
showCoupon() {
- //鑾峰彇鐢ㄦ埛浼樻儬鍒�
- queryUseSweepPayCoupon({
- params: {
- cusid: this.shopInfo.cusid,
- cid: this.cid,
- money: Number(this.money * 100),
+ if (this.UNIONID) {
+ if (uni.$u.test.isEmpty(this.money)) {
+ uni.$u.toast('璇疯緭鍏ラ噾棰濓紒')
+ return
}
- }).then(res => {
- this.couponList = res
- this.couponShow = true
- })
+ //鑾峰彇鐢ㄦ埛浼樻儬鍒�
+ queryUseSweepPayCoupon({
+ params: {
+ applyPayWayStr: this.payWay,
+ cusid: this.shopInfo.id,
+ money: Number(this.money * 100),
+ }
+ }).then(res => {
+ this.couponList = res
+ this.couponShow = true
+ })
+ } else {
+ this.toRegister()
+ }
+
},
//閫夋嫨浼樻儬鍒�
clickCoupon(item) {
@@ -329,13 +446,18 @@
// 閲戦 this.money
uni.showLoading()
const params = {
- money: Number(this.money * 100),
- shopId: this.shopInfo.id,
- cid: this.cid,
payWay: this.payWay,
buyerNote: this.buyerNote,
score: 0,
couponDetailId: this.couponInfo.id
+ }
+ 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
}
//鐢熸垚璁㈠崟
saveOrder(params).then(res => {
@@ -400,14 +522,16 @@
// 鍙栨秷
this.closeOrder()
} else {
- this.closeOrder()
// 鏀粯澶辫触
+ this.closeOrder()
}
});
},
closeOrder() {
closeOrder({
- id: this.orderId,
+ params: {
+ id: this.orderId,
+ }
}).then(res => {
})
}
@@ -418,6 +542,9 @@
<style scoped lang="scss">
.page {
height: calc(100vh - 0px);
+ background-color: #EDEDED;
+ border-top: 1px solid #EDEDED;
+ box-sizing: border-box;
}
.shop {
--
Gitblit v1.9.1