From 47d56a8b0f22fb15a46b69dfd46fac23560ad2cd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 五月 2026 09:07:49 +0800
Subject: [PATCH] 改bug

---
 mini-program/pagesA/pages/order-details/order-details.vue |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/mini-program/pagesA/pages/order-details/order-details.vue b/mini-program/pagesA/pages/order-details/order-details.vue
index 1fa68f2..21df525 100644
--- a/mini-program/pagesA/pages/order-details/order-details.vue
+++ b/mini-program/pagesA/pages/order-details/order-details.vue
@@ -128,6 +128,12 @@
 							</view>
 						</view>
 					</view>
+					<view style="width: 100%; height: 1rpx; background: #E5E5E5; margin: 30rpx 0;"></view>
+					<view class="user-kd" v-if="info.kdName && info.kdCode">
+						<image src="/static/icon/ic_wuliu@2x.png" mode="widthFix"></image>
+						<text>{{info.kdName || ''}}锝渰{info.kdCode || ''}}</text>
+						<image class="image2" src="/static/icon/ic_cppy@2x.png"  @click="copyText(info.kdCode )" mode="widthFix"></image>
+					</view>
 				</template>
 			</view>
 			<view class="user" v-if="userType==1">
@@ -242,8 +248,8 @@
 						</view>
 					</view>
 					<view class="shop-info-item">
-						<view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-if="[1,2,3,4]">瀹炰粯娆�</view>
-						<view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-else-if="[0]">闇�浠樻</view>
+						<view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-if="[1,2,3,4].includes(info.orderStatus)">瀹炰粯娆�</view>
+						<view class="shop-info-item-label" style="color: #222222; font-size: 30rpx; font-weight: 600;" v-else-if="[0].includes(info.orderStatus)">闇�浠樻</view>
 						<view class="shop-info-item-price xfk">
 							<text>{{(info.price || 0).toFixed(2)}}</text>
 							<text></text>
@@ -317,7 +323,7 @@
 					</view>
 				</view>
 			</view>
-			<view style="width: 100%; height: calc(100rpx + env(safe-area-inset-bottom));"></view>
+			<view style="width: 100%; height: calc(120rpx + env(safe-area-inset-bottom));"></view>
 		</view>
 		<view class="footer">
 			<view class="caozuo" v-if="userType!=1">
@@ -327,7 +333,7 @@
 				<view class="caozuo-item" @click="doneOrder()"  v-if=" info.orderStatus==2" style="border: 1rpx solid #004096; color: #004096;">纭鏀惰揣</view>
 			</view>
 			<view class="caozuo" v-if="userType==1">
-				<view class="caozuo-item" @click="hexiaoOrder()"  v-if=" info.orderStatus==1 && info.receiveType ==1" style="border: 1rpx solid #004096; color: #004096;">鑷彁鏍搁攢</view>
+				<!-- <view class="caozuo-item" @click="hexiaoOrder()"  v-if=" info.orderStatus==1 && info.receiveType ==1" style="border: 1rpx solid #004096; color: #004096;">鑷彁鏍搁攢</view> -->
 			</view>
 			<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
 		</view>
@@ -478,8 +484,11 @@
 				if(this.userType == 1 ) {
 					return
 				}
+				if (this.loading) return;
+				this.loading = true
 				var that =this
 				let res = await this.$u.api.affirmOrder({ orderId: this.info.orderId  });
+				this.loading = false
 				if (res.code === 200 ) { 
 					//淇敼璁㈠崟鐘舵��
 					this.info.orderStatus = 3
@@ -497,8 +506,11 @@
 				if(this.userType == 1 ) {
 					return
 				}
+				if (this.loading) return
+				this.loading = true
 				var that =this
 				let res = await that.$u.api.cancelOrder({ orderId: this.info.orderId  });
+				this.loading = false
 				if (res.code === 200 ) { 
 					this.info.orderStatus = 4
 					uni.$emit('updateOrder',{info:this.info,delete:0})
@@ -515,8 +527,11 @@
 				if(this.userType == 1 ) {
 					return
 				}
+				if (this.loading) return;
+				this.loading = true
 				var that =this
 				let res = await that.$u.api.delOrder({ orderId: this.info.orderId  });
+				this.loading = false
 				if (res.code === 200 ) { 
 					uni.$emit('updateOrder',{info:this.info,delete:1})
 					uni.navigateBack({delta:1})
@@ -1053,14 +1068,16 @@
 				.user-jxtime {
 					width: 100%;
 					display: flex;
-					align-items: center;
+					align-items: flex-start;
 					margin-top: 12rpx;
 					.user-jxtime-icon {
+						flex-shrink: 0;
 						width: 26rpx;
 						height: 26rpx;
 						margin-right: 10rpx;
 					}
 					text {
+						line-height: 36rpx;
 						font-weight: 400;
 						font-size: 26rpx;
 						color: #222222;
@@ -1166,6 +1183,7 @@
 							font-size: 26rpx;
 							color: #666666;
 							margin-top: 18rpx;
+							line-height: 36rpx;
 							image {
 								width: 30rpx;
 								height: 30rpx;
@@ -1190,13 +1208,15 @@
 						font-weight: 400;
 						font-size: 26rpx;
 						color: #333333; 
+						line-height: 36rpx;
 					}
 				}
 				.user-kd {
 					width: 100%;
 					display: flex;
-					align-items: center;
+					align-items: flex-start;
 					image {
+						flex-shrink: 0;
 						width: 30rpx;
 						height: 30rpx;
 						margin-right: 12rpx;
@@ -1205,8 +1225,10 @@
 						font-weight: 400;
 						font-size: 26rpx;
 						color: #333333; 
+						line-height: 36rpx;
 					}
 					.image2 {
+						flex-shrink: 0;
 						width: 24rpx;
 						height: 24rpx;
 						margin-left: 12rpx;

--
Gitblit v1.9.3