Commit 42bfc130c58d9702c6d16d18ff449ac86979e178
1 parent
ec141d0b
加载优化~
Showing
3 changed files
with
31 additions
and
20 deletions
src/main.js
src/pages/discountList/discountList.less
| ... | ... | @@ -146,11 +146,19 @@ |
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | - /deep/ .van-list__loading-text { | |
| 150 | - margin-bottom: 30px; | |
| 151 | - color: #333333; | |
| 152 | - font-size: 28px; | |
| 153 | - font-weight: 400; | |
| 149 | + /deep/ .van-list__loading { | |
| 150 | + .van-loading { | |
| 151 | + .van-loading__spinner { | |
| 152 | + width: 28px !important; | |
| 153 | + height: 28px !important; | |
| 154 | + } | |
| 155 | + .van-list__loading-text { | |
| 156 | + margin-bottom: 30px; | |
| 157 | + color: #333333; | |
| 158 | + font-size: 28px; | |
| 159 | + font-weight: 400; | |
| 160 | + } | |
| 161 | + } | |
| 154 | 162 | } |
| 155 | 163 | /deep/ .van-list__finished-text { |
| 156 | 164 | margin-bottom: 30px; | ... | ... |
src/pages/discountList/discountList.vue
| ... | ... | @@ -345,28 +345,31 @@ |
| 345 | 345 | this.$set(this.lists, 0, datas.list); |
| 346 | 346 | |
| 347 | 347 | // 设置其它tab数据 |
| 348 | - if (this.tabs.first === true && datas.nav && datas.nav.length) { | |
| 349 | - | |
| 350 | - // 合并数组 | |
| 351 | - this.$set(this.tabs, 'list', [...this.tabs.list, ...datas.nav]); | |
| 348 | + if (this.tabs.first === true) { | |
| 352 | 349 | |
| 353 | 350 | // 首页取消上拉加载 |
| 354 | 351 | this.$set(this.tabs.list[0], 'loading', false); |
| 355 | 352 | this.$set(this.tabs.list[0], 'loadingNow', false); |
| 356 | 353 | this.$set(this.tabs.list[0], 'finished', true); |
| 357 | 354 | |
| 358 | - // 单独设置标题颜色/起始页码/加载中控制 | |
| 359 | - for (let i = 1; i < this.tabs.list.length; i++) { | |
| 360 | - this.$set(this.tabs.list[i], 'titleColor', this.tabs.list[i].color); | |
| 361 | - this.$set(this.tabs.list[i], 'page', 1); | |
| 362 | - this.$set(this.tabs.list[i], 'loading', false); | |
| 363 | - this.$set(this.tabs.list[i], 'loadingNow', false); | |
| 364 | - this.$set(this.tabs.list[i], 'finished', false); | |
| 355 | + if (datas.nav && datas.nav.length) { | |
| 356 | + | |
| 357 | + // 合并数组 | |
| 358 | + this.$set(this.tabs, 'list', [...this.tabs.list, ...datas.nav]); | |
| 359 | + | |
| 360 | + // 单独设置标题颜色/起始页码/加载中控制 | |
| 361 | + for (let i = 1; i < this.tabs.list.length; i++) { | |
| 362 | + this.$set(this.tabs.list[i], 'titleColor', this.tabs.list[i].color); | |
| 363 | + this.$set(this.tabs.list[i], 'page', 1); | |
| 364 | + this.$set(this.tabs.list[i], 'loading', false); | |
| 365 | + this.$set(this.tabs.list[i], 'loadingNow', false); | |
| 366 | + this.$set(this.tabs.list[i], 'finished', false); | |
| 367 | + } | |
| 365 | 368 | } |
| 366 | - } | |
| 367 | 369 | |
| 368 | - // 设置非第一次请求接口 | |
| 369 | - this.$set(this.tabs, 'first', false); | |
| 370 | + // 设置非第一次请求接口 | |
| 371 | + this.$set(this.tabs, 'first', false); | |
| 372 | + } | |
| 370 | 373 | |
| 371 | 374 | /* 获取折扣专区列表数据 结束 */ |
| 372 | 375 | ... | ... |