From feda90ec35733a1b94ad12fec6c9eb81d37d7ee4 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Fri, 29 Mar 2024 17:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E9=A1=B5=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    | 11 ++++++-----
 pages/index/index.vue         |  2 +-
 pages/knowledge/knowledge.vue |  4 +++-
 subpkg/list/list.vue          | 11 +++++++++--
 subpkg/message/message.vue    |  4 +++-
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pages.json b/pages.json
index 73d1efa..586d5b2 100644
--- a/pages.json
+++ b/pages.json
@@ -28,7 +28,8 @@
 			"style": {
 				"navigationBarTitleText": "全民演练",
 				"enablePullDownRefresh": true,
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"onReachBottomDistance":20
 			}
 		}
 	],
@@ -39,8 +40,8 @@
 			"style": {
 				"navigationBarTitleText": "场景演练",
 				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": false,
-				"onReachBottomDistance": 150,
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 100,
 				"navigationStyle": "custom"
 			}
 		},
@@ -139,8 +140,8 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"onReachBottomDistance":50
 			}
 		},
 		{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4cc1d70..526cc6a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,7 +6,7 @@
 				<img :src="topImg"></img>
 			</view>
 		    <view class="banbox">
-				<swiper style="height: 100%;" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000" :circular="true">
+				<swiper style="height: 100%;" :indicator-dots="false" :autoplay="true" :interval="3000" :duration="1000" :circular="true">
 					<swiper-item v-for="(item, i) in swiperList" :key="i">
 						<navigator style="height: 100%;" class="swiper-item">
 							<img :src="item"></img>
diff --git a/pages/knowledge/knowledge.vue b/pages/knowledge/knowledge.vue
index cc0f75b..1217f7f 100644
--- a/pages/knowledge/knowledge.vue
+++ b/pages/knowledge/knowledge.vue
@@ -77,7 +77,9 @@
 
 <style lang="scss">
 	@import url("@/static/base_css.css");
-	
+	.wrap{
+		 height: 101%;
+	}
 	.mainwrap {
 		top: 0;
 		height: calc(100% - 260rpx);
diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 8cf8cb0..e7241ff 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -53,6 +53,7 @@
 					pageNum:1,
 					pageSize:10
 				},
+				time:1,
 				total:0,
 				search: false,
 				isloading:false,
@@ -68,6 +69,9 @@
 			this.getSceneList();
 		},
 		onShow() {
+			if (this.time == 1) {
+				this.time = 2; return;
+			}
 			this.getSwiperList();
 			this.getSceneListReload();
 		},
@@ -145,6 +149,7 @@
 				if(this.isloading) return
 				this.queryObj.pageNum++
 				this.getSceneList()
+				uni.pageScrollTo({scrollTop: 120})
 			}
 		}
 	}
@@ -152,7 +157,9 @@
 
 <style lang="scss">
 	@import url("@/static/base_css.css");
-	
+	.wrap{
+		 height: 101%;
+	}
    swiper {
 		position: relative;
 		top: 3vh;
@@ -176,7 +183,7 @@
 		margin: 4% 3%;
 		padding: 0 0 8%;
 		width: 94%;
-		height: 52vh;
+		//height: 52vh;
 		overflow-y: auto;
 
 		.nav-item {
diff --git a/subpkg/message/message.vue b/subpkg/message/message.vue
index 4be6f3b..e9a2abf 100644
--- a/subpkg/message/message.vue
+++ b/subpkg/message/message.vue
@@ -72,7 +72,9 @@
 
 <style lang="scss">
  @import url("@/static/base_css.css");
-
+ .wrap{
+	 height: 101%;
+ }
  .artlist {
      margin: 2% 0 3.5%;
      padding: 4% 3%;