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 @@ - + + + {{ item.title }} + diff --git a/pages/pbService/activity/index.wxss b/pages/pbService/activity/index.wxss index 6835de1..29de696 100644 --- a/pages/pbService/activity/index.wxss +++ b/pages/pbService/activity/index.wxss @@ -3,6 +3,9 @@ display: block; width: 100%; } +.list{ + margin-top: 90rpx; +} .item { margin: 40rpx 27rpx; position: relative; @@ -40,4 +43,29 @@ page { margin-bottom: 6rpx; font-size: 33rpx; font-weight: 600; -} \ No newline at end of file +} + + +.nav-box { + background-color: #7D726B; + margin: -90rpx 26rpx 0; + height: 84rpx; + border-radius: 10rpx; + display: flex; + align-items: center; +} + +.nav-box .nav-item { + color: #FFFFFF; + font-size: 50rpx; + width: 341rpx; + text-align: center; + font-size: 34rpx; +} + +.nav-box .nav-item.active { + height: 100rpx; + line-height: 76rpx; + margin-bottom: -20rpx; + background-image: url("https://static.ticket.sz-trip.com/activity/WonderfulReview/select.png"); +} diff --git a/project.private.config.json b/project.private.config.json index 0d52fa7..60c483a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -13,8 +13,8 @@ "miniprogram": { "list": [ { - "name": "特产4407", - "pathName": "pages/info/postProductInfo/index", + "name": "精彩回顾", + "pathName": "pages/pbService/activity/index", "query": "id=4407", "scene": null },