From f7aa204aa8d20b090d7943969ddeb9871a1fad76 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期四, 12 九月 2024 17:28:06 +0800
Subject: [PATCH] -

---
 src/pages/order/order.vue |   49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
index 570405d..a553d3b 100644
--- a/src/pages/order/order.vue
+++ b/src/pages/order/order.vue
@@ -2,15 +2,18 @@
 	<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> -->
+				<up-search placeholder="璇疯緭鍏ュ伐浣滃悕绉�" @clear='clear'  @custom='search'
+					v-model="state.orderName" @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 +29,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?'璁℃椂':'璁′欢'}}
@@ -61,7 +65,8 @@
 	import {
 		onLoad,
 		onShow,
-		onReachBottom
+		onReachBottom,
+		onPullDownRefresh
 	} from "@dcloudio/uni-app";
 	import {
 		reactive,
@@ -77,6 +82,7 @@
 	let state = reactive({
 		pageIndex: 1,
 		pageSize: 20,
+		orderName: ''
 	})
 	let workTime = ref('')
 	let datePickerShow = ref(false)
@@ -93,6 +99,13 @@
 	onLoad(() => {
 		PostMyListPageCompany()
 	})
+	onPullDownRefresh(() => {
+		state.pageIndex = 1
+		state.pageSize = 20
+		loadStatus.value = 'loadmore'
+		PostMyListPageCompany()
+		uni.stopPullDownRefresh();
+	})
 	const current4 = ref(0);
 	const list = ref(['鍏ㄩ儴', '鍙戝竷', '鎷涘伐瀹屾瘯', '缁撶畻瀹屾瘯']);
 	const changePicker = (val) => {
@@ -103,15 +116,10 @@
 	}
 
 	const search = (index) => {
-		console.log(index, '------鈥�');
-		if (index == 0) {
-			PostMyListPageCompany()
-		} else {
-			PostMyListPageCompany(index - 1)
-		}
-
+		PostMyListPageCompany()
 	}
 	const clear = () => {
+		state.orderName = ''
 		state.wordStartTime = ""
 		state.wordEndTime = ""
 	}
@@ -129,6 +137,9 @@
 		}
 		if (state.wordEndTime) {
 			data.wordEndTime = state.wordEndTime
+		}
+		if (state.orderName) {
+			data.orderName = state.orderName
 		}
 		loadStatus.value = 'loading';
 		$api.PostMyListPageCompany(data).then(res => {
@@ -154,9 +165,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