From 83a766a7b07cd0617bcf728acfbe95c8784b36c5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 04 八月 2024 16:56:49 +0800
Subject: [PATCH] 1

---
 pages/order/order-detail.vue |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index bad6c50..5ced962 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -325,9 +325,11 @@
 				{{ item.supplierName || ''}}
 			</view>
 			<view class="flex m-t-12">
-				<radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio>
+				<radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0"
+					@click="changeSalesOrderItem(item)"></radio>
 
-				<image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
+				<image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
+					@click="previewImg(item.flowerCover)">
 				</image>
 				<view class="flex1">
 					<view class=" flex">
@@ -338,9 +340,10 @@
 					<view class="each-list">
 						<view class="each-item">
 							<view class="label">货位号</view>
-							<view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}</view>
+							<view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
+							</view>
 						</view>
-				 
+
 						<view class="each-item">
 							<view class="label">颜色</view>
 							<view class="value">{{ item.flowerColor || '-' }}</view>
@@ -374,6 +377,12 @@
 				<view class="label">订单编号:</view>
 				<view class="value">{{ dto.orderNo || '-' }}</view>
 				<view class="button m-l-a m-r-0" @click="copyTxt(dto.orderNo)">复制
+				</view>
+			</view>
+			<view class="form-item" v-if="dto.deliveryNo">
+				<view class="label">快递单号:</view>
+				<view class="value">{{ dto.deliveryNo || '-' }}</view>
+				<view class="button m-l-a m-r-0" @click="copyTxt(dto.deliveryNo)">复制
 				</view>
 			</view>
 			<view class="form-item">
@@ -453,11 +462,15 @@
 					<image src="/static/common/icon-call.png" class="icon icon-call m-r-10  img100"></image>
 					拨打15974805814
 				</view>
-				<view class="flex1 w-fit m-auto icon-view" open-type="contact">
-					<image src="/static/common/icon-wx.png" class="icon icon-call  m-r-10 img100"></image>
-					点击联系在线客服
+				<view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
+					<image src="/static/common/icon-wx.png" class="icon icon-call m-t-2  m-r-10 img100"></image>
+
+					<button open-type="contact" class="component-button-contact" @handleContact="handleContact">
+						联系在线客服
+					</button>
 				</view>
 
+
 			</view>
 		</view>
 

--
Gitblit v1.9.3