fix:DEFECT-365修改通知筛选后数据显示不完全问题

@@ -18,9 +18,9 @@
 								<text class="text-bottom">{{ item.sysNotice.createTime }}</text>
 								<text class="text-bottom">{{ item.sysNotice.createTime }}</text>
 							</view>
 							</view>
 						</view>
 						</view>
-						<view class="item-right u-flex" style="justify-content: space-between;margin-right: ;">
+						<view class="item-right u-flex" style="justify-content: space-between;">
 							<text class="text">{{ formatType(item.sysNotice) }}</text>
 							<text class="text">{{ formatType(item.sysNotice) }}</text>
-							<u-badge v-if="item.readStatus == '0'" numberType="overflow" isDot />
+							<u-badge style="margin-right: 10rpx;" v-if="item.readStatus == '0'" numberType="overflow" isDot />
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
@@ -69,7 +69,8 @@ export default {
 				auto: false //是否在初始化后,自动执行downCallback; 默认true
 				auto: false //是否在初始化后,自动执行downCallback; 默认true
 			},
 			},
 			list: [],
 			list: [],
-			pre: false
+			pre: false,
+			isJudgeNextPage: ''
 		};
 		};
 	},
 	},
 	onLoad(e) {
 	onLoad(e) {
@@ -96,9 +97,18 @@ export default {
 			uni.hideKeyboard();
 			uni.hideKeyboard();
 		},
 		},
 		typeSelect(e) {
 		typeSelect(e) {
-			this.page.num = 0;
+			this.topBack();
+			this.isJudgeNextPage = e.value;
+			this.page.num = 1;
 			this.model1.userInfo.type = e.name;
 			this.model1.userInfo.type = e.name;
-			this.loadData(1, e.value == '' ? null : e.value);
+			this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
+		},
+		//筛选数据让它回到顶部
+		topBack() {
+			uni.pageScrollTo({
+				scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
+				duration: 300 // 滚动动画的时长
+			});
 		},
 		},
 		/*下拉刷新的回调 */
 		/*下拉刷新的回调 */
 		downCallback() {
 		downCallback() {
@@ -109,9 +119,15 @@ export default {
 		},
 		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {
 		upCallback() {
-			//联网加载数据
-			this.page.num += 1;
-			this.loadData(this.page.num);
+			if (this.isJudgeNextPage != '') {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num, this.isJudgeNextPage);
+			} else {
+				//联网加载数据
+				this.page.num += 1;
+				this.loadData(this.page.num);
+			}
 		},
 		},
 
 
 		loadData(pageNo, t) {
 		loadData(pageNo, t) {
@@ -153,4 +169,8 @@ export default {
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 @import './static/systemNotify.scss';
 @import './static/systemNotify.scss';
+/deep/ .u-badge--error {
+	position: relative;
+	right: 11rpx;
+}
 </style>
 </style>