From 91be10dcd43367aae04df6330e33d229c216a72e Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期三, 09 十月 2024 17:20:59 +0800
Subject: [PATCH] -

---
 src/pages/index/index.vue |  168 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 89 insertions(+), 79 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index f23dd5b..b023e6e 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,96 +1,100 @@
 <template>
-	<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'
-					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-sticky>
-		<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)'
-					:key='item.id'>
-					<view
-						class="bgblue c-p-l-18 c-p-r-18  c-p-b-10 c-p-t-10 chuany-flex chuany-justify-between chuany-font30">
-						<view class="chuany-flex chuany-flex-direction">
-							<text class=''>
-								{{$util.formatDate(item.startTime)}}
+	<view class="full-page" scroll-y using-sticky>
+		<view class="">
+			<up-sticky bgColor="#fff">
+				<view class="coreshop-ff 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' @custom='search' v-model="state.orderName"
+						@search='search'></up-search>
+				</view>
+			</up-sticky>
+			<view v-if="listO.orderList" class="full-page-content">
+				<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)'
+						:key='item.id'>
+						<view
+							class="bgblue c-p-l-18 c-p-r-18  c-p-b-10 c-p-t-10 chuany-flex chuany-justify-between chuany-font30">
+							<view class="chuany-flex chuany-flex-direction">
+								<text class=''>
+									{{$util.formatDate(item.startTime)}}
+								</text>
+							</view>
+							<text>
+								鎷泏{item.worderCounted}}/{{item.worderCount}}浜�
 							</text>
 						</view>
-						<text>
-							鎷泏{item.worderCounted}}/{{item.worderCount}}浜�
-						</text>
-					</view>
-					<view class="c-p-l-18 c-p-t-10 c-p-b-10 c-p-r-18 chuany-font32">
-						{{item.orderComName}}
-					</view>
-					<view class="c-p-l-18 c-p-r-18 c-p-b-10 chuany-font32">
-						{{item.orderName}}
-					</view>
-					<!-- <view class="chuany-flex c-p-l-18">
-						<up-tag class='c-p-r-14' :text="item" plain v-for="(item,index) in item.tags" :key="index">
-						</up-tag>
-					</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'>
-							鏃ユ湡锛歿{item.wordStartTimeName}} 鑷� {{item.wordEndTimeName}}
-						</text>
-						<!-- <text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
-							鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
-						</text> -->
-						<view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-if="item.zixinganpai">
-							鏃堕棿锛歿{item.zixinganpaiName}}
+						<view class="c-p-l-18 c-p-t-10 c-p-b-10 c-p-r-18 chuany-font32">
+							{{item.orderComName}}
 						</view>
-						<view class="c-p-l-18 c-p-r-18 text-69 c-p-b-10" v-else>
-							鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+						<view class="c-p-l-18 c-p-r-18 c-p-b-10 chuany-font32">
+							{{item.orderName}}
 						</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'>
-							瑕佹眰锛歿{item.demand}}
-						</text>
-						<text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
-							鍦板潃锛歿{item.worderAddress}}
-						</text>
-					</view>
-					<view class='chuany-flex chuany-justify-between c-p-l-18 c-p-r-18'>
-						<view class="redcla">
-							<view class="">
-								<text class="chuany-font40">
-									{{item.workPrice}}<template v-if="item.workPriceMax">~{{item.workPriceMax}}</template>
+						<!-- <view class="chuany-flex c-p-l-18">
+							<up-tag class='c-p-r-14' :text="item" plain v-for="(item,index) in item.tags" :key="index">
+							</up-tag>
+						</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'>
+								鏃ユ湡锛歿{item.wordStartTimeName}} 鑷� {{item.wordEndTimeName}}
+							</text>
+							<!-- <text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
+								鏃堕棿锛歿{item.startTimeName}} 鑷� {{item.endTimeName}}
+							</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'>
+								瑕佹眰锛歿{item.demand}}
+							</text>
+							<text class='c-p-l-18 c-p-r-18 text-69 c-p-b-10'>
+								鍦板潃锛歿{item.worderAddress}}
+							</text>
+						</view>
+						<view class='chuany-flex chuany-justify-between c-p-l-18 c-p-r-18'>
+							<view class="redcla">
+								<view class="">
+									<text class="chuany-font40">
+										{{item.workPrice}}<template
+											v-if="item.workPriceMax">~{{item.workPriceMax}}</template>
+									</text>
+									<text class='chuany-font20'>
+										{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
+									</text>
+								</view>
+								<!-- <text class="chuany-font40">
+									{{item.workPrice}}
 								</text>
 								<text class='chuany-font20'>
 									{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
-								</text>
+								</text> -->
 							</view>
-							<!-- <text class="chuany-font40">
-								{{item.workPrice}}
-							</text>
-							<text class='chuany-font20'>
-								{{item.workerType==0?'鍏�/灏忔椂':'鍏�/浠�'}}
-							</text> -->
+							<up-tag :text="item.isSelectedName?item.isSelectedName:'鍘绘姠娲�'"
+								v-if="identity !== 'enterprise'" type="warning" shape="circle"
+								@click.stop='deliver(item.id)'></up-tag>
+							<!-- <up-tag text="鍘绘姠娲�" type="warning" shape="circle"></up-tag> -->
 						</view>
-						<up-tag text="鍘绘姠娲�" v-if="identity !== 'enterprise'" type="warning" shape="circle"
-							@click.stop='deliver(item.id)'></up-tag>
-						<!-- <up-tag text="鍘绘姠娲�" type="warning" shape="circle"></up-tag> -->
 					</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" type="5" @change="changePicker"
+				@cancel="cancel"></fui-date-picker>
 		</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>
 </template>
 
@@ -160,6 +164,9 @@
 	onShow(() => {
 		identity.value = $db.get('identity')
 		tokenVal = $db.get('userToken')
+		state.pageIndex = 1
+		state.pageSize = 20
+		loadStatus.value = 'loadmore'
 		console.log(identity.value);
 		PostListPage()
 	})
@@ -237,17 +244,20 @@
 	const change = (e) => {
 		state.currentIdex = e.index
 	}
-	const toDetail = (val) => {
-		if(!tokenVal){
+	const toDetail = (item) => {
+		if (!tokenVal) {
 			return false
 		}
+		// if (item.isSelectedName && identity.value !== 'enterprise') {
+		// 	return false
+		// }
 		if (identity.value !== 'enterprise') {
 			uni.navigateTo({
-				url: `/pages/detail/detail?orderid=${val}`
+				url: `/pages/detail/detail?orderid=${item.id}`
 			})
 		} else {
 			uni.navigateTo({
-				url: `/pages/order/detail?orderid=${val}`
+				url: `/pages/order/detail?orderid=${item.id}`
 			});
 		}
 	}

--
Gitblit v1.9.1