From 40f016d95500d116ed969c74b8bce175491b7b46 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 30 七月 2024 13:29:49 +0800
Subject: [PATCH] fix bug
---
sub_pages/customer/shopping/confirm.vue | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 18ecf6c..0827637 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -37,6 +37,10 @@
value: ''
})
})
+ if (this.address.id) {
+ this.loadTransportList()
+ this.cacheAddressId = this.address.id
+ }
//先获取直接的全部地址
// @ApiModelProperty(value = "订单商品")
// private List<FlowerCartListDTO> flowers;
@@ -70,6 +74,12 @@
this.loadTransportList()
this.cacheAddressId = nv.id
+ } else if (!nv.id) {
+ //说明id清空了
+ if (!this.cacheAddressId) {
+ transportList = []
+ this.cacheAddressId = ''
+ }
}
}
},
@@ -80,8 +90,11 @@
this.dto.specialNeeds = e.value[0].value
},
async loadTransportList() {
+ if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ return
+ }
let that = this;
- console.log('address', that.address, that.cacheAddressId)
+ // console.log('address', that.address, that.cacheAddressId)
if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
that.$message.showLoading()
const {
@@ -103,10 +116,15 @@
},
async submitOrder() {
console.log('submitOrder', this.dto)
- if (!this.dto.transportId) {
- this.$message.showToast('请选择配送方式')
- return
+ if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+
+ } else {
+ if (!this.dto.transportId) {
+ this.$message.showToast('请选择配送方式')
+ return
+ }
}
+
if (!this.address.id) {
this.$message.showToast('请选择收货地址')
return
@@ -213,7 +231,8 @@
</view>
</view>
<!-- 查看商品列表，和选择运费 -->
- <view class="br-4 transform-container m-t-12 p10">
+ <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">
@@ -228,20 +247,21 @@
</view>
</view>
</view>
- <view class="m-t-20" v-if="false">
+ <view class="m-t-20" v-if="true">
<view class="desc-red">
10kg以下的零买订单将收取打包费，花店建议购满20kg， 可选冷链物流
</view>
<view class="desc">
- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)，第一汤下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时，顺丰送货到店。
- 优势:价格便宜，顺丰配送
- 弊端:订单必须是5kg以内
+ <!-- 预计装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 ">
+ <view class="form-item flex ">
<view class="label">特殊需求</view>
<!-- <view class="m-l-a m-r-0 flex1">
<view class="m-t-12 m-b-12">
@@ -261,7 +281,7 @@
<view class="label">留言</view>
<view class="m-l-a m-r-0 flex1">
<view class="m-t-12 m-b-12">
- <u-textarea v-model="dto.remarks" placeholder="填写内容需与卖家协商并确认">
+ <u-textarea v-model="dto.remarks" clearable placeholder="填写内容需与卖家协商并确认">
</u-textarea>
</view>
@@ -447,6 +467,9 @@
margin-right: 0;
}
+ .desc-red {}
+
+ .desc {}
}
}
--
Gitblit v1.9.3