From cb623fcefa72d5b54b1e536aa84c3f3851743975 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 20 十一月 2024 11:01:43 +0800
Subject: [PATCH] update 打印可能的空白（不能确定是不是纸张大小超出还是空数据的问题，已经提交了
---
sub_pages/customer/shopping/confirm.vue | 160 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 134 insertions(+), 26 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 68206fb..bed5b0a 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -17,39 +17,112 @@
cache_goods: state => {
return state.cache.goods || []
},
+ cache_coupon_select_cancel: state => {
+ return state.cache.cache_coupon_select_cancel==1?1:0
+ },
}),
coupon_fee() {
//优惠券
+ // 查看当前有没有优惠券
+ if(!this.dto.couponRecordId || !this.cache_coupon ){
+ // 根据优惠券的列表，查找到最合适的优惠券
+ // 遍历优惠券的使用金额大于当前金额的，获取面值最大的优惠券取最大值couponDiscountValue
+ var total = (this.dto.totalMemberAmount || this.dto.totalAmount || 0).toFixed(2)
+ if(total && total>0){
+ // 获取当前用户最合适的优惠券
+ let res= this.$http.request('get', '/api/v2/coupon/app/mine/unused/fit', {
+ params: {orderAmount:total}
+ }).then(async res => {
+ let tmpCoupon = res.data;
+ if (tmpCoupon) {
+ if(this.cache_coupon_select_cancel==0){
+ console.log("自动为您选择优惠最大的优惠券")
+ await this.$store.dispatch('cache_coupon_select', tmpCoupon);
+ this.dto.couponRecordId = tmpCoupon.id;
+ this.dto.couponRecordStr = tmpCoupon.couponName;
+ setTimeout(() => {
+ this.$message.showToast('自动为您选择优惠最大的优惠券')
+ }, 2000)
+
+ }else{
+ console.log("清空")
+ await this.$store.dispatch('cache_coupon_select', {});
+ this.dto.couponRecordId ="";
+ this.dto.couponRecordStr = "";
+ }
+
+ }
+
+ }).catch(error => {
+ console.error('获取优惠券失败:', error);
+ });
+
+ }
+
+ }
+
if (this.dto.couponRecordId && this.cache_coupon) {
//计算优惠券
if (this.cache_coupon.couponDiscountType === 'zero') {
- return this.cache_coupon.couponDiscountValue || 0
+ return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
} else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
- var total = ((this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
- 0) || 0)
- .toFixed(2)
+ var total = (this.dto.totalMemberAmount || this.dto.totalAmount || 0).toFixed(2)
+ // + (this.dto.packing || 0) +
+ // (this.current_transport.fee ||
+ // 0) || 0)
+ // .toFixed(2)
+
if (total >= this.cache_coupon.minOrderAmount) {
- return this.cache_coupon.couponDiscountValue || 0
+ return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
+ } else {
+
}
} else {
- return this.cache_coupon.couponDiscountValue || 0
+ return parseFloat(this.cache_coupon.couponDiscountValue).toFixed(2) || 0
}
}
return 0
+ },
+ order_fee() {
+
+ // 如果订单-优惠券<0,就等于0 +打包+运费，如果还等于0，那么就0.01
+ var m1 = parseFloat(this.dto.totalMemberAmount || this.dto.totalAmount || 0)
+ var m2 = parseFloat((this.dto.packing || 0) + (this.current_transport.fee || 0))
+
+ // 统一处理 Promise 和普通值
+ // var couponFee = await this.coupon_fee;
+
+
+ if (m1 <= parseFloat(this.coupon_fee)) {
+ if (m2 > 0) {
+ return (m2).toFixed(2)
+ } else {
+ return '0.01'
+ }
+ } else {
+ return ((m1 - parseFloat(this.coupon_fee)) + m2).toFixed(2)
+ }
+
}
},
async beforeDestroy() {
await this.$store.dispatch('cache_coupon_select', {})
await this.$store.dispatch('cache_goods_select', [])
+ await this.$store.dispatch('cache_coupon_select_cancel', 0)
},
- async onShow() {
+ onShow() {
+ // 获取当前用户为使用的优惠券
+ // this.getSuitableCouponAuto()
//优惠券
if (this.cache_coupon && this.cache_coupon.id) {
this.dto.couponRecordId = this.cache_coupon.id
this.dto.couponRecordStr = this.cache_coupon.couponName
+ } else if (this.cache_coupon && !this.cache_coupon.id) {
+ this.dto.couponRecordId = ''
+ this.dto.couponRecordStr = ''
}
//兑换券
this.dto.goodsRecordIdListStr = ''
@@ -129,6 +202,7 @@
couponRecordId: '',
couponRecordStr: '',
goodsRecordIdListStr: '',
+ unusedCouponList:[],
},
current_transport: {},
cacheAddressId: '',
@@ -138,6 +212,7 @@
[]
],
partnerInfo: {},
+ isShowFlag:true,
}
},
@@ -157,10 +232,32 @@
}
},
methods: {
+
+ async getSuitableCouponAuto(){
+ //1.提交订单后，根据订单的商品金额，判断是否达到优惠券使用条件，如果达到，自动选择面值最大的优惠券，用户也可以在优惠券自己切换优惠券或不使用优惠券
+ await this.$http.request('get', '/api/v2/coupon/app/mine/unused/list', {
+ params: {}
+ }).then(res => {
+ var data = res.data
+ this.unusedCouponList = data.list || []
+
+ })
+
+
+ },
+
toSelectCoupon() {
//跳转去列表页面进行选择
+ var total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this
+ .current_transport.fee ||
+ 0) || 0)
+ .toFixed(2)
+ // 不考虑打包费了
+ total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0))
+ .toFixed(2)
+
uni.navigateTo({
- url: '/sub_pages/customer/coupon/coupon-self?source=shopping'
+ url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`
})
},
toSelectGood() {
@@ -220,7 +317,7 @@
var goodsRecordIds = []
if (this.dto.goodsRecordIdListStr) {
for (var t of this.cache_goods) {
- t.push(t.id)
+ goodsRecordIds.push(t.id)
}
}
@@ -242,7 +339,7 @@
})
tmp.$message.hideLoading()
if (code === 0) {
-
+
//提交信息
console.log('pay,', data)
// /api/pub/init/callback?orderId=
@@ -273,9 +370,9 @@
//返回上一页
await tmp.$store.dispatch('sign_add', 'shopping')
//清空优惠券
- this.$store.dispatch('cache_coupon_select', {})
- this.$store.dispatch('cache_goods_select', [])
-
+ tmp.$store.dispatch('cache_coupon_select', {})
+ tmp.$store.dispatch('cache_goods_select', [])
+
tmp.$message.showToast('支付成功')
setTimeout(() => {
uni.navigateBack()
@@ -343,7 +440,8 @@
</view>
<view class="price">
<view class="m-l-a m-r-0 text-right">
- 共{{ dto.flowers.length }}件，小计<span class="t-red">￥{{ dto.totalAmount || 0 }}</span>
+ 共{{ dto.flowers.length }}件，小计<span
+ class="t-red">￥{{ dto.totalMemberAmount || dto.totalAmount || 0 }}</span>
</view>
</view>
</view>
@@ -408,12 +506,12 @@
<view class="p10 bg-white m-t-20 br-4">
<view class="form-item flex ">
- <view class="label">优惠券</view>
+ <view class="label t-red">优惠券</view>
- <view class="m-l-a m-r-0 flex " :class="[!dto.couponRecordId?'desc-gray':'']"
+ <view class="m-l-a m-r-0 flex t-red" :class="[!dto.couponRecordId?'desc-gray':'']"
@click="toSelectCoupon">
<view>{{dto.couponRecordStr||dto.couponRecordId || '请选择'}}</view>
- <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ <u-icon class="m-l-a t-red" name="arrow-right"></u-icon>
</view>
</view>
@@ -437,14 +535,18 @@
</view>
</view>
</view>
- <view class="form-item flex ">
- <view class="label">兑换券</view>
+ <view class="form-item flex flex-wrap-normal">
+ <view class="label" style="min-width: 130rpx;">兑换券</view>
- <view class="m-l-a m-r-0 flex "
+ <view class="m-l-a m-r-0 flex" style="word-break: break-all;"
:class="[!dto.goodsRecordIdList||dto.goodsRecordIdList.length==0?'desc-gray':'']"
@click="toSelectGood">
- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view>
- <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ <view class="word-e" style="max-width: 400rpx;"> {{dto.goodsRecordIdListStr|| '请选择'}}
+ </view>
+ <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
+ <view class="m-t-4">
+ <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ </view>
</view>
</view>
</view>
@@ -454,7 +556,7 @@
<view class="desc flex">
<view>商品金额:</view>
<view class="m-l-a m-r-0 text-right">
- {{ (dto.totalAmount || 0) || 0 }}
+ {{ ( dto.totalMemberAmount || dto.totalAmount || 0) || 0 }}
</view>
</view>
<view class="desc flex">
@@ -470,8 +572,10 @@
</view>
</view>
<view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
- <view>优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):</view>
- <view class="m-l-a m-r-0 text-right">
+ <view class="t-red">
+ 优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):
+ </view>
+ <view class="m-l-a m-r-0 text-right t-red">
-{{ coupon_fee || 0 }}
</view>
</view>
@@ -483,7 +587,7 @@
<view class="bottom-price flex">
<view class="m-t-12 m-l-0 m-r-a">
合计 <span class="t-red">￥
- {{ ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) - coupon_fee || 0).toFixed(2) }}
+ {{ order_fee }}
</span>元
</view>
<view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">
@@ -500,6 +604,10 @@
.page-confirm {
padding: 20rpx 30rpx;
+ .border-red {
+ border: 1px solid red;
+ }
+
.bottom-price {
position: fixed;
background-color: #ffffff;
--
Gitblit v1.9.3