From 623859790a3f074c103c792e5eaca33b199dbb91 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 06 八月 2024 15:14:41 +0800
Subject: [PATCH] update 花店端的一些细节功能、打印的、合伙人推广二维码的

---
 pages/order/order.vue |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pages/order/order.vue b/pages/order/order.vue
index 96bc190..8972272 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -182,7 +182,7 @@
 						}
 					}
 					break
-					case 'delOrder':{
+					case 'delOrder': {
 						await this.$message.confirm('是否删除此订单')
 						// 发送请求
 						this.$message.showLoading()
@@ -248,6 +248,7 @@
 					</view>
 					<view class="value">{{ dto.deliveryNo }}</view>
 				</view>
+
 				<view class="flex">
 					<view class="desc flex flex1">
 						<view class="label">
@@ -262,12 +263,21 @@
 						<view class="value">{{ dto.customerTel || '-' }}</view>
 					</view>
 				</view>
-				<view class="desc flex">
-					<view class="label">
-						收货地址:
+				<view class="flex">
+					<view class="desc flex flex1">
+						<view class="label">
+							收货地址:
+						</view>
+						<view class="value">{{ dto.customerAddress }}</view>
 					</view>
-					<view class="value">{{ dto.customerAddress }}</view>
+					<view class="desc flex flex1" v-if="dto.deliveryName">
+						<view class="label">
+							快递名称:
+						</view>
+						<view class="value">{{ dto.deliveryName }}</view>
+					</view>
 				</view>
+				
 				<view class="desc flex" v-if="dto.statusBackend!=='PENDING'&&dto.statusBackend!=='CANCEL'">
 					<view class="label">
 						支付时间:

--
Gitblit v1.9.3