diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 9aab4de..405cc28 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = '1.4.8' + const versionNum = '1.4.9' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/project.config.json b/project.config.json index ac2726b..00f0fe9 100644 --- a/project.config.json +++ b/project.config.json @@ -101,6 +101,13 @@ "pathName": "pages/complete/complete", "query": "", "scene": null + }, + { + "id": -1, + "name": "subpages/associationNew/pages/eventlist/eventlist", + "pathName": "subpages/associationNew/pages/eventlist/eventlist", + "query": "partyGroupId=4048a5a044a047d9a3dc135a0d756eee&topicType=1", + "scene": null } ] } diff --git a/subpages/associationNew/images/comment_ic.png b/subpages/associationNew/images/comment_ic.png new file mode 100644 index 0000000..126ed18 Binary files /dev/null and b/subpages/associationNew/images/comment_ic.png differ diff --git a/subpages/associationNew/pages/eventlist/eventlist.js b/subpages/associationNew/pages/eventlist/eventlist.js index 898055d..9f86c76 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.js +++ b/subpages/associationNew/pages/eventlist/eventlist.js @@ -28,6 +28,7 @@ Page({ infoCompleted: 0, completeInfoDialogVisible: false, ifpreviewImage:false,//解决图片放大刷新列表的问题 + commentViewContent: '捧个场' // 写评论按钮 文字内容 }, /** * 生命周期函数--监听页面加载 @@ -36,7 +37,8 @@ Page({ this.setData({ partyGroupId: options.partyGroupId, topicType: options.topicType,//0:事好儿鼓个掌 1:话对捧个场 - infoCompleted: app.globalData.infoCompleted + infoCompleted: app.globalData.infoCompleted, + commentViewContent: options.topicType == 0 ? '鼓个掌' : '捧个场' }) if (options.topicType == 0) { wx.setNavigationBarTitle({ diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml index f34c37f..bbf0591 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxml +++ b/subpages/associationNew/pages/eventlist/eventlist.wxml @@ -32,8 +32,12 @@ {{item.commentNum}} - - + + + + + {{commentViewContent}} + diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss index af6c9ed..2e15ff0 100644 --- a/subpages/associationNew/pages/eventlist/eventlist.wxss +++ b/subpages/associationNew/pages/eventlist/eventlist.wxss @@ -114,13 +114,24 @@ page { margin-left: 9rpx; /* width: 196rpx; */ } - +.attitude .all .give-data-s .comment_ic { + width: 30rpx; + height: 30rpx; + margin-right: 10rpx; +} .attitude .all .give-data-s { - font-size: 28rpx; - font-weight: 500; - color: rgba(51, 51, 51, 1); - margin-left: 9rpx; - /* width: 196rpx; */ + width: 145rpx; + height: 55rpx; + background: linear-gradient(to right, #f2511b, #ee7a20); + border-radius: 27rpx; + overflow: hidden; + color: #fff; + line-height: 55rpx; + text-align: center; + font-size: 24rpx; + display: flex; + align-items: center; + justify-content: center; } .attitude .all .give-data-n.color {