diff --git a/app.js b/app.js index 1f16694..47a5d64 100644 --- a/app.js +++ b/app.js @@ -22,7 +22,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest25?true:false; + data.isTest = data.isTest26?true:false; this.globalData.configJson = data }) diff --git a/app.wxss b/app.wxss index 48fc08d..960acbe 100644 --- a/app.wxss +++ b/app.wxss @@ -131,4 +131,10 @@ page{ .com-flex { display: flex; align-items: center; +} + +.com-bac { + background-size: 100% 100%; + background-repeat: no-repeat; + margin: 0 auto; } \ No newline at end of file diff --git a/pages/pbService/activity/index.js b/pages/pbService/activity/index.js index 544c647..8cd4c6e 100644 --- a/pages/pbService/activity/index.js +++ b/pages/pbService/activity/index.js @@ -9,7 +9,9 @@ Page({ data: { list:[], page:1, - total:1 + total:1, + navList: [{title: '精彩2022', year: 2022}, {title: '回顾2021', year: 2021}], + navIndex: 0 }, /** @@ -18,11 +20,20 @@ Page({ onLoad: function (options) { this.getList() }, + onReload(e){ + this.setData({ + page:0, + list:[], + navIndex:e.currentTarget.dataset.index + }) + this.getList() + }, getList:function(){ if(this.data.list.length>=this.data.total) return; https._post("review/getList",{ limit:10, - page:this.data.page + page:this.data.page, + year: this.data.navList[this.data.navIndex].year }).then(res=>{ this.setData({ total:res.data.total, diff --git a/pages/pbService/activity/index.wxml b/pages/pbService/activity/index.wxml index ee45eca..3df0999 100644 --- a/pages/pbService/activity/index.wxml +++ b/pages/pbService/activity/index.wxml @@ -1,6 +1,9 @@