Showing
1 changed file
with
28 additions
and
8 deletions
... | ... | @@ -18,9 +18,9 @@ |
18 | 18 | <text class="text-bottom">{{ item.sysNotice.createTime }}</text> |
19 | 19 | </view> |
20 | 20 | </view> |
21 | - <view class="item-right u-flex" style="justify-content: space-between;margin-right: ;"> | |
21 | + <view class="item-right u-flex" style="justify-content: space-between;"> | |
22 | 22 | <text class="text">{{ formatType(item.sysNotice) }}</text> |
23 | - <u-badge v-if="item.readStatus == '0'" numberType="overflow" isDot /> | |
23 | + <u-badge style="margin-right: 10rpx;" v-if="item.readStatus == '0'" numberType="overflow" isDot /> | |
24 | 24 | </view> |
25 | 25 | </view> |
26 | 26 | </view> |
... | ... | @@ -69,7 +69,8 @@ export default { |
69 | 69 | auto: false //是否在初始化后,自动执行downCallback; 默认true |
70 | 70 | }, |
71 | 71 | list: [], |
72 | - pre: false | |
72 | + pre: false, | |
73 | + isJudgeNextPage: '' | |
73 | 74 | }; |
74 | 75 | }, |
75 | 76 | onLoad(e) { |
... | ... | @@ -96,9 +97,18 @@ export default { |
96 | 97 | uni.hideKeyboard(); |
97 | 98 | }, |
98 | 99 | typeSelect(e) { |
99 | - this.page.num = 0; | |
100 | + this.topBack(); | |
101 | + this.isJudgeNextPage = e.value; | |
102 | + this.page.num = 1; | |
100 | 103 | this.model1.userInfo.type = e.name; |
101 | - this.loadData(1, e.value == '' ? null : e.value); | |
104 | + this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage); | |
105 | + }, | |
106 | + //筛选数据让它回到顶部 | |
107 | + topBack() { | |
108 | + uni.pageScrollTo({ | |
109 | + scrollTop: 0, // 滚动到页面的目标位置 这个是滚动到顶部, 0 | |
110 | + duration: 300 // 滚动动画的时长 | |
111 | + }); | |
102 | 112 | }, |
103 | 113 | /*下拉刷新的回调 */ |
104 | 114 | downCallback() { |
... | ... | @@ -109,9 +119,15 @@ export default { |
109 | 119 | }, |
110 | 120 | /*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */ |
111 | 121 | upCallback() { |
112 | - //联网加载数据 | |
113 | - this.page.num += 1; | |
114 | - this.loadData(this.page.num); | |
122 | + if (this.isJudgeNextPage != '') { | |
123 | + //联网加载数据 | |
124 | + this.page.num += 1; | |
125 | + this.loadData(this.page.num, this.isJudgeNextPage); | |
126 | + } else { | |
127 | + //联网加载数据 | |
128 | + this.page.num += 1; | |
129 | + this.loadData(this.page.num); | |
130 | + } | |
115 | 131 | }, |
116 | 132 | |
117 | 133 | loadData(pageNo, t) { |
... | ... | @@ -153,4 +169,8 @@ export default { |
153 | 169 | |
154 | 170 | <style lang="scss" scoped> |
155 | 171 | @import './static/systemNotify.scss'; |
172 | +/deep/ .u-badge--error { | |
173 | + position: relative; | |
174 | + right: 11rpx; | |
175 | +} | |
156 | 176 | </style> | ... | ... |