From a1a7c2aed860d1a1bb1ac377a69cdeacb7609cb9 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期五, 11 十月 2024 09:16:42 +0800
Subject: [PATCH] -

---
 src/pages/order/order.vue |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
index 1c28088..4dbbb24 100644
--- a/src/pages/order/order.vue
+++ b/src/pages/order/order.vue
@@ -1,5 +1,5 @@
 <template>
-	<scroll-view class="full-page" scroll-y using-sticky>
+	<view class="full-page" scroll-y using-sticky>
 		<up-sticky bgColor="#fff">
 			<view class="coreshop-ff content c-p-10">
 				<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
@@ -26,7 +26,8 @@
 								</text> -->
 									<!-- <up-tag class='c-m-r-10' :text="item.orderStatusName" shape="circle" type="success"
 										plain plainFill size='mini'></up-tag> -->
-									<up-text :type="item.orderStatus==0?'primary':'success'" :text="item.orderStatusName" size='12'></up-text>
+									<up-text :type="item.orderStatus==0?'primary':'success'"
+										:text="item.orderStatusName" size='12'></up-text>
 									<!-- <up-button class='c-m-r-10' :text="item.isEn?'涓嬫灦':'涓婃灦'" disabled shape="circle"
 										v-if="item.orderStatus==0" :type="item.isEn?'error':'primary'" size='mini'
 										@click.stop="manageOrder(item)"></up-button> -->
@@ -49,11 +50,21 @@
 										</text>
 									</view>
 									<view class="chuany-width50">
-										宸ヤ环锛歿{item.workPrice}}{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
-										<text></text>
+										宸叉嫑浜烘暟锛歿{item.worderCounted}} 浜�
+									</view>
+									<view class="chuany-width50">
+										<text>
+											寰呭鏍镐汉鏁帮細{{item.workerDaiCount}} 浜�
+										</text>
+									</view>
+									<view class="chuany-width50">
+										宸ヤ环锛歿{item.workPrice}}<template
+											v-if="item.workPriceMax">~{{item.workPriceMax}}</template>
+										{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
 									</view>
 									<view class="">
-										<up-button hoverStopPropagation :text="item.isEn?'涓嬫灦':'涓婃灦'" shape="circle" :loading='item.isLoading' :loadingText="item.isEn?'涓嬫灦涓�':'涓婃灦涓�'"
+										<up-button hoverStopPropagation :text="item.isEn?'涓嬫灦':'涓婃灦'" shape="circle"
+											:loading='item.isLoading' :loadingText="item.isEn?'涓嬫灦涓�':'涓婃灦涓�'"
 											v-if="item.orderStatus==0" :type="item.isEn?'error':'primary'" size='mini'
 											@tap.stop="manageOrder(item)"></up-button>
 									</view>
@@ -72,7 +83,7 @@
 		</view>
 		<fui-date-picker range :show="datePickerShow" type="5" @change="changePicker"
 			@cancel="cancel"></fui-date-picker>
-	</scroll-view>
+	</view>
 </template>
 
 <script setup>
@@ -122,7 +133,7 @@
 		uni.stopPullDownRefresh();
 	})
 	const current4 = ref(0);
-	const list = ref(['鍏ㄩ儴', '鍙戝竷涓�', '宸蹭笅鏋�']);
+	const list = ref(['鍏ㄩ儴', '宸蹭笂鏋�', '宸蹭笅鏋�']);
 	const changePicker = (val) => {
 		console.log(val);
 		workTime.value = val.startDate.result + '鑷�' + val.endDate.result
@@ -138,11 +149,10 @@
 	const clickTime = () => {
 		datePickerShow.value = !datePickerShow.value
 	}
-	const PostMyListPageCompany = (orderStatus) => {
+	const PostMyListPageCompany = () => {
 		let data = {
 			pageIndex: state.pageIndex,
 			pageSize: state.pageSize,
-			orderStatus,
 			isEn: isEn.value
 		}
 		if (state.wordStartTime) {
@@ -193,6 +203,9 @@
 				isEn.value = false
 				break;
 		}
+		state.pageIndex = 1
+		state.pageSize = 20
+		loadStatus.value = 'loadmore'
 		PostMyListPageCompany()
 	}
 	const manageOrder = (item) => {

--
Gitblit v1.9.1