From 447e19fa298ae11a1c3a3fa2d2ff3a1a8dba0501 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期四, 29 八月 2024 17:15:29 +0800
Subject: [PATCH] -

---
 src/pages/order/order.vue |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
index 570405d..a2e418b 100644
--- a/src/pages/order/order.vue
+++ b/src/pages/order/order.vue
@@ -2,15 +2,16 @@
 	<view>
 		<up-sticky bgColor="#fff">
 			<view class="coreshop-ff content c-p-10">
-				<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search' v-model="workTime"
-					search-icon="calendar" @search='search'></up-search>
+				<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
+					v-model="workTime" search-icon="calendar" @search='search'></up-search>
 			</view>
 			<!-- <up-subsection :list="list" :current="current4" activeColor="#f9ae3d"
 				@change="sectionChange"></up-subsection> -->
 		</up-sticky>
 		<view class="full-page">
-			<view class="" v-if="listO.orderList&&listO.orderList.length>0">
-				<view class="listrecord c-p-20" v-for="(item,index) in listO.orderList" :key="item.id" @click="pageToDetail(item)">
+			<view class="c-p-l-20 c-p-r-20" v-if="listO.orderList&&listO.orderList.length>0">
+				<view class="listrecord c-p-t-20" v-for="(item,index) in listO.orderList" :key="item.id"
+					@click="pageToDetail(item)">
 					<view class="coreshop-ff chuany-bradius20">
 						<view class="c-p-26">
 							<view class="chuany-flex chuany-justify-between">
@@ -26,12 +27,13 @@
 										plain plainFill size='mini'></up-tag>
 								</view>
 							</view>
-							<view class="c-p-t-20">
-								{{$util.formatDate(item.wordStartTime,true)}}鑷�
-								{{$util.formatDate(item.wordEndTime,true)}} 
-								
+							<view class="c-p-t-14">
+								鏃ユ湡锛歿{$util.formatDate(item.wordStartTime)}} 鑷� {{$util.formatDate(item.wordEndTime)}}
 							</view>
-							<view class="chuany-flex chuany-justify-between c-p-t-20">
+							<view class="c-p-t-14">
+								鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+							</view>
+							<view class="chuany-flex chuany-justify-between c-p-t-14">
 								<view class="chuany-width50">
 									<text>
 										鏂瑰紡锛歿{item.workerType==0?'璁℃椂':'璁′欢'}}
@@ -154,9 +156,9 @@
 			}
 		})
 	}
-	const pageToDetail = (item)=>{
+	const pageToDetail = (item) => {
 		uni.navigateTo({
-		    url: `/pages/order/detail?orderid=${item.id}`
+			url: `/pages/order/detail?orderid=${item.id}`
 		});
 		// $db.set('detailItem',JSON.stringify(item))
 	}

--
Gitblit v1.9.1