From cc088201a41a1e59823e026590e212b072202086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 09:08:27 +0800 Subject: [PATCH 01/11] 26544 --- src/apps/AppVillageDiscuss/userList.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/apps/AppVillageDiscuss/userList.vue b/src/apps/AppVillageDiscuss/userList.vue index 94097dac..bff787f3 100644 --- a/src/apps/AppVillageDiscuss/userList.vue +++ b/src/apps/AppVillageDiscuss/userList.vue @@ -77,7 +77,6 @@ uni-page-body { .datas { display: flex; - padding: 20px 32px 0 32px; .avatLeft { @@ -94,7 +93,7 @@ uni-page-body { } .right { border-bottom: 1px solid #ddd; - width: 100%; + width: calc(100% - 90px); margin: 10px 0 0 16px; padding-bottom: 32px; .top { From fde3708baaf1294f7e6314dd9629d0a968e05b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 09:18:06 +0800 Subject: [PATCH 02/11] 26541 --- src/apps/AppVillageDiscuss/AppVillageDiscuss.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue b/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue index 5de5f843..7796f346 100644 --- a/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue +++ b/src/apps/AppVillageDiscuss/AppVillageDiscuss.vue @@ -237,7 +237,7 @@ export default { width: 100%; .addresss { - .u-form-item__body { + ::v-deep .u-form-item__body { .u-form-item--right { .u-form-item--right__content { .u-form-item--right__content__slot { @@ -252,6 +252,11 @@ export default { } } } + .u-form-item--right__content__icon { + .u-icon { + margin-bottom: 8px !important; + } + } } } } From 2e1231376dcaf28465d1909626e5e99f0fa9c117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 09:33:11 +0800 Subject: [PATCH 03/11] 26396 --- src/apps/AppVillageDiscuss/Detail.vue | 35 +++++++++++++++------------ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index 6624cabd..4b7327ca 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -96,7 +96,8 @@
删除我的评论
删除
-
取消
+
+
取消
 @@ -637,26 +638,28 @@ export default { border-radius: 24px 24px 0px 0px; text-align: center; .hint { - padding-top: 40px; + padding: 40px 0 44px 0; + border-bottom: 1px solid #e7e8e9; + font-size: 24px; + color: #666666; font-size: 24px; color: #666666; } - div { - padding: 10px 0; - color: #666666; + .dele { + padding: 24px 0 28px 0; + font-size: 32px; + color: #c25450; + } + .liness { + height: 12px; + background: #f6f7f8; + } + .cancel { + padding: 24px 0 62px 0; + font-size: 32px; + color: #333333; } } } - - // ::v-deep .u-drawer { - // .u-drawer-content { - // .u-drawer__scroll-view { - // .uni-scroll-view { - // // overflow: hidden; - // overflow: inherit !important; - // } - // } - // } - // } } From cf8237de2e5bcb346a8ee5509c15a716dc7f02c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 10:04:14 +0800 Subject: [PATCH 04/11] 26546 eslint --- src/apps/AppVillageDiscuss/Detail.vue | 503 +++++++++++++------------- 1 file changed, 255 insertions(+), 248 deletions(-) diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index 4b7327ca..7829b195 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -1,78 +1,81 @@ @@ -31,19 +73,127 @@ export default { From ea4719a9871dd5345ffdc79d16b73dca0e939eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 10:45:17 +0800 Subject: [PATCH 08/11] 26548 --- src/apps/AppEpidemicSituation/AppEpidemicSituation.vue | 5 +---- src/apps/AppVillageDiscuss/Detail.vue | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue b/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue index 39e4042c..aff466ae 100644 --- a/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue +++ b/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue @@ -4,7 +4,6 @@
- @@ -20,10 +19,8 @@ export default { }, computed: {...mapState(['user'])}, onShow() { - }, methods: { - }, } @@ -44,6 +41,6 @@ export default { margin: -136px 30px 0; } } - + } diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue index 7829b195..cbc48b9d 100644 --- a/src/apps/AppVillageDiscuss/Detail.vue +++ b/src/apps/AppVillageDiscuss/Detail.vue @@ -97,7 +97,7 @@ -
删除我的评论
+
删除评论
删除
取消
From 9370a3ff2d23d15c3d396d39214beeb6123f6ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 11:33:17 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E7=9B=91=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEpidemicSituation.vue | 90 ++++----- src/apps/AppEpidemicSituation/Health.vue | 185 ++++++++++++++++++ 2 files changed, 230 insertions(+), 45 deletions(-) create mode 100644 src/apps/AppEpidemicSituation/Health.vue diff --git a/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue b/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue index 21685063..b1190459 100644 --- a/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue +++ b/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue @@ -1,7 +1,7 @@ From c9ffb97281130ac95cdcef49feaa750d84dde560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 11:43:53 +0800 Subject: [PATCH 10/11] template --- src/apps/AppEpidemicSituation/Health.vue | 43 ++++++++++++++++++++---- 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/src/apps/AppEpidemicSituation/Health.vue b/src/apps/AppEpidemicSituation/Health.vue index 50768645..6bc87def 100644 --- a/src/apps/AppEpidemicSituation/Health.vue +++ b/src/apps/AppEpidemicSituation/Health.vue @@ -36,6 +36,8 @@ +
+
@@ -49,8 +51,23 @@
+
+
+ +
+ + + +
@@ -80,6 +97,8 @@ export default { }, ], currentTabs: 0, + + data: [], } }, computed: { @@ -92,6 +111,8 @@ export default { }, onShow() {}, methods: { + goDetail() {}, + change(index) { // this.data = [] this.areaId = this.user.areaId @@ -119,11 +140,11 @@ export default { From 2c44eb2485b7210f920a37bb5140f39fdd3f0815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Mon, 10 Jan 2022 13:51:37 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E7=9B=91=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppEpidemicSituation/Health.vue | 28 ++++++++++++++++-- .../components/img/user-img.png | Bin 0 -> 2733 bytes 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/apps/AppEpidemicSituation/components/img/user-img.png diff --git a/src/apps/AppEpidemicSituation/Health.vue b/src/apps/AppEpidemicSituation/Health.vue index 6bc87def..bcbb67fd 100644 --- a/src/apps/AppEpidemicSituation/Health.vue +++ b/src/apps/AppEpidemicSituation/Health.vue @@ -60,10 +60,15 @@ @@ -211,6 +216,23 @@ export default { height: 4px; background: #f5f5f5; } + + .templates { + display: flex; + align-items: center; + + padding: 32px; + box-shadow: inset 0px -1px 0px 0px #dddddd; + img { + width: 128px; + height: 128px; + // border-radius: 50%; + // border: 1px solid #cccccc; + } + .rightCont { + margin-left: 32px; + } + } } } diff --git a/src/apps/AppEpidemicSituation/components/img/user-img.png b/src/apps/AppEpidemicSituation/components/img/user-img.png new file mode 100644 index 0000000000000000000000000000000000000000..ae49d85fa8ea96c766d1678f7b9b1aacf95641a8 GIT binary patch literal 2733 zcmV;e3R3lnP)PxB&h^QB{8N9c7l)$6$0WW1PBRT0m15mq?LB2Q**>B zE3w+u**$YsVqQSCXJ)#;?LOVp)7?u*;;1^qv%pxxN|ixz83<(rDquo3fNX;OFBs?r z&`XS726uu{4?*=LL_G*+w?0F6lf?#kx$(hj&Ipoxi3M#W#*0i?31*QH4Md6)7V?G?37m4kjB1keTVgso?W$iR}dZgqd?4(C7G3BI;(~PbAg;EzhQWMMUg) z5eE~D0l4Sy?8~32-W0%l%v|DtCf6P%qU#FSeXmP=vg`X4aBbnRg2Gdr<_drZ&v5au zHOF8`|k$vL^ z@Zd#G8}3yf0K5}G-0LJlybE&~puMTt;{DAlXegfb;$r+@HRlH{d4w73L{3tooq5~ zo+WBlLcFqlE!9t!=1Bu+OCG6{CczT~Wcq-tbRf+lq*#DrU|0hE0fxVS3UUbfnFOIxoM1@B=Jv*^iuKe)$G!;xtf~nfV&JvO5ytNqBxHLsN;FV zLS1w_Bvnx&ke?O5(QpFB)pmtzuD=hdF;$5bdpI#)M@>ghjK>8jtZLoNbb5_q)vrz(l`%qukmTT6q*e z`}XW>)nMWR=$i`(g}L4W*wCTS(CMyAqe0UbRa@4HZ-j39Mggp<9)5uZopAp<1IkMT zW_n~mLi9J?Rk+ydK7cleiZ^UspZcZ!|Imh&weojh{<#SND@uhODDZOJ>Qbn4*{L3- zpXm47%B^3F0yyHj$PNHGCYW5iSYWnJ)bMcJx~EWg%a8;Tb*D%%SGzPeS5>Eio0xFe z6o0FW2}MtM`wld5tQ+ILFkajGY|0TEz{*llGLTQ1w0Gcu)VQT!*wsPy; z5ecl3|7Gw~rT{F;16D8a)(4(7CM@)@srzW-L`_!dX&LXq}M;Y*^+k zfL~pacD&Ho&{<)YD4?p-{4z^<)YwJ)kK0fj-MVSj)u>lLc3m2ZQ2 zuSo!(UPvhL*pa@|t8n^;87mz29^6Tlr-FMyc-tg^-&^HfAR)wu4*CD%y!!!#F*q@P zLzOi_t-ddt1n|47yi?y0A6kw7X&OM_bE>S7=K)@662Rxm1hUh;b)><#u)N5;HEzAHaJh{!6g16|9ohS-*>V>p~tfl z8#_GRNR>6i=K(V6#*9bGgjK%ODsj`}f-eG{_r#HoBx-9G5a#B&Zfa&*pM;@SE-L;pgHGI|F*p8kl*MJChR!U@ndBBcfT7^lx7?gbRO`gEy- zLRX(zX`C>b)|!BW?}73Ko-^L3V%-pM`S#>3S&$Y{OKXzyn98@O1XFu_t2;%17k zE_o}+g)M1wvZL3)nUNVrcR$eXXSDg*txNXkDZZMKM3c<5ifZRr1Lw2`&J2*c^AY1- zAD}a~I{bDgq_{@RBy+uLyk!m=xFvJRuDUd-qH%E^Hc4mj>&&e-$NAHfEOXF%IVrT! zaFrGkO6HJfxi5)=sOM`RQYT;rCVBZZ=|YNF3T$E`AhguY`&X*DfN=o~Gc1z|bI`jB4WI@4goG65?}d43|Q<^5bnb%TmC>? z)kfp-kiO8D)$Ug~+w^}abgkt7p=&dy>BI|51u}i+P7~fspzaL9ICeoj^buWbIuT+f z)b?aX8W(R^YBoJ1835`%Pc}$&4;W~B5@JX<-kF!pN7pQ%$FlKGT?;oi`N>Siii7TR(+B?C$1#l?L4s;IU{v2B2CDVN-6d2hGPqATo2B zKY$OwnBML02z&EErc literal 0 HcmV?d00001