From 94a21e0b73d3d0e4fe0c9aad8fb3cfc256aa6245 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 13 一月 2025 10:20:06 +0800
Subject: [PATCH] 1.订单提交新增没有平台运输方式不可提交
---
sub_pages/customer/shopping/confirm.vue | 240 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 178 insertions(+), 62 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 32714a8..7b205f1 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -17,9 +17,48 @@
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){
+ await this.$store.dispatch('cache_coupon_select', tmpCoupon);
+ this.dto.couponRecordId = tmpCoupon.id;
+ this.dto.couponRecordStr = tmpCoupon.couponName;
+ setTimeout(() => {
+ this.$message.showToast('自动为您选择优惠最大的优惠券')
+ }, 1000)
+
+ }else{
+ 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') {
@@ -44,9 +83,14 @@
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) {
@@ -64,9 +108,22 @@
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() {
+
+ // 查看当前合伙人
+ await this.getPartnerInfo()
+
+ // 根据地址获取运输方式
+ if (this.address.id) {
+ await this.loadTransportList()
+ this.cacheAddressId = this.address.id
+ }
+
+ // 获取当前用户为使用的优惠券
+ // this.getSuitableCouponAuto()
//优惠券
if (this.cache_coupon && this.cache_coupon.id) {
this.dto.couponRecordId = this.cache_coupon.id
@@ -85,6 +142,11 @@
}
this.dto.goodsRecordIdListStr = names.join(',')
}
+
+
+
+
+
},
onLoad(options) {
// console.log('dto',options)
@@ -107,10 +169,7 @@
value: ''
})
})
- if (this.address.id) {
- this.loadTransportList()
- this.cacheAddressId = this.address.id
- }
+
//
//先获取直接的全部地址
// @ApiModelProperty(value = "订单商品")
@@ -118,27 +177,7 @@
// @ApiModelProperty(value = "打包费")
// private BigDecimal packing;
- // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过
-
- if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
- // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。
-
- this.$http.request('get', '/api/current/customer/partner', {
- params: {
- // id: this.currentInfo.customerDTO.partnerId
- }
- }).then(async res => {
- if (res.code == 0) {
- this.partnerInfo = res.data || {}
- if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
- //刷新用户信息
- await this.$store.dispatch('getCurrentInfo')
- }
- }
- })
-
-
- }
+
},
data() {
@@ -153,6 +192,7 @@
couponRecordId: '',
couponRecordStr: '',
goodsRecordIdListStr: '',
+ unusedCouponList:[],
},
current_transport: {},
cacheAddressId: '',
@@ -162,6 +202,9 @@
[]
],
partnerInfo: {},
+ isShowFlag:true,
+
+ transportExistsFlag:true,
}
},
@@ -181,15 +224,51 @@
}
},
methods: {
+
+ getPartnerInfo(){
+ // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过
+ // console.log(this.currentInfo.customerDTO.partnerId)
+ // if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。
+
+ this.$http.request('get', '/api/current/customer/partner', {
+ params: {
+ // id: this.currentInfo.customerDTO.partnerId
+ }
+ }).then(async res => {
+ if (res.code == 0) {
+ this.partnerInfo = res.data || {}
+ if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
+ //刷新用户信息
+ await this.$store.dispatch('getCurrentInfo')
+ }
+ }
+ })
+ // }
+ },
+
+ 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)
- // if (total >= this.cache_coupon.minOrderAmount) {
- // return this.cache_coupon.couponDiscountValue || 0
- // }
+ // 不考虑打包费了
+ total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0))
+ .toFixed(2)
uni.navigateTo({
url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`
@@ -207,12 +286,12 @@
this.dto.specialNeeds = e.value[0].value
},
async loadTransportList() {
- if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
- return
- }
+ // debugger;
+ // if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ // return
+ // }
let that = this;
- // console.log('address', that.address, that.cacheAddressId)
- if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
+ // if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
that.$message.showLoading()
const {
code,
@@ -224,15 +303,37 @@
}
})
that.$message.hideLoading()
- that.transportList = []
+ this.transportList = []
if (code === 0) {
- that.transportList = data || []
+ this.transportList = data || []
+ console.log("this.transportList")
+ console.log(this.transportList)
+ if(this.transportList && this.transportList.length>0){
+ this.transportExistsFlag=true
+ }else{
+ this.transportExistsFlag=false
+ }
}
- }
+ // }
},
async submitOrder() {
console.log('submitOrder', this.dto)
+
+ // if(!this.transportExistsFlag){
+ // this.$message.showToast('当前平台没有运输方式，无法下单')
+ // return
+ // }
+
+
+ if(!(this.partnerInfo&&this.partnerInfo.id)&&(!this.currentInfo.customerDTO||!this.currentInfo.customerDTO.partnerId)){
+ if(!this.transportExistsFlag){
+ this.$message.showToast('当前平台没有运输方式，无法下单')
+ return
+ }
+ }
+
+
if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
} else {
@@ -411,42 +512,53 @@
<!-- 查看商品列表，和选择运费 -->
<view class="br-4 transform-container m-t-12 p10"
- v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId">
- <view class="title">
- <view>运输方式：</view>
- <view class="flex transform-list flex-wrap-normal">
- <view v-for="(transform,index) of transportList"
- :class="[transform.id===dto.transportId?'cur':'']" :key="index" class="transform-item"
- @click="()=>{
- dto.transportId = transform.id;
- current_transport = transform
- }">
- <view class="title">{{ transform.name }}</view>
- <view class="price">￥{{ transform.fee }}</view>
+ v-if="!(partnerInfo&&partnerInfo.id)&&(!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId)">
+ <view v-if="(address.id || cacheAddressId)&& transportExistsFlag" >
+ <view class="title">
+ <view>运输方式：</view>
+ <view class="flex transform-list flex-wrap-normal">
+ <view v-for="(transform,index) of transportList"
+ :class="[transform.id===dto.transportId?'cur':'']" :key="index" class="transform-item"
+ @click="()=>{
+ dto.transportId = transform.id;
+ current_transport = transform
+ }">
+ <view class="title">{{ transform.name }}</view>
+ <view class="price">￥{{ transform.fee }}</view>
+ </view>
+ </view>
+ </view>
+ <view class="m-t-20" v-if="true">
+ <view class="desc-red">
+ 平台购买须知：购买订单不满20扎花材将收取8元打包费；
+ </view>
+ <view class="desc">
+ <!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
+ 当日截单前多次下单，且不满20扎花材的，将收取一次打包费，其余可联系客服进行退多余打包费；当日截单前多次下单，已满20扎花材，将不收取打包费，所生产的打包费用可联系客服进行退款。
+ <!-- 优势:价格便宜，顺丰配送 -->
+ <!-- 弊端:订单必须是5kg以内 -->
</view>
</view>
</view>
- <view class="m-t-20" v-if="true">
- <view class="desc-red">
- 10kg以下的零买订单将收取打包费，花店建议购满20kg， 可选冷链物流
+ <view v-else>
+ <view class="title">
+ <view>运输方式：</view>
+ <view style="text-align:center;color:gray;">
+ 平台没有运输方式
+ </view>
</view>
- <view class="desc">
- <!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
- 第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
- <!-- 优势:价格便宜，顺丰配送 -->
- <!-- 弊端:订单必须是5kg以内 -->
- </view>
+
</view>
</view>
<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>
@@ -507,10 +619,10 @@
</view>
</view>
<view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
- <view>
+ <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">
+ <view class="m-l-a m-r-0 text-right t-red">
-{{ coupon_fee || 0 }}
</view>
</view>
@@ -539,6 +651,10 @@
.page-confirm {
padding: 20rpx 30rpx;
+ .border-red {
+ border: 1px solid red;
+ }
+
.bottom-price {
position: fixed;
background-color: #ffffff;
--
Gitblit v1.9.3