From f422860fe7e521f4d252e5d77621d92d7f8dfe61 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 28 四月 2026 16:28:15 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 small-program/shop/pages/order-details/order-details.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index 924a1ca..55df9a5 100644
--- a/small-program/shop/pages/order-details/order-details.vue
+++ b/small-program/shop/pages/order-details/order-details.vue
@@ -28,7 +28,7 @@
 						<view class="addr-item-top">
 							<text>{{info.depositShopName || ''}}</text>
 						</view>
-						<text>{{info.takeUser || ''}}  </text>
+						<text>{{info.depositShopAddress || ''}}  </text>
 						<view class='addr-link' style="top: 50rpx;">
 							<image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
 							<text class=" txt-d1">鑱旂郴瀹㈡埛</text>
@@ -39,15 +39,19 @@
 						<view class="addr-item-top">
 							<text>{{info.takeShopName || info.takeLocation || ''}}</text> 
 						</view>
-						<text>{{info.takeUser || ''}}  </text>
-					<!-- 	<view class='addr-link' style="top: 50rpx;">
-							<image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
-							<text class=" txt-d1">鑱旂郴瀹㈡埛</text>
-						</view> -->
+						<text>{{info.takeShopAddress || ''}}  </text>
 					</view>
 				</view>
 				<view class="item-x"></view>
 				<view class="item-list">
+					<view class="item-list-row">
+						<view class="item-form-label">鏀朵欢浜�</view>
+						<view class="item-form-val">{{info.takeUser || ''}}</view>
+					</view>
+					<view class="item-list-row">
+						<view class="item-form-label">鏀朵欢浜虹數璇�</view>
+						<view class="item-form-val">{{info.takePhone || ''}}</view>
+					</view>
 					<view class="item-list-row">
 						<view class="item-form-label">棰勮鍒板簵鏃堕棿</view>
 						<view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
@@ -836,6 +840,7 @@
 							flex-wrap: wrap;
 							align-items: center;
 							justify-content: space-between;
+							gap: 20rpx;
 							.item-form-list-row {
 								width: 88rpx;
 								height: 88rpx;

--
Gitblit v1.9.3