From 87bad1af0c203865d318befd9bf3af199896931e Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 09 九月 2024 13:58:05 +0800
Subject: [PATCH] 一些改动

---
 src/pages/order/myorder.vue |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/pages/order/myorder.vue b/src/pages/order/myorder.vue
index 5c778e7..0b4f6bf 100644
--- a/src/pages/order/myorder.vue
+++ b/src/pages/order/myorder.vue
@@ -2,15 +2,15 @@
 	<view>
 		<up-sticky bgColor="#fff">
 			<view class="coreshop-ff content c-p-10">
-				<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
+				<up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @click='clickTime' disabled  @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">
+			<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">
 					<view class="coreshop-ff chuany-bradius20">
 						<view class="c-p-26">
 							<view class="chuany-flex chuany-justify-between">
@@ -28,12 +28,13 @@
 										v-else 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?'璁℃椂':'璁′欢'}}
@@ -54,7 +55,7 @@
 				</up-empty>
 			</view>
 		</view>
-		<fui-date-picker range :show="datePickerShow" type="5" @change="changePicker"
+		<fui-date-picker range :show="datePickerShow" :value="$util.formatDate(new Date())" type="3" @change="changePicker"
 			@cancel="cancel"></fui-date-picker>
 	</view>
 </template>
@@ -96,7 +97,9 @@
 	onPullDownRefresh(() => {
 		state.pageIndex = 1
 		state.pageSize = 20
+		loadStatus.value = 'loadmore'
 		PostMyListPage()
+		uni.stopPullDownRefresh();
 	})
 	onLoad(() => {
 		PostMyListPage()
@@ -108,6 +111,7 @@
 		workTime.value = val.startDate.result + '鑷�' + val.endDate.result
 		state.wordStartTime = new Date(val.startDate.result) //宸ヤ綔寮�濮嬫椂闂�
 		state.wordEndTime = new Date(val.endDate.result)
+		datePickerShow.value = !datePickerShow.value
 	}
 
 	const search = (index) => {
@@ -126,6 +130,10 @@
 	const clickTime = () => {
 		datePickerShow.value = !datePickerShow.value
 	}
+	
+	const cancel=()=>{
+		datePickerShow.value = !datePickerShow.value
+	}
 	const PostMyListPage = (orderStatus) => {
 		let data = {
 			pageIndex: state.pageIndex,

--
Gitblit v1.9.1