diff --git a/src/pages.json b/src/pages.json index e4725f5..b407129 100644 --- a/src/pages.json +++ b/src/pages.json @@ -3,7 +3,8 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "熊熊安装队" + "navigationBarTitleText": "熊熊安装队", + "enablePullDownRefresh": true } }, { @@ -21,13 +22,15 @@ { "path": "pages/service/cate", "style": { - "navigationBarTitleText": "分类" + "navigationBarTitleText": "分类", + "enablePullDownRefresh": true } }, { "path": "pages/service/list", "style": { - "navigationBarTitleText": "服务列表" + "navigationBarTitleText": "服务列表", + "enablePullDownRefresh": true } }, { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 4394643..97d7f74 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -120,31 +120,38 @@ export default { WidgetModal, }, onLoad() { - // 首页轮播 - this.$request({ - api: "index.banner", - }).then((response) => { - response.data.forEach((item) => { - this.bannerList.push({ - image: item.image, - }); - }); - }); - // 系统公告 - this.$models.system.notifyList().then((list) => { - this.notifyList = list; - }); - // 导航 - this.$models.system.navList().then((list) => { - this.installServiceList = list.install; - this.aftermarketServiceList = list.aftermarket; - }); + this.initPage(); }, onShow() {}, onReady() {}, onReachBottom() {}, - onPullDownRefresh() {}, + onPullDownRefresh() { + this.initPage(); + uni.stopPullDownRefresh(); + }, methods: { + initPage() { + this.bannerList = []; + // 首页轮播 + this.$request({ + api: "index.banner", + }).then((response) => { + response.data.forEach((item) => { + this.bannerList.push({ + image: item.image, + }); + }); + }); + // 系统公告 + this.$models.system.notifyList().then((list) => { + this.notifyList = list; + }); + // 导航 + this.$models.system.navList().then((list) => { + this.installServiceList = list.install; + this.aftermarketServiceList = list.aftermarket; + }); + }, /** * 跳转 */ diff --git a/src/pages/service/cate.vue b/src/pages/service/cate.vue index e03d6cd..815ea49 100644 --- a/src/pages/service/cate.vue +++ b/src/pages/service/cate.vue @@ -80,14 +80,7 @@ export default { x: x - this.$utils.rpx2px(20), y: y - this.$utils.rpx2px(40), }; - // 加载分类 - this.data.push({ - id: 0, - name: "热门推荐", - cover: "", - child: await this.hotCate(), - }); - this.loadCate(); + this.initPage(); }, onShow() { this.newId = this.currentId = this.currentCateId; @@ -98,8 +91,22 @@ export default { this.$store.commit("system/currentCateId", this.newId); }, onReachBottom() {}, - onPullDownRefresh() {}, + onPullDownRefresh() { + this.initPage(); + uni.stopPullDownRefresh(); + }, methods: { + async initPage() { + this.data = []; + // 加载分类 + this.data.push({ + id: 0, + name: "热门推荐", + cover: "", + child: await this.hotCate(), + }); + this.loadCate(); + }, /** * 推荐 */ diff --git a/src/pages/service/list.vue b/src/pages/service/list.vue index f5c2e5b..afdee26 100644 --- a/src/pages/service/list.vue +++ b/src/pages/service/list.vue @@ -65,13 +65,20 @@ export default { return; } this.currentId = e.id; - this.loadList(e.id); + this.initPage(); }, onShow() {}, onReady() {}, onReachBottom() {}, - onPullDownRefresh() {}, + onPullDownRefresh() { + this.initPage(); + uni.stopPullDownRefresh(); + }, methods: { + initPage() { + this.data = []; + this.loadList(this.currentId); + }, /** * 加载列表 */