From 6009f0df18e9c5a6812d7fea40be7905f7f23f61 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 27 九月 2024 21:44:29 +0800
Subject: [PATCH] feat(支付): 支持折扣券
---
pay/scanpay.vue | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index 33aafa6..c9162ca 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -58,9 +58,15 @@
<!-- <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">
+ 婊{ parseFloat((couponInfo.thresholdValue / 100).toFixed(2)) }}鍏冨噺{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}鍏冨埜
+ </view>
+ <view v-if="couponInfo.discountType==2" class="tag-pain">
+ {{ parseFloat(couponInfo.discount * 10).toFixed(1) }}鎶樺埜
+ </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>
@@ -83,6 +89,7 @@
</view>
</block>
<button class="pay-it" @click="pay">浠樻</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>
@@ -91,29 +98,35 @@
<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">
- <u-loadmore v-if="!couponList" status="loading" />
+ <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 style="color: #D31F28;" class="u-p-h-28">
- <view class="font-bold">
+ <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>
</view>
- <view class="u-font-24 u-m-t-20">婊{ parseFloat(item.thresholdValue / 100) }}鍏冧娇鐢�</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="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-else class="u-font-24 u-m-t-20">鏃犻棬妲�</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-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="20">
+ <u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="24">
</u-icon>
</view>
</view>
@@ -164,7 +177,7 @@
buyerNote: '',
showRemark: false,
UNIONID: null,
- payWay: this.$utils.getPlat(), //2 缁翠俊 5鏀粯瀹�
+ payWay: this.$utils.getPlat(), //2 缁翠俊 5鏀粯瀹� 15浜戦棯浠�
cid: '', //鐮佺墝id C鎵獴闈欐�佺爜鏃舵湁
activityQrcodeId: '', //鍔ㄦ�佹敹娆剧爜 C鎵獴鍔ㄦ�佺爜鏃舵湁
shopId: '', //鍟嗘埛id C鎵獴鍔ㄦ�佺爜鏃舵湁
@@ -197,16 +210,36 @@
};
},
computed: {
+ discount1() {
+ if(!(this.money || 0)||!this.checkCoupon.id){
+ return 0
+ }
+ if (this.checkCoupon.discountType == 1) {
+ const num = (this.checkCoupon.discount / 100).toFixed(2)
+ 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);
+ },
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.couponInfo.discount / 100).toFixed(2)
+ 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);
},
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 = Number((this.money || 0) * 100) - Number(this.discount*100);
+ return (num / 100).toFixed(2);
}
},
onLoad(opt) {
@@ -415,15 +448,17 @@
}
},
//鑾峰彇鐢ㄦ埛浼樻儬鍒�
- queryUseSweepPayCoupon(){
+ queryUseSweepPayCoupon() {
queryUseSweepPayCoupon({
params: {
applyPayWayStr: this.payWay,
cusid: this.shopInfo.id,
- money: Number(this.money * 100),
+ money: (this.money * 100).toFixed(0),
}
}).then(res => {
this.couponList = res
+ }).catch(() => {
+ this.couponList = []
})
},
//閫夋嫨浼樻儬鍒�
@@ -454,6 +489,8 @@
// 閲戦 this.money
uni.showLoading()
const params = {
+ money: (this.money * 100).toFixed(0),
+ shopId: this.shopInfo.id,
payWay: this.payWay,
buyerNote: this.buyerNote,
score: 0,
@@ -463,8 +500,6 @@
params.activityQrcodeId = this.activityQrcodeId
}
if (this.cid) {
- params.money = Number(this.money * 100)
- params.shopId = this.shopInfo.id
params.cid = this.cid
}
//鐢熸垚璁㈠崟
@@ -479,6 +514,9 @@
}
if (this.payWay == 5) {
this.aliPay(res.paymentData)
+ }
+ if (this.payWay == 15) {
+ this.aliPay(res.paymentUrl)
}
} catch (e) {
//TODO handle the exception
@@ -569,7 +607,6 @@
.money {
font-size: 40rpx;
- color: #333;
}
@@ -734,7 +771,10 @@
position: relative;
overflow: hidden;
}
-
+.num-box{
+ width: 200rpx;
+ text-align: center;
+}
.choose-coupon {
margin: 32rpx 32rpx 0;
border-radius: 10rpx;
@@ -746,7 +786,7 @@
.coupon-list {
box-sizing: border-box;
- height: calc(80vh - 44px);
+ height: calc(60vh - 44px);
}
--
Gitblit v1.9.1