From 94384dcf5066aa1a7b2e37874fe331e148bc9249 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期日, 29 九月 2024 17:27:03 +0800
Subject: [PATCH] 工人工资查询

---
 src/pages/order/myorder.vue |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/pages/order/myorder.vue b/src/pages/order/myorder.vue
index f9c5d62..e48c389 100644
--- a/src/pages/order/myorder.vue
+++ b/src/pages/order/myorder.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<scroll-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' @click='clickTime' disabled @custom='search'
@@ -7,8 +7,9 @@
 			</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">
+		<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">
 					<view class="coreshop-ff chuany-bradius20">
@@ -24,8 +25,15 @@
 								</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 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="text-69 chuany-font28">
@@ -37,7 +45,10 @@
 								</view> -->
 								<view class="chuany-flex chuany-justify-between c-p-t-6">
 									<view class="chuany-width50">
-										<text>
+										<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>
@@ -60,7 +71,7 @@
 		</view>
 		<fui-date-picker range :show="datePickerShow" :value="$util.formatDate(new Date())" type="3"
 			@change="changePicker" @cancel="cancel"></fui-date-picker>
-	</view>
+	</scroll-view>
 </template>
 
 <script setup>
@@ -108,7 +119,7 @@
 		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

--
Gitblit v1.9.1