From 30cb0df99ada7cffda1bd5b97c52ea3e45c4cda7 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期一, 12 八月 2024 22:05:41 +0800
Subject: [PATCH] update

---
 pages/order/order-delivery-detail.vue |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pages/order/order-delivery-detail.vue b/pages/order/order-delivery-detail.vue
index af33b10..c281216 100644
--- a/pages/order/order-delivery-detail.vue
+++ b/pages/order/order-delivery-detail.vue
@@ -19,7 +19,13 @@
 				this.status = options.status || ''
 				this.query.id = this.id
 			}
+			// // #ifdef PUB_PARTNER
+			// this.listApi = '/api/partner/delivery/list/items'
+			// // #endif
+			// // #ifdef PUB_CUSTOMER
+			// // #endif
 			this.listApi = '/api/supplier/delivery/list/items'
+			
 			await this.getList()
 
 		},
@@ -110,8 +116,9 @@
 						</image>
 						<view class="flex1">
 							<view class=" flex">
-								<view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
-								class="level">{{ item.flowerLevelStr || ''}}</span>{{item.flowerName }}
+								<view class="title"><span class="level"
+										v-if="item.flowerCategory">{{ item.flowerCategory || ''}}</span><span
+										class="level">{{ item.flowerLevelStr || ''}}</span>{{item.flowerName }}
 								</view>
 							</view>
 							<view class="each-list ">
@@ -140,11 +147,11 @@
 					<view class="delivery-form">
 						<view class="form-item flex1">
 							<view class="label">仓库名称</view>
-							<view class="value red">{{item.warehouseName}}</view>
+							<view class="value red">{{item.warehouseName||'待分配'}}</view>
 						</view>
 						<view class="form-item flex1">
 							<view class="label">库位名称</view>
-							<view class="value red">{{item.warehouseLocationCode}}</view>
+							<view class="value red">{{item.warehouseLocationCode||'待分配'}}</view>
 						</view>
 
 					</view>
@@ -265,6 +272,7 @@
 					font-size: 28rpx;
 					color: #000000;
 					line-height: 40rpx;
+
 					.level {
 						font-weight: 400;
 						font-size: 28rpx;
@@ -301,6 +309,7 @@
 						font-size: 28rpx;
 						color: #000000;
 						line-height: 40rpx;
+
 						.level {
 							font-weight: 400;
 							font-size: 28rpx;

--
Gitblit v1.9.3