diff --git a/app.json b/app.json index 940785d..f68c839 100644 --- a/app.json +++ b/app.json @@ -11,7 +11,12 @@ "pages/topics/common/message/index", "pages/topics/common/goodIdea/index", "pages/article/index", - "pages/billboards/policy/policy-list/index" + "pages/billboards/policy/policy-list/index", + "pages/user/common/myActivity/index", + "pages/user/common/myFavorite/index", + "pages/user/common/myIdea/index", + "pages/user/common/myMessage/index", + "pages/user/common/myTopics/index" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/topics/common/goodIdea/cell/images/praise.png b/pages/topics/common/goodIdea/cell/images/praise.png new file mode 100755 index 0000000..35cf62b Binary files /dev/null and b/pages/topics/common/goodIdea/cell/images/praise.png differ diff --git a/pages/topics/common/goodIdea/cell/index.js b/pages/topics/common/goodIdea/cell/index.js index 0eb6393..07c4608 100644 --- a/pages/topics/common/goodIdea/cell/index.js +++ b/pages/topics/common/goodIdea/cell/index.js @@ -4,15 +4,16 @@ Component({ * 组件的属性列表 */ properties: { - ideaId: String, - articleImg: String, - userIcon: String, - userName: String, - time: String, - isGoodIdea:Number, - detail:{ - type: Object - } + // ideaId: String, + // articleImg: String, + // userIcon: String, + // userName: String, + // time: String, + // isGoodIdea:Number, + // detail:{ + // type: Object + // } + itemData:Object }, /** diff --git a/pages/topics/common/goodIdea/cell/index.wxml b/pages/topics/common/goodIdea/cell/index.wxml index f8a1110..b88ad9a 100644 --- a/pages/topics/common/goodIdea/cell/index.wxml +++ b/pages/topics/common/goodIdea/cell/index.wxml @@ -1,37 +1,43 @@ - + - {{userName}} - 刚刚 - - + + {{itemData.userName}} + {{itemData.time}} + + + + + + {{itemData.praiseNum}} + + + 评论内容 - {{detail.title}} + {{itemData.detail.title}} - - - - + + + + + {{itemData.detail.userName}} + {{itemData.detail.time}} - {{detail.userName}} - {{detail.time}} - - - - - + + + + + {{itemData.detail.commentNum}} - {{detail.commentNum}} - {{detail.text}} - + {{itemData.detail.text}} diff --git a/pages/topics/common/goodIdea/cell/index.wxss b/pages/topics/common/goodIdea/cell/index.wxss index 3e00807..f3016ca 100644 --- a/pages/topics/common/goodIdea/cell/index.wxss +++ b/pages/topics/common/goodIdea/cell/index.wxss @@ -8,7 +8,7 @@ width: 20px; height: 20px; border-radius: 50%; - background-color: red; + background-color: #EEEEEE; } .content-right{ width: 100%; @@ -17,11 +17,30 @@ padding: 0 10px 0 10px; } .userInfo{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + padding: 0 0 5px 0; +} +.userInfo-left{ + display: flex; + flex-direction: row; + align-items: center; + padding: 0 0 5px 0; +} +.userInfo-right{ display: flex; flex-direction: row; align-items: center; padding: 0 0 5px 0; } +.praise-icon{ + width: 15px; + height: 15px; + line-height: 10px; + margin-left: 5px; +} .userName{ color: #66708B; font-size: 14px; @@ -38,30 +57,30 @@ color: #D4D4D4; } .detail{ - height: 200px; border-radius: 10px; background-color: #F8F8F8; + padding: 10px; } .detail-title{ - padding: 10px; + /* padding: 10px 10px 5px 10px; */ } .detail-userInfo{ display: flex; - flex: row; + flex-direction: row; justify-content: space-between; - padding: 10px; + padding: 5px 0 10px 0; } .detail-userInfo-left{ display: flex; - flex: row; + flex-direction: row; align-items: center; } .detail-user-icon{ width: 20px; height: 20px; border-radius: 50%; - background-color: red; + background-color: #EEEEEE; } .detail-userName{ margin: 0 5px 0 5px; @@ -86,11 +105,13 @@ border-radius: 5px; background-color: red; } -.detail-commentNum{ +.detail-commentNum, +.praiseNum{ font-size: 12px; color: #3B3B3B; } .detail-text{ color: #373737; - + font-size: 13px; + /* padding: 0 10px 0 10px; */ } \ No newline at end of file diff --git a/pages/topics/common/goodIdea/index.js b/pages/topics/common/goodIdea/index.js index 8140502..58bf3c8 100644 --- a/pages/topics/common/goodIdea/index.js +++ b/pages/topics/common/goodIdea/index.js @@ -12,6 +12,7 @@ Page({ userName: "用户名", time: "刚刚", isGoodIdea:1, + praiseNum:"30", detail:{ title:"习近平主持政治局第十七次集体... 拷贝", userIcon:"", @@ -27,6 +28,7 @@ Page({ userName: "用户名", time: "1分钟前", isGoodIdea: 0, + praiseNum: "30", detail: { title: "习近平主持政治局第十七次集体... 拷贝", userIcon: "", diff --git a/pages/topics/common/goodIdea/index.wxml b/pages/topics/common/goodIdea/index.wxml index 6736ea7..2ab206e 100644 --- a/pages/topics/common/goodIdea/index.wxml +++ b/pages/topics/common/goodIdea/index.wxml @@ -2,12 +2,7 @@ diff --git a/pages/topics/common/interactive/cell/index.wxss b/pages/topics/common/interactive/cell/index.wxss index ebfb3e9..a0f70b8 100644 --- a/pages/topics/common/interactive/cell/index.wxss +++ b/pages/topics/common/interactive/cell/index.wxss @@ -30,7 +30,7 @@ width: 20px; height: 20px; border-radius: 50%; - background-color: red; + background-color: #EEEEEE; } .userName{ margin: 0 5px 0 5px; diff --git a/pages/topics/index.wxml b/pages/topics/index.wxml index a634b86..bcd070e 100644 --- a/pages/topics/index.wxml +++ b/pages/topics/index.wxml @@ -1,9 +1,7 @@ - - - - - - - + + + + +