From 03d26aca1b656c03dc4280f85acb1132bd87639d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 09 九月 2024 23:57:43 +0800
Subject: [PATCH] update 会员信息、兑换商品等
---
sub_pages/customer/shopping/confirm.vue | 155 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 141 insertions(+), 14 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index f6f3a7b..f496ad4 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -2,6 +2,7 @@
import {
mapState
} from 'vuex'
+ import environments from '@/environments'
export default {
name: "订单详情",
@@ -10,11 +11,55 @@
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 = ((dto.totalAmount || 0) + (dto.packing || 0) + (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)
@@ -48,17 +93,26 @@
// @ApiModelProperty(value = "打包费")
// private BigDecimal packing;
+ // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过
+
if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
- //todo 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。
- this.$http.request('get', '/api/partner/page/view', {
+ // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。
+
+ this.$http.request('get', '/api/current/customer/partner', {
params: {
- id: this.currentInfo.customerDTO.partnerId
+ // id: this.currentInfo.customerDTO.partnerId
}
- }).then(res => {
+ }).then(async res => {
if (res.code == 0) {
this.partnerInfo = res.data || {}
+ if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
+ //刷新用户信息
+ await this.$store.dispatch('getCurrentInfo')
+ }
}
})
+
+
}
},
@@ -71,6 +125,9 @@
transportId: '',
addressId: '',
flowers: [],
+ couponRecordId: '',
+ couponRecordStr: '',
+ goodsRecordIdListStr: '',
},
current_transport: {},
cacheAddressId: '',
@@ -99,6 +156,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
@@ -147,6 +216,12 @@
return
}
this.dto.addressId = this.address.id
+ var goodsRecordIds = []
+ if (this.dto.goodsRecordIdListStr) {
+ for (var t of this.cache_goods) {
+ t.push(t.goodsId)
+ }
+ }
let tmp = this
wx.login({
@@ -160,38 +235,59 @@
} = 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)
- if (data && data['_testOrderId']) {
+ // /api/pub/init/callback?orderId=
+ // if(env.pro)
+ if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
+ environments.httpBaseUri.startsWith(
+ 'http://47.99.58.211/flower')) {
//回调
tmp.$message.showLoading()
const res2 = await tmp.$http.request('get',
- '/api/customer/flower/order/callback/tmp', {
+ '/api/pub/init/callback', {
params: {
- id: res2.data['_testOrderId']
+ orderId: data['_testV2OrderId'] || data[
+ '_testOrderId'] || ''
}
})
tmp.$message.hideLoading()
+ tmp.$message.showToast('支付成功')
+ //返回上一页
+ await tmp.$store.dispatch('sign_add', 'shopping')
+ uni.navigateBack()
} else if (data) {
wx.requestPayment({
...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.$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()
}
})
@@ -309,7 +405,19 @@
</view>
<view class="p10 bg-white m-t-20 br-4">
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
<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>
+ <!-- #endif -->
+
+ <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="()=>{
@@ -329,6 +437,18 @@
</view>
</view>
</view>
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+ <view class="form-item flex ">
+ <view class="label">兑换券</view>
+
+ <view class="m-l-a m-r-0 flex "
+ :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>
+ </view>
+ <!-- #endif -->
</view>
</view>
@@ -351,6 +471,12 @@
{{ (current_transport.fee || 0) }}
</view>
</view>
+ <view class="desc flex">
+ <view>优惠:</view>
+ <view class="m-l-a m-r-0 text-right">
+ -{{ coupon_fee || 0 }}
+ </view>
+ </view>
</view>
@@ -359,7 +485,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.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