From e4233b5c4e123c4b79a38d0a9b0c8b60631e1683 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 30 七月 2024 10:40:24 +0800
Subject: [PATCH] update

---
 sub_pages/customer/shopping/confirm.vue |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 9bb416c..0827637 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -37,7 +37,7 @@
 					value: ''
 				})
 			})
-			if(this.address.id){
+			if (this.address.id) {
 				this.loadTransportList()
 				this.cacheAddressId = this.address.id
 			}
@@ -74,6 +74,12 @@
 					this.loadTransportList()
 					this.cacheAddressId = nv.id
 
+				} else if (!nv.id) {
+					//说明id清空了
+					if (!this.cacheAddressId) {
+						transportList = []
+						this.cacheAddressId = ''
+					}
 				}
 			}
 		},
@@ -84,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 {
@@ -107,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
@@ -217,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">
@@ -451,13 +466,10 @@
 			.transform-list:nth-child(3n+2) {
 				margin-right: 0;
 			}
-			
-			.desc-red{
-				
-			}
-			.desc{
-				
-			}
+
+			.desc-red {}
+
+			.desc {}
 		}
 
 	}

--
Gitblit v1.9.3