From 65f8691ebf4f5de4a7fe2cef4fd9345b26372e55 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 01 九月 2025 18:34:12 +0800
Subject: [PATCH] 前端

---
 small-program/pages/demand-hall/demand-hall.vue |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index bc61c15..f5c1ca0 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -18,8 +18,8 @@
 		<template v-else>
 			<!-- 鍙戝崟鏂� -->
 			<view class="index-labs" v-if="typeViewId === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
-				<scroll-view scroll-x class="scroll-view_H">
-					<view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :key="index" @click="clickOrderType(item.id)">
+				<scroll-view scroll-x class="scroll-view_H" :scroll-into-view="'view'+status">
+					<view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :id="'view'+item.id" :key="item.id" @click="clickOrderType(item.id)">
 						{{item.name}}
 						<view class="index-labs-row-x" v-if="item.id === status"></view>
 					</view>
@@ -27,8 +27,8 @@
 			</view>
 			<!-- 鎺ュ崟鏂� -->
 			<view class="index-labs" v-if="typeViewId === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
-				<scroll-view scroll-x class="scroll-view_H">
-					<view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :key="index" @click="clickOrderType(item.id)">
+				<scroll-view scroll-x class="scroll-view_H" :scroll-into-view="'view'+status">
+					<view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :id="'view'+item.id" :key="item.id" @click="clickOrderType(item.id)">
 						{{item.name}}
 						<view class="index-labs-row-x" v-if="item.id === status"></view>
 					</view>
@@ -210,11 +210,33 @@
 		computed: {
 			...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude'])
 		},
-		onShow(options) {
+		async onShow(options) {
+			var flag = getApp().globalData.orderStatus
+				console.log(getApp().globalData,"=====================================")
+			this.status = ''
+			this.commentStatus=''
+			// status: this.status === 5 ? 4 : this.status,
+			// commentStatus: this.status === 5 ? 0 : '',
+			if(flag =='1'){//鍙戝崟鏂瑰緟鎺ュ崟
+				this.status = 1				
+			}else if(flag =='2'){//鍙戝崟鏂硅繘琛屼腑
+				this.status = 3 
+			}else if(flag =='3'){//鍙戝崟鏂瑰緟璇勪环
+				this.status = 5 				
+			}else if(flag =='4'){//鎺ュ崟鏂瑰凡鎺ュ崟
+				this.status =2				
+			}else if(flag =='5'){//鎺ュ崟鏂硅繘琛屼腑
+				this.status =3	
+			}else if(flag =='6'){//鎺ュ崟鏂瑰凡瀹屾垚
+				this.status =4
+			}
 			this.typeViewId = 0
 			if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
 				console.log('宸茬櫥闄�')
 				this.isLogin = true
+				if (this.userInfo && this.userInfo.useIdentity == 1) {
+					this.typeViewId = 1
+				}
 				if (!this.isOnce) {
 					this.commentStatus = ''
 					this.orderList = []
@@ -225,9 +247,6 @@
 			} else {
 				this.isLogin = false
 				console.log('鏈櫥闄�')
-			}
-			if (this.userInfo && this.userInfo.useIdentity == 1) {
-				this.typeViewId = 1
 			}
 		},
 		data() {
@@ -707,7 +726,7 @@
 				.active {
 					font-weight: 500 !important;
 					font-size: 32rpx !important;
-					color: #222222 !important;
+					color: #00BC12 !important;
 				}
 				.index-labs-row {
 					display: inline-block;
@@ -717,7 +736,7 @@
 					font-size: 30rpx;
 					color: #666666;
 					position: relative;
-					margin-right: 62rpx;
+					margin-right: 50rpx;
 					&:last-child {
 						margin: 0 !important;
 					}
@@ -726,7 +745,7 @@
 						bottom: 0;
 						left: 50%;
 						width: 40rpx;
-						height: 2rpx;
+						height: 4rpx;
 						background-color: #00BC12;
 						transform: translate(-50%, 0);
 					}

--
Gitblit v1.9.3