From aaa476929a2748f61804a23677d402e940c451b1 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 17:36:44 +0800
Subject: [PATCH] 1
---
sub_pages/customer/shopping/confirm.vue | 129 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 119 insertions(+), 10 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 4ea2671..8be6896 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -11,11 +11,56 @@
address: state => {
return state.defaultaddress || {}
},
+ cache_coupon: state => {
+ return state.cache.coupon || {}
+ },
+ cache_goods: state => {
+ return state.cache.goods || []
+ },
}),
+ coupon_fee() {
+ //优惠券
+ if (this.dto.couponRecordId && this.cache_coupon) {
+ //计算优惠券
+ if (this.cache_coupon.couponDiscountType === 'zero') {
+ return this.cache_coupon.couponDiscountValue || 0
+ } else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
+ 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
+ }
+ } else {
+ return this.cache_coupon.couponDiscountValue || 0
+ }
+ }
+
+ return 0
+ }
+
+ },
+ async beforeDestroy() {
+ await this.$store.dispatch('cache_coupon_select', {})
+ await this.$store.dispatch('cache_goods_select', [])
},
async onShow() {
-
+ //优惠券
+ if (this.cache_coupon && this.cache_coupon.id) {
+ this.dto.couponRecordId = this.cache_coupon.id
+ this.dto.couponRecordStr = this.cache_coupon.couponName
+ }
+ //兑换券
+ this.dto.goodsRecordIdListStr = ''
+ if (this.cache_goods && this.cache_goods.length > 0) {
+ this.dto.goodsRecordIdListStr = ''
+ var names = []
+ for (var tmp of this.cache_goods) {
+ names.push(tmp.name || tmp.title || '')
+ }
+ this.dto.goodsRecordIdListStr = names.join(',')
+ }
},
onLoad(options) {
// console.log('dto',options)
@@ -81,6 +126,9 @@
transportId: '',
addressId: '',
flowers: [],
+ couponRecordId: '',
+ couponRecordStr: '',
+ goodsRecordIdListStr: '',
},
current_transport: {},
cacheAddressId: '',
@@ -109,6 +157,18 @@
}
},
methods: {
+ toSelectCoupon() {
+ //跳转去列表页面进行选择
+ uni.navigateTo({
+ url: '/sub_pages/customer/coupon/coupon-self?source=shopping'
+ })
+ },
+ toSelectGood() {
+ //跳转去列表页面进行选择
+ uni.navigateTo({
+ url: '/sub_pages/customer/coupon/good-self?source=shopping'
+ })
+ },
select_need(e) {
this.show_select_need = false
this.dto.specialNeedsStr = e.value[0].label
@@ -157,6 +217,12 @@
return
}
this.dto.addressId = this.address.id
+ var goodsRecordIds = []
+ if (this.dto.goodsRecordIdListStr) {
+ for (var t of this.cache_goods) {
+ t.push(t.id)
+ }
+ }
let tmp = this
wx.login({
@@ -170,11 +236,13 @@
} = 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) {
+
//提交信息
console.log('pay,', data)
// /api/pub/init/callback?orderId=
@@ -201,16 +269,27 @@
...data,
async success(res) {
console.log('pay success', res)
- tmp.$message.showToast('支付成功')
+ // tmp.$message.showToast('支付成功')
//返回上一页
await tmp.$store.dispatch('sign_add', 'shopping')
- uni.navigateBack()
+ //清空优惠券
+ tmp.$store.dispatch('cache_coupon_select', {})
+ tmp.$store.dispatch('cache_goods_select', [])
+
+ tmp.$message.showToast('支付成功')
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 500)
+ // await
+ // uni.navigateBack()
+
+
},
async fail(err) {
console.error('pay fail', err)
tmp.$message.showToast('支付失败')
- await tmp.$store.dispatch('sign_add', 'shopping')
- uni.navigateBack()
+ // await tmp.$store.dispatch('sign_add', 'shopping')
+ // uni.navigateBack()
}
})
@@ -254,7 +333,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>
@@ -264,7 +343,7 @@
</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>
@@ -329,6 +408,16 @@
<view class="p10 bg-white m-t-20 br-4">
<view class="form-item flex ">
+ <view class="label">优惠券</view>
+
+ <view class="m-l-a m-r-0 flex " :class="[!dto.couponRecordId?'desc-gray':'']"
+ @click="toSelectCoupon">
+ <view>{{dto.couponRecordStr||dto.couponRecordId || '请选择'}}</view>
+ <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ </view>
+ </view>
+
+ <view class="form-item flex m-t-12">
<view class="label">特殊需求</view>
<view class="m-l-a m-r-0 flex " :class="[!dto.specialNeeds?'desc-gray':'']" @click="()=>{
@@ -348,6 +437,17 @@
</view>
</view>
</view>
+ <view class="form-item flex flex-wrap-normal">
+ <view class="label">兑换券</view>
+
+ <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">
+ {{dto.goodsRecordIdListStr|| '请选择'}}
+ <!-- <view>{{dto.goodsRecordIdListStr|| '请选择'}}</view> -->
+ <u-icon class="m-l-a" name="arrow-right"></u-icon>
+ </view>
+ </view>
</view>
</view>
@@ -355,7 +455,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">
@@ -370,6 +470,14 @@
{{ (current_transport.fee || 0) }}
</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>
+ </view>
</view>
@@ -378,7 +486,8 @@
<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) || 0 }} </span>元
+ {{ (( dto.totalMemberAmount || dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) - coupon_fee || 0).toFixed(2) }}
+ </span>元
</view>
<view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">
提交订单
--
Gitblit v1.9.3