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/index/index.vue |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 99df36d..47c1403 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="full-page">
+	<scroll-view class="full-page" scroll-y	using-sticky>
 		<up-sticky bgColor="#fff">
 			<view class="coreshop-ff c-p-10">
 				<!-- <up-search placeholder="璇风偣鍑婚�夋嫨鏃ユ湡" @clear='clear' @clickIcon='clickTime' @custom='search'
@@ -8,7 +8,7 @@
 					@search='search'></up-search>
 			</view>
 		</up-sticky>
-		<scroll-view enable-flex="true" v-if="listO.orderList">
+		<view v-if="listO.orderList">
 			<view class="list chuany-flex chuany-flex-direction chuany-align-center c-p-b-30 "
 				v-if="listO.orderList.length>0">
 				<view class="content c-p-b-18" v-for="(item,index) in listO.orderList" @click='toDetail(item.id)'
@@ -38,9 +38,15 @@
 						<text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
 							鏃ユ湡锛歿{item.wordStartTimeName}} 鑷� {{item.wordEndTimeName}}
 						</text>
-						<text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
+						<!-- <text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
 							鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
-						</text>
+						</text> -->
+						<view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-if="item.zixinganpai">
+							鏃堕棿锛歿{item.zixinganpaiName}}
+						</view>
+						<view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-else>
+							鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+						</view>
 					</view>
 					<view class="chuany-flex chuany-flex-direction chuany-font28">
 						<text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
@@ -70,14 +76,14 @@
 				<up-empty text='鏆傛棤' icon="/static/order.png">
 				</up-empty>
 			</view>
-		</scroll-view>
+		</view>
 		<view v-else>
 			<up-empty text='鏆傛棤' icon="/static/order.png">
 			</up-empty>
 		</view>
 		<fui-date-picker range :show="datePickerShow" type="5" @change="changePicker"
 			@cancel="cancel"></fui-date-picker>
-	</view>
+	</scroll-view>
 </template>
 
 <script setup>
@@ -129,6 +135,7 @@
 		datePickerShow.value = !datePickerShow.value
 	}
 	let loadStatus = ref('loadmore')
+	let tokenVal = $db.get('userToken') || ''
 	onReachBottom(() => {
 		if (loadStatus.value != 'nomore') {
 			PostListPage();
@@ -144,6 +151,7 @@
 	})
 	onShow(() => {
 		identity.value = $db.get('identity')
+		tokenVal = $db.get('userToken')
 		console.log(identity.value);
 		PostListPage()
 	})
@@ -163,7 +171,7 @@
 			data.orderName = state.orderName
 		}
 		loadStatus.value = 'loading';
-		if (identity.value == 'enterprise') {
+		if (identity.value == 'enterprise' && tokenVal) {
 			$api.PostMyListPageCompany(data).then(res => {
 				if (res.code == 1) {
 					console.log(res, res.code, '-----------123鈥�');
@@ -222,6 +230,9 @@
 		state.currentIdex = e.index
 	}
 	const toDetail = (val) => {
+		if(!tokenVal){
+			return false
+		}
 		if (identity.value !== 'enterprise') {
 			uni.navigateTo({
 				url: `/pages/detail/detail?orderid=${val}`
@@ -247,11 +258,12 @@
 	}
 
 	.content {
+		width: 93%;
 		min-height: 330rpx;
-		width: 90%;
+		/* width: 90%; */
 		background-color: #fff;
 		border-radius: 20rpx;
-		margin: 30rpx 30rpx 0 30rpx;
+		margin: 28rpx 28rpx 0 28rpx;
 	}
 
 	.bgblue {

--
Gitblit v1.9.1