Merge branch 'sqy_dev' into 'main'

'fix:固定滚动'

See merge request huang/thingskit-app!49

@@ -32,8 +32,8 @@
 			</view>
 			</view>
 		</mescroll-body>
 		</mescroll-body>
 		<!-- 告警筛选 -->
 		<!-- 告警筛选 -->
-		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20">
-			<view class="filter">
+		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20"  @touchmove.stop.prevent="disabledScroll">
+			<view class="filter"  @touchmove.stop.prevent="disabledScroll">
 				<view class="filter-title"><text>筛选条件</text></view>
 				<view class="filter-title"><text>筛选条件</text></view>
 				<FilterItem :filterList="issueStatus" title="下发状态" @clickTag="currentIndex => handleClickTag(currentIndex, issueStatus)"></FilterItem>
 				<FilterItem :filterList="issueStatus" title="下发状态" @clickTag="currentIndex => handleClickTag(currentIndex, issueStatus)"></FilterItem>
 				<view class="button-group">
 				<view class="button-group">
@@ -118,6 +118,9 @@ export default {
 		format(date) {
 		format(date) {
 			return formatToDate(date, 'YYYY-MM-DD HH:mm:ss');
 			return formatToDate(date, 'YYYY-MM-DD HH:mm:ss');
 		},
 		},
+		disabledScroll(){
+			return;
+		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {
 		upCallback() {
 			//联网加载数据
 			//联网加载数据
@@ -289,4 +292,4 @@ export default {
 		}
 		}
 	}
 	}
 }
 }
-</style>
+</style>

@@ -36,7 +36,8 @@
 		{
 		{
 			"path": "pages/personal/personal",
 			"path": "pages/personal/personal",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "个人中心"
+				"navigationBarTitleText": "个人中心",
+				"disableScroll": true
 			}
 			}
 		},
 		},
 		{
 		{
@@ -181,4 +182,4 @@
 			}
 			}
 		]
 		]
 	}
 	}
-}
+}