From 192695706dfafbfee7ead68118230fb039f57a52 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 20 九月 2024 14:20:35 +0800
Subject: [PATCH] feat(优惠券): 支付金额处理
---
pay/scanpay.vue | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/pay/scanpay.vue b/pay/scanpay.vue
index b758326..64fa7da 100644
--- a/pay/scanpay.vue
+++ b/pay/scanpay.vue
@@ -94,29 +94,34 @@
宸查�夋嫨浼樻儬鍒�1寮狅紝鍏辨姷鎵ｏ骏{{ parseFloat((checkCoupon.discount / 100).toFixed(2)) }}
</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 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>
- <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-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') }}
+ </view>
+ </view>
+ <u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="20">
+ </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">
<view style="border: 1rpx solid #eee;width: 100%">
<u--textarea v-model="buyerNote" placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" maxlength="100" none count></u--textarea>
@@ -159,7 +164,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鎵獴鍔ㄦ�佺爜鏃舵湁
@@ -178,7 +183,7 @@
isNew: false, // 鏄惁鏂扮敤鎴凤紝鏂扮敤鎴锋煡璇笉鍒扮Н鍒嗗拰閾惰鍗�
canReset: false,
couponShow: false, // 浼樻儬鍒稿脊绐�
- couponList: [], // 浼樻儬鍒�
+ couponList: null, // 浼樻儬鍒�
couponInfo: {
id: '',
discount: 0,
@@ -305,7 +310,7 @@
uni.setStorageSync('IS_NEW', res.isNew)
this.isNew = res.isNew
if (!res.isNew && !uni.$u.test.isEmpty(this.money)) {
- this.showCoupon()
+ this.queryUseSweepPayCoupon()
}
},
/*鎺堟潈unionid*/
@@ -402,21 +407,26 @@
uni.$u.toast('璇疯緭鍏ラ噾棰濓紒')
return
}
- //鑾峰彇鐢ㄦ埛浼樻儬鍒�
- queryUseSweepPayCoupon({
- params: {
- applyPayWayStr: this.payWay,
- cusid: this.shopInfo.id,
- money: Number(this.money * 100),
- }
- }).then(res => {
- this.couponList = res
- this.couponShow = true
- })
+ this.couponList = null
+ this.couponShow = true
+ this.queryUseSweepPayCoupon()
} else {
this.toRegister()
}
-
+ },
+ //鑾峰彇鐢ㄦ埛浼樻儬鍒�
+ queryUseSweepPayCoupon(){
+ queryUseSweepPayCoupon({
+ params: {
+ applyPayWayStr: this.payWay,
+ cusid: this.shopInfo.id,
+ money: (this.money * 100).toFixed(0),
+ }
+ }).then(res => {
+ this.couponList = res
+ }).catch(()=>{
+ this.couponList = []
+ })
},
//閫夋嫨浼樻儬鍒�
clickCoupon(item) {
@@ -446,6 +456,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,
@@ -455,8 +467,6 @@
params.activityQrcodeId = this.activityQrcodeId
}
if (this.cid) {
- params.money = Number(this.money * 100)
- params.shopId = this.shopInfo.id
params.cid = this.cid
}
//鐢熸垚璁㈠崟
@@ -471,6 +481,9 @@
}
if (this.payWay == 5) {
this.aliPay(res.paymentData)
+ }
+ if (this.payWay == 15) {
+ this.aliPay(res.paymentUrl)
}
} catch (e) {
//TODO handle the exception
@@ -738,7 +751,7 @@
.coupon-list {
box-sizing: border-box;
- height: calc(50vh - 44px);
+ height: calc(80vh - 44px);
}
--
Gitblit v1.9.1