From 87ed4686a08679b3bf03ebdec4a66386c28a2610 Mon Sep 17 00:00:00 2001 From: fanp Date: Wed, 6 Nov 2019 15:03:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20topic=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=82=B9=E8=B5=9E=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/topic/un_zan.png | Bin 0 -> 4238 bytes images/topic/zan.png | Bin 0 -> 4366 bytes pages/topics/goodIdea/cell/index.js | 4 ++-- pages/topics/goodIdea/cell/index.wxml | 6 ++---- pages/topics/goodIdea/cell/index.wxss | 9 +++------ pages/topics/index.js | 8 +++----- pages/topics/interactive/topicArticle/index.js | 10 +++++----- pages/topics/interactive/topicArticle/index.wxml | 2 +- pages/user/myIdea/index.js | 7 +++---- 9 files changed, 19 insertions(+), 27 deletions(-) create mode 100644 images/topic/un_zan.png create mode 100644 images/topic/zan.png diff --git a/images/topic/un_zan.png b/images/topic/un_zan.png new file mode 100644 index 0000000000000000000000000000000000000000..c01eec1233561f4e2f41ed9056efba6878e9fa7d GIT binary patch literal 4238 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 literal 0 HcmV?d00001 diff --git a/images/topic/zan.png b/images/topic/zan.png new file mode 100644 index 0000000000000000000000000000000000000000..d4f077d1fbf4e02e850a3ee77a64a925a23c81b6 GIT binary patch literal 4366 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 literal 0 HcmV?d00001 diff --git a/pages/topics/goodIdea/cell/index.js b/pages/topics/goodIdea/cell/index.js index fb7bb6d..4defef6 100644 --- a/pages/topics/goodIdea/cell/index.js +++ b/pages/topics/goodIdea/cell/index.js @@ -18,8 +18,8 @@ Component({ * 组件的初始数据 */ data: { - unPraise: '/images/common/zan.png', - praise: '/images/common/star_light.png', + unPraise: '/images/topic/un_zan.png', + praise: '/images/topic/zan.png', isTouchMove:false, startX: 0, //开始坐标 startY: 0 diff --git a/pages/topics/goodIdea/cell/index.wxml b/pages/topics/goodIdea/cell/index.wxml index 181f581..34ac7ba 100644 --- a/pages/topics/goodIdea/cell/index.wxml +++ b/pages/topics/goodIdea/cell/index.wxml @@ -3,7 +3,7 @@ - + @@ -13,9 +13,7 @@ {{itemData.praiseNum}} - - - + {{itemData.comment}} diff --git a/pages/topics/goodIdea/cell/index.wxss b/pages/topics/goodIdea/cell/index.wxss index 6445a96..1c1735f 100644 --- a/pages/topics/goodIdea/cell/index.wxss +++ b/pages/topics/goodIdea/cell/index.wxss @@ -5,10 +5,8 @@ padding: 10px; */ } .content-left{ - width: 20px; - height: 20px; - border-radius: 50%; - background-color: #EEEEEE; + width: 30px; + height: 30px; } .content-right{ width: 100%; @@ -40,10 +38,9 @@ image{ height: 100%; } .praise-icon{ + margin-left: 5px; width: 15px; height: 15px; - line-height: 10px; - margin-left: 5px; } .userName{ color: #66708B; diff --git a/pages/topics/index.js b/pages/topics/index.js index 3bc3f69..f1c6208 100644 --- a/pages/topics/index.js +++ b/pages/topics/index.js @@ -136,6 +136,7 @@ Page({ commentTime: item.createTime, comment: item.comment, praiseNum: item.supportNum, + isSupport: item.isSupport, // 议题数据 topicTtitle: item.title, topicGroupAvator: item.groupAvator, @@ -288,13 +289,10 @@ Page({ this.fetchGoodIdeaPraise(e.detail.commentId) }, fetchGoodIdeaPraise(id) { + wx.showLoading() topicModel.topicCommentPraise(id, res => { - console.log(res) if (res.code === 200) { - wx.showToast({ - title: res.message, - icon: 'none' - }) + wx.hideLoading() this.onPullDownRefresh() } }) diff --git a/pages/topics/interactive/topicArticle/index.js b/pages/topics/interactive/topicArticle/index.js index 72df954..8a835a6 100644 --- a/pages/topics/interactive/topicArticle/index.js +++ b/pages/topics/interactive/topicArticle/index.js @@ -29,7 +29,8 @@ Page({ isCollect:Number, currPage: 1, commentList: [], - praise: '/images/common/zan.png', + unPraise: '/images/topic/un_zan.png', + praise: '/images/topic/zan.png', hiddenmodalput:true, currentComment:'', @@ -95,6 +96,7 @@ Page({ detail: item.comment, time: item.createTime, praiseNum: item.supportNum, + isSupport: item.isSupport, isTouchMove:false, }) }) @@ -152,12 +154,10 @@ Page({ }, fetchTopicCommentPraise(commentId){ + wx.showLoading() topicModel.topicCommentPraise(commentId,res =>{ if (res.code === 200) { - wx.showToast({ - title: res.message, - icon: 'none' - }) + wx.hideLoading() this.fetchDetailComment() } }) diff --git a/pages/topics/interactive/topicArticle/index.wxml b/pages/topics/interactive/topicArticle/index.wxml index 1ac41ac..c07ba0c 100644 --- a/pages/topics/interactive/topicArticle/index.wxml +++ b/pages/topics/interactive/topicArticle/index.wxml @@ -62,7 +62,7 @@ {{item.time}} {{item.praiseNum}} - + diff --git a/pages/user/myIdea/index.js b/pages/user/myIdea/index.js index 0c5d516..5c97030 100644 --- a/pages/user/myIdea/index.js +++ b/pages/user/myIdea/index.js @@ -47,6 +47,7 @@ Page({ commentTime: item.createTime, comment: item.comment, praiseNum: item.supportNum, + isSupport: item.isSupport, // 议题数据 topicTtitle: item.title, topicGroupAvator: item.groupAvator, @@ -116,13 +117,11 @@ Page({ this.fetchGoodIdeaPraise(itemData.commentId) }, fetchGoodIdeaPraise(id) { + wx.showLoading() topicModel.topicCommentPraise(id, res => { console.log(res) if (res.code === 200) { - wx.showToast({ - title: res.message, - icon: 'none' - }) + wx.hideLoading() this.onPullDownRefresh() } }) From f0c75eba3910e8aa84cc984932003304a78536cf Mon Sep 17 00:00:00 2001 From: fanp Date: Fri, 8 Nov 2019 10:28:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/user.js | 22 ++++++++++++++++++++-- pages/user/index.js | 12 ++++++------ pages/user/myInfo/index.js | 20 ++++++++++---------- pages/user/myInfo/index.wxml | 4 ++-- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/models/user.js b/models/user.js index 0d9aa52..97ba995 100644 --- a/models/user.js +++ b/models/user.js @@ -8,7 +8,8 @@ const UserConst = { user_myTopics_url:'/api/group/groupByUser', // 我的议题 user_myActivity_url:'/api/activity/activityList', // 我的活动 - user_updateUserInfo_url:'/api/miniuser/updateMiniUser' // 更新用户信息 + user_updateUserInfo_url:'/api/miniuser/updateMiniUser', // 更新用户信息 + user_sendUserInfo_url:'/api/miniuser/updateUserInfo' // 上传用户信息 } class UserModel extends HTTP { constructor () { @@ -43,7 +44,24 @@ class UserModel extends HTTP { this.request(params) } - + sendUserInfo(weChatInfo,success){ + let params = { + url: UserConst.user_sendUserInfo_url, + method: Method.POST, + data: { + avatarUrl: weChatInfo.avatarUrl, + city: weChatInfo.city, + country: weChatInfo.country, + gender: weChatInfo.gender, + nickName: weChatInfo.nickName, + province: weChatInfo.province + }, + success: success + } + this.request(params) + } + + getMyMessageList(page, success){ let params = { url: UserConst.user_myMessage_url, diff --git a/pages/user/index.js b/pages/user/index.js index 9de82a3..80e8c65 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -44,19 +44,19 @@ Page({ if (e.detail.userInfo){ let avatarUrl = e.detail.userInfo.avatarUrl let nickName = e.detail.userInfo.nickName - - this.updateUserInfo(avatarUrl,nickName) + this.sendUserInfo(e.detail.userInfo) } }, - // 将用户信息发送服务器 - updateUserInfo (avatarUrl, nickName) { - userModel.updateUserInfo(avatarUrl, nickName, res => { - if(res.code === 200){ + // 上传用户信息 + sendUserInfo(weChatInfo){ + userModel.sendUserInfo(weChatInfo, res => { + if (res.code === 200) { this.getUserInfo() } }) }, + // 获取用户信息 getUserInfo () { userModel.getUserInfo(res => { diff --git a/pages/user/myInfo/index.js b/pages/user/myInfo/index.js index 6026688..a2af991 100644 --- a/pages/user/myInfo/index.js +++ b/pages/user/myInfo/index.js @@ -79,16 +79,16 @@ Page({ // phone: e.detail.value // }) // }, - bindCompanyInput(e) { - this.setData({ - company: e.detail.value - }) - }, - bindPositionInput(e) { - this.setData({ - position: e.detail.value - }) - }, + // bindCompanyInput(e) { + // this.setData({ + // company: e.detail.value + // }) + // }, + // bindPositionInput(e) { + // this.setData({ + // position: e.detail.value + // }) + // }, submit(){ userModel.updateUserInfo(this.data, res => { if(res.code === 200){ diff --git a/pages/user/myInfo/index.wxml b/pages/user/myInfo/index.wxml index 5bb46cb..fe10cb1 100644 --- a/pages/user/myInfo/index.wxml +++ b/pages/user/myInfo/index.wxml @@ -27,14 +27,14 @@ title="工作单位" ext-class="cell-item"> - + - +