From 16213c0f85aa3ac8317797bf4a05fd12940e16d3 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期三, 05 三月 2025 17:29:42 +0800
Subject: [PATCH] -

---
 src/pages/order/myorder.vue |  137 +++++++++++++++++++++++++++++----------------
 1 files changed, 87 insertions(+), 50 deletions(-)

diff --git a/src/pages/order/myorder.vue b/src/pages/order/myorder.vue
index f0c8a39..32bc526 100644
--- a/src/pages/order/myorder.vue
+++ b/src/pages/order/myorder.vue
@@ -1,62 +1,87 @@
 <template>
-	<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>
-			</view>
-			<!-- <up-subsection :list="list" :current="current4" activeColor="#f9ae3d"
-				@change="sectionChange"></up-subsection> -->
-		</up-sticky>
-		<view class="full-page">
-			<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">
-								<text class="chuany-font34 chuany-text-bold">
-									{{item.orderName}}
-								</text>
+	<view class="full-page" scroll-y using-sticky>
+		<view class="">
+			<up-sticky bgColor="#fff">
+				<view class="coreshop-ff content c-p-10">
+					<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-subsection :list="list" current='1' activeColor="#f9ae3d" @change="sectionChange"></up-subsection> -->
+			</up-sticky>
+			<view class="full-page-content">
+				<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='toDetail(item.id)'>
+						<view class="coreshop-ff chuany-bradius20">
+							<view class="c-p-24">
 								<view class="chuany-flex chuany-justify-between">
-									<!-- 鎷涘伐浜烘暟锛歿{item.worderCount}}浜� -->
-									<!-- <text class="c-p-r-20">
-									
-								</text> -->
-									<up-tag class='c-m-r-10' text="鍘绘墦鍗�" shape="circle" type="success"
-										v-if="item.isSelected" @click="pageToDetail(item)" size='mini'></up-tag>
-									<up-tag class='c-m-r-10' :text="item.isSelectedName" shape="circle" type="warning"
-										v-else size='mini'></up-tag>
-								</view>
-							</view>
-							<view class="c-p-t-14">
-								鏃ユ湡锛歿{$util.formatDate(item.wordStartTime)}} 鑷� {{$util.formatDate(item.wordEndTime)}}
-							</view>
-							<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?'璁℃椂':'璁′欢'}}
+									<text class="chuany-font32">
+										{{item.orderComName}}
 									</text>
+									<view class="chuany-flex chuany-justify-between">
+										<!-- 鎷涘伐浜烘暟锛歿{item.worderCount}}浜� -->
+										<!-- <text class="c-p-r-20">
+										
+									</text> -->
+										<up-tag class='c-m-r-10' text="涓婄彮鎵撳崱" shape="circle" type="success"
+											v-if="item.isSelected" @click="pageToDetail(item)" size='mini'></up-tag>
+										<view class="" v-else>
+											<up-text :type="item.isSelectedName=='瀹℃牳涓�'?'info':'error'"
+												:text="item.isSelectedName" size='14'></up-text>
+											<!-- <up-tag v-if="item.isSelectedName=='瀹℃牳涓�'" class='c-m-r-10' bgColor='#909399' borderColor='#909399'
+												v-if="item.isSelectedName=='瀹℃牳涓�'" :text="item.isSelectedName" shape="circle"
+												size='mini'></up-tag>
+											<up-tag class='c-m-r-10' v-else :text="item.isSelectedName" shape="circle"
+												type="error" size='mini'></up-tag> -->
+										</view>
+
+									</view>
 								</view>
-								<view class="chuany-width50">
-									宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
-									<text></text>
+								<view class="chuany-flex chuany-justify-between c-p-t-6">
+									<text class="text-69 chuany-font28">
+										{{item.orderName}}
+									</text>
+									
+								</view>
+								<view class="text-69 chuany-font28">
+									<view class="c-p-t-6">
+										鏃ユ湡锛歿{item.wordStartTimeName}} 鑷� {{item.wordEndTimeName}}
+									</view>
+									<!-- <view class="c-p-t-14">
+										鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+									</view> -->
+									<view class="chuany-flex chuany-justify-between c-p-t-6">
+										<view class="chuany-width50">
+											<view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-if="item.zixinganpai">
+												鏃堕棿锛歿{item.zixinganpaiName}}
+											</view>
+											<text v-else>
+												<!-- 鏂瑰紡锛歿{item.workerType==0?'璁℃椂':'璁′欢'}} -->
+												鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+											</text>
+										</view>
+										<view class="chuany-width50">
+											宸ヤ环锛歿{item.workPrice}}<template
+												v-if="item.workPriceMax">~{{item.workPriceMax}}</template>{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
+											<text></text>
+										</view>
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
+					<up-loadmore :status="loadStatus" />
 				</view>
-				<up-loadmore :status="loadStatus" />
+				<view v-else>
+					<up-empty text='鏆傛棤' icon="/static/order.png">
+					</up-empty>
+				</view>
 			</view>
-			<view v-else>
-				<up-empty text='鏆傛棤' icon="/static/order.png">
-				</up-empty>
-			</view>
+			<fui-date-picker range :show="datePickerShow" :value="$util.formatDate(new Date())" type="3"
+				@change="changePicker" @cancel="cancel"></fui-date-picker>
 		</view>
-		<fui-date-picker range :show="datePickerShow" type="5" @change="changePicker"
-			@cancel="cancel"></fui-date-picker>
 	</view>
 </template>
 
@@ -97,18 +122,21 @@
 	onPullDownRefresh(() => {
 		state.pageIndex = 1
 		state.pageSize = 20
+		loadStatus.value = 'loadmore'
 		PostMyListPage()
+		uni.stopPullDownRefresh();
 	})
 	onLoad(() => {
 		PostMyListPage()
 	})
 	const current4 = ref(0);
-	const list = ref(['鍏ㄩ儴', '鍙戝竷', '鎷涘伐瀹屾瘯', '缁撶畻瀹屾瘯']);
+	// const list = ref(['鍏ㄩ儴', '瀹℃牳涓�', '宸插綍鐢�', '鏈綍鐢�']);
 	const changePicker = (val) => {
 		console.log(val);
 		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) => {
@@ -120,11 +148,20 @@
 		}
 
 	}
+	const toDetail = (val) => {
+		uni.navigateTo({
+			url: `/pages/order/myorderdetail?orderid=${val}`
+		})
+	}
 	const clear = () => {
 		state.wordStartTime = ""
 		state.wordEndTime = ""
 	}
 	const clickTime = () => {
+		datePickerShow.value = !datePickerShow.value
+	}
+
+	const cancel = () => {
 		datePickerShow.value = !datePickerShow.value
 	}
 	const PostMyListPage = (orderStatus) => {
@@ -146,7 +183,7 @@
 				if (state.pageIndex == 1) {
 					listO.orderList = res.data.items
 				} else {
-					listO.orderList.concat(...res.data.items)
+					listO.orderList = listO.orderList.concat(...res.data.items)
 				}
 				console.log(listO.orderList, 'listO.orderList鈥�');
 				// totalPages.value = res.data.totalCount

--
Gitblit v1.9.1