From 731b3a23a6369aaef5c4fdc0ff4524eb6a7f3642 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 13 九月 2024 19:07:12 +0800
Subject: [PATCH] update 合伙人、花店端
---
sub_pages/customer/shopping/confirm.vue | 100 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index c88048e..3be5aed 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -23,19 +23,41 @@
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 = ((dto.totalAmount || 0) + (dto.packing || 0) + (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))
+
+ 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)
+ }
+
}
},
@@ -49,16 +71,19 @@
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.couponRecordStr = ''
+ this.dto.goodsRecordIdListStr = ''
if (this.cache_goods && this.cache_goods.length > 0) {
- this.dto.couponRecordStr = ''
+ this.dto.goodsRecordIdListStr = ''
var names = []
for (var tmp of this.cache_goods) {
names.push(tmp.name || tmp.title || '')
}
- this.dto.couponRecordStr = names.join(',')
+ this.dto.goodsRecordIdListStr = names.join(',')
}
},
onLoad(options) {
@@ -158,8 +183,16 @@
methods: {
toSelectCoupon() {
//跳转去列表页面进行选择
+ var total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this
+ .current_transport.fee ||
+ 0) || 0)
+ .toFixed(2)
+ // if (total >= this.cache_coupon.minOrderAmount) {
+ // return this.cache_coupon.couponDiscountValue || 0
+ // }
+
uni.navigateTo({
- url: '/sub_pages/customer/coupon/coupon-self?source=shopping'
+ url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`
})
},
toSelectGood() {
@@ -216,6 +249,12 @@
return
}
this.dto.addressId = this.address.id
+ var goodsRecordIds = []
+ if (this.dto.goodsRecordIdListStr) {
+ for (var t of this.cache_goods) {
+ goodsRecordIds.push(t.id)
+ }
+ }
let tmp = this
wx.login({
@@ -229,14 +268,12 @@
} = await tmp.$http.request('post', '/api/customer/flower/order/commit', {
data: {
...tmp.dto,
- wxcode: res.code
+ wxcode: res.code,
+ goodsRecordIdList: goodsRecordIds
}
})
tmp.$message.hideLoading()
if (code === 0) {
- //清空优惠券
- this.$store.dispatch('cache_coupon_select', {})
- this.$store.dispatch('cache_goods_select', [])
//提交信息
console.log('pay,', data)
@@ -267,6 +304,10 @@
// tmp.$message.showToast('支付成功')
//返回上一页
await tmp.$store.dispatch('sign_add', 'shopping')
+ //清空优惠券
+ tmp.$store.dispatch('cache_coupon_select', {})
+ tmp.$store.dispatch('cache_goods_select', [])
+
tmp.$message.showToast('支付成功')
setTimeout(() => {
uni.navigateBack()
@@ -324,7 +365,7 @@
style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ item.name || '-' }}
</view>
<view class="price">
- {{ item.price || 0 }}*{{ item.num }}扎
+ {{ item.priceMember || item.price || 0 }}*{{ item.num }}扎
</view>
<view class="desc m-t-12">
<view class="m-r-15">每扎重量:{{ item.weight || 0 }}</view>
@@ -334,7 +375,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>
@@ -398,7 +440,6 @@
</view>
<view class="p10 bg-white m-t-20 br-4">
- <!-- #ifdef PUB_CUSTOMER_DEV -->
<view class="form-item flex ">
<view class="label">优惠券</view>
@@ -408,7 +449,6 @@
<u-icon class="m-l-a" name="arrow-right"></u-icon>
</view>
</view>
- <!-- #endif -->
<view class="form-item flex m-t-12">
<view class="label">特殊需求</view>
@@ -430,18 +470,20 @@
</view>
</view>
</view>
- <!-- #ifdef PUB_CUSTOMER_DEV -->
- <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> {{dto.goodsRecordIdListStr|| '请选择'}}
+ </view>
+ <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
+ <view style="min-width: 60rpx;">
+ <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ </view>
</view>
</view>
- <!-- #endif -->
</view>
</view>
@@ -449,7 +491,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">
@@ -464,8 +506,10 @@
{{ (current_transport.fee || 0) }}
</view>
</view>
- <view class="desc flex">
- <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">
-{{ coupon_fee || 0 }}
</view>
@@ -478,7 +522,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">
--
Gitblit v1.9.3