From ded34e37fca5e2e05e17693d2524c3d664ebf017 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 14 八月 2024 11:20:18 +0800
Subject: [PATCH] update 搜索历史

---
 pages/order/order-delivery-detail.vue |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pages/order/order-delivery-detail.vue b/pages/order/order-delivery-detail.vue
index 4afbf9d..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,7 +116,9 @@
 						</image>
 						<view class="flex1">
 							<view class=" flex">
-								<view class="title">{{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 ">
@@ -139,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>
@@ -264,6 +272,14 @@
 					font-size: 28rpx;
 					color: #000000;
 					line-height: 40rpx;
+
+					.level {
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #20613D;
+						line-height: 40rpx;
+						margin-right: 20rpx;
+					}
 				}
 
 				.status {
@@ -293,6 +309,14 @@
 						font-size: 28rpx;
 						color: #000000;
 						line-height: 40rpx;
+
+						.level {
+							font-weight: 400;
+							font-size: 28rpx;
+							color: #20613D;
+							line-height: 40rpx;
+							margin-right: 20rpx;
+						}
 					}
 
 					.desc {}

--
Gitblit v1.9.3