From 0ad6688a4241c20311a173bd9a11944721eefbf5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 07 八月 2024 14:04:07 +0800
Subject: [PATCH] update 优化

---
 pages/order/order-delivery.vue |   54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/pages/order/order-delivery.vue b/pages/order/order-delivery.vue
index 536b677..d94e390 100644
--- a/pages/order/order-delivery.vue
+++ b/pages/order/order-delivery.vue
@@ -6,7 +6,12 @@
 			</view>
 			<view class="tab-item" :class="[query.status=='ARRIVED'?'cur':'']" @click="changeIndex('ARRIVED')">已入位
 			</view>
-
+		</view>
+		<view class="m-t-12">
+			<view class="m-l-a m-r-20 w-fit flex">
+				<radio :checked="selecttoday" @click="changeSelecrRange"></radio>
+				<view>只查看今日</view>
+			</view>
 		</view>
 		<view class="p15" style="min-height: calc(100vh - 160rpx);">
 			<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
@@ -30,7 +35,9 @@
 								</image>
 								<view class="flex1">
 									<view class=" flex">
-										<view class="title">{{item.flowerName }}
+										<view class="title"><span
+												class="level">{{ item.flowerCategory || ''}}</span><span
+												class="level">{{ item.flowerLevelStr || ''}}</span>{{item.flowerName }}
 										</view>
 									</view>
 									<view class="each-list">
@@ -105,15 +112,17 @@
 				query: {
 					status: '',
 				},
-
+				selecttoday: true,
 			}
 		},
 		onLoad(options) {
 			if (options.status) {
 				this.query.status = options.status || ''
 			}
+			//目前应该是admin(质检人员不会用这个页面)
+
 			this.listApi = '/api/supplier/delivery/list/today'
-			this.listApi = '/api/supplier/delivery/list'
+			// this.listApi = '/api/supplier/delivery/list'
 
 			this.getList()
 
@@ -133,6 +142,19 @@
 			uni.stopPullDownRefresh()
 		},
 		methods: {
+			changeSelecrRange() {
+				this.selecttoday = !this.selecttoday
+
+				this.$nextTick(() => {
+					if (this.selecttoday) {
+						this.listApi = '/api/supplier/delivery/list/today'
+					} else {
+						this.listApi = '/api/supplier/delivery/list'
+
+					}
+					this.refreshList()
+				})
+			},
 			changeIndex(status) {
 				if (this.query.status !== status) {
 					this.query.status = status
@@ -156,12 +178,14 @@
 			background-color: #fff;
 			margin-bottom: 20rpx;
 			padding: 22rpx;
-			.each-item{
-				.label{
+
+			.each-item {
+				.label {
 					min-width: 120rpx;
-					
+
 				}
-				.label:after{
+
+				.label:after {
 					content: ":";
 					margin-right: 10rpx;
 				}
@@ -218,6 +242,13 @@
 				font-size: 28rpx;
 				color: #000000;
 				line-height: 40rpx;
+				.level {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #20613D;
+					line-height: 40rpx;
+					margin-right: 20rpx;
+				}
 			}
 
 			.status {
@@ -247,6 +278,13 @@
 					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