From 0cb39fe304ba3f5791798929f3c95cd064f30421 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 12 九月 2023 16:24:41 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages/InOperation/InOperation.vue                |    4 ++--
 minipro_standard/pages_adjust/pages/outboundList/outboundList.vue |   12 ++++++++----
 minipro_standard/pages/index/index.vue                            |   25 +++++++++++++++++++++----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/minipro_standard/pages/InOperation/InOperation.vue b/minipro_standard/pages/InOperation/InOperation.vue
index 0a4b784..6190865 100644
--- a/minipro_standard/pages/InOperation/InOperation.vue
+++ b/minipro_standard/pages/InOperation/InOperation.vue
@@ -35,7 +35,7 @@
 								<span>{{item.batch ? item.batch : '-'}}</span>
 							</div>
 						</div>
-						<div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
+						<!-- <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
 							<div class="page_content_list_item">
 								<div class="page_content_list_item_label">鍏ュ簱璐т綅锛�</div>
 								<div class="page_content_list_item_nr">{{ childer.locationName }}</div>
@@ -44,7 +44,7 @@
 								<div class="page_content_list_item_label">鏁伴噺锛�</div>
 								<div class="page_content_list_item_nr">{{ childer.num }}{{ childer.unitName }}</div>
 							</div>
-						</div>
+						</div> -->
 					</div>
 				</view>
 			</uni-collapse-item>
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 53d34c1..86bea63 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -4,7 +4,7 @@
 		<!-- {{$store.state.statusbarHeight}} -->
 		
 		<u-sticky>
-			<view class="plr30 pb30 nav-style">
+			<view class="plr30 pb30 nav-style bg_w">
 				<view
 					:style="{background: '#fff', zIndex: '999', paddingTop: `${statusbarHeight}px`, height: `${navHeight}px`, lineHeight:`${navHeight}px`, textAlign: 'center'}">
 					寰呭姙</view>
@@ -16,8 +16,9 @@
 					<LabelSelection :TagList="tagList" :isShow="true" @change="clickTag"></LabelSelection>
 				</div>
 			</view>
-		</u-sticky>
-		<scroll-view v-if="projectList.length" scroll-y refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="loadMore"
+		</u-sticky>
+		
+		<scroll-view :style="{height: height}" v-if="projectList.length" scroll-y refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="loadMore"
 			@refresherrefresh="refresh"
 		>
 			<view v-for="(item, index) in projectList" :key="index">
@@ -79,7 +80,9 @@
 			LabelSelection
 		},
 		data() {
-			return {
+			return {
+				height: '',
+				top: '',
 				code: '',
 				windowHeight: '',
 				show: false,
@@ -154,6 +157,20 @@
 			await this.$store.dispatch('getUpcomingNum')
 			this.tagList[0].num = this.$store.state.upcomingNum.d
 			this.tagList[1].num = this.$store.state.upcomingNum.y
+		},
+		onReady() {
+			var that = this
+			this.$nextTick(() => {
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.content_search')
+					.boundingClientRect((rect) => {
+						console.log('-----',rect);
+						that.height = `calc(100vh - ${rect.height + 80}px)`
+						that.top = `${rect.height}px`
+					})
+					.exec()
+			})
 		},
 		onLoad() {
 			uni.getSystemInfo({
diff --git a/minipro_standard/pages_adjust/pages/outboundList/outboundList.vue b/minipro_standard/pages_adjust/pages/outboundList/outboundList.vue
index 04a1045..c9575e3 100644
--- a/minipro_standard/pages_adjust/pages/outboundList/outboundList.vue
+++ b/minipro_standard/pages_adjust/pages/outboundList/outboundList.vue
@@ -286,10 +286,14 @@
 		onReady() {
 			var that = this
 			this.$nextTick(() => {
-				uni.createSelectorQuery().in(this).select('.content_search').boundingClientRect((rect) => {
-					that.height = `calc(100vh - ${rect.height + 80}px)`
-					that.top = `${rect.height}px`
-				}).exec()
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.content_search')
+					.boundingClientRect((rect) => {
+						
+						that.height = `calc(100vh - ${rect.height + 80}px)`
+						that.top = `${rect.height}px`
+					}).exec()
 			})
 		},
 		onLoad() {

--
Gitblit v1.9.3