From 1b3113ba2e584e5c1318c5b53da43ccc70a10c47 Mon Sep 17 00:00:00 2001 From: Meimei Date: Thu, 10 Oct 2019 11:04:41 +0800 Subject: [PATCH] update topics --- app.json | 7 ++- .../common/goodIdea/cell/images/praise.png | Bin 0 -> 1564 bytes pages/topics/common/goodIdea/cell/index.js | 19 ++++---- pages/topics/common/goodIdea/cell/index.wxml | 46 ++++++++++-------- pages/topics/common/goodIdea/cell/index.wxss | 39 +++++++++++---- pages/topics/common/goodIdea/index.js | 2 + pages/topics/common/goodIdea/index.wxml | 7 +-- .../topics/common/interactive/cell/index.wxss | 2 +- pages/topics/index.wxml | 12 ++--- 9 files changed, 81 insertions(+), 53 deletions(-) create mode 100755 pages/topics/common/goodIdea/cell/images/praise.png 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 0000000000000000000000000000000000000000..35cf62bd0dadce60fac9c440da6f538541e0a548 GIT binary patch literal 1564 zcmV+%2IKjOP)`Mk6u7$cqsPG0KaHNDPn= z9>hcwCB8@#)QI@tM=(;lGqX)wVj7~AK=}|2q$p_%rR*NFwc@gDcV^nz?tu3`?)=ZW z=ltg0yZ7F?GlUqI=H}*^i9}*05iJy<*?`;uAOYYcKnE-fAKA9uHWn$+SX2_Wj{W;P zCQg{pvl*b50E{bVPlQkV`}@~6G&GzGTTd8$>_D})woV@y$bJXNLm?9B6v-{oTAvJI z6G|E@P%SMjU#Ajz`XKi=)xf1}UkHmh+CTm&rpl#bfkHSYu)7Z2q*L9x)==0GgD1r~P zR%=G8Vue!e|{8+Q$f#mjSRKn&jk3X8tM~U;lWC6R0x) zZi^;4*}}{lqVW|!P?!8Bm%$UKZ}KTO#xqkLiKqc!!B_e}sws&aCc?&|mdIxvrZ8s5#1{MBr(y zLhnG7i=paclC1%N$qbY`5mqauJ`N-fD5@GL&-1p6pdy=WfY{935|BY4Sye!Jp7*i{-U}3Ac+tSL zX;UZF)z$TfHyz$$%t1Mhw}uEi0a#HcQsAqFS=mwh9y3sljg5&}vu3|dgh&V35W#1bUOWjWhFiYkn#(t8rMZ|(6X>WDK+eT zuA-nanaq76vQ7jq4n5(m28W<^3P4-Bx{kiFV#SJVvC$wX5ux_>_Q{18>+9?P3|d28 z*VNQBsivl8G7;SiSQ?Ng;@X1BWV4K!zePOKRx|wc3rVf+9F=jQV@S5j&3q|m4blbM^L`Q^$N~s_J zjgDN`lX9UJ@9Vg3=1?VO)A7S4E;H*9fpT5+NJ#Yexjiah$t|to&K<8@>=>tx_ugv}mw|>UwQ$ZBs5? z8mQ>YIdQoIB36Ue3z`flpF1Lwo2<1yZ$Om=C0)!syHH}fUTI)^nbk4_%6A~7P0aR2 z1ImBtvPvnn+ko<4y39)^lZOqc@}TvrA1f3#o+yB_fvRWiH-8N2gC^vx!Bi)FZ$8jq{;E z<(;{%m+!|<`Z~D^QI`nTms&|5JlJ}7P0i)E09gc3@v9+$ z>Lx<3hztZ0k4iKM<1`UGBHGu})AK{|?qv}76@9xZNC4N1#()ZVr~U@(atL_5pO@+Y O0000 - + - {{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 @@ - - - - - - - + + + + +