From 90b3a5c81c974f7c378741473ed1a88db2de1953 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Fri, 19 Jun 2020 20:43:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.1=E3=80=824.9=20=E5=85=9A?= =?UTF-8?q?=E7=BE=A41+1=20=E8=AF=84=E8=AE=BA=E6=96=87=E5=AD=97=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20=E6=8D=A7=E4=B8=AA=E5=9C=BA=20=E9=BC=93?= =?UTF-8?q?=E4=B8=AA=E6=8E=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- project.config.json | 7 ++++++ subpages/associationNew/images/comment_ic.png | Bin 0 -> 8519 bytes .../pages/eventlist/eventlist.js | 4 ++- .../pages/eventlist/eventlist.wxml | 8 ++++-- .../pages/eventlist/eventlist.wxss | 23 +++++++++++++----- 6 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 subpages/associationNew/images/comment_ic.png 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 0000000000000000000000000000000000000000..126ed18648f6b4624e608e24a4155181d4ba49f9 GIT binary patch literal 8519 zcma)hc{J2t`2QH|Ala$V3=>M$%DxV2R2pq0#=gcN%ODzLWQ{?kvKA$kA-gEDB-_QDbp6A{~t4rq&@E+y`fj|c=kY-na zv1|V$$OU|}x&p_5fy2|p(gXy0pT@W2%n3ZR1zkCZ01>{`;Km z_Avy3j?P(_nOqB_FmgSgh?x&{l0CajVqlP@go1mDCTy40pwNn>Y2ub5*Tn>gGkSJl zxcr6UeRK_;t@>S7EeG(_5?Hfkc?@p|nS1|-7ZW!~xVqmhe z8F{H@2MrTv|;WwO571F3f7z!S1nU}J5F(-irGu=6D^aW*Cd6tU93ub5( zIDLBu`BBI{TOX2fO-cu>b6Yl#AQJ`}j^p#8W(gu(*oA##xsc@_;!O`1qQPy>odQTZ zNtB)?br&E%4ZZCUEHoQB;awbzUZclEF6eaK$~!$Cb#xe;5D%}2 z)R}#tb!+_y4F5XDEbQkag3pjw@vqq;M<&QIQ&x9Z|LP(^)o zSV|YqlwY4nW6HC(ylWH{0re!RhfOP@5A)4^Old8aaCkkY;>0gZYY4B+(>ZmUbMw=q zjZG3}BXSRCKlde>))sdg{YI4d_FC)2^-|vO-!BP=4pE+gg{o@MdZHOM6GMJNFuW9J zp7y85aXY^i#-8V}wqf!7CMM)f4|@qEapJDG_Zpgms26(QzQSx+20L~!UVwrFJj52N z{z!?tF5vm4d!r49DuU+TDHJ3`V>b;cAz#iAW@K`t#c>1*2A>B;r zwdbaU#YXN!k6?u}<@pH-_90@kX-0oUGl=MFhB1!?j1YFh8gEbfY)d@l(th$rG#^>V zh}_8!l_?r)gZt7mQE#m&TOx>zC+!?0Y$>&^ zHLF2Bx=I2i&9<9RKUZ9bmL+NF9v~8_uN0VTp~KuQ=gwFLmvtvcJb{@ zz9U+?N>XQ2o}4@SeaOf*zyX;esUFMaO|#@lgmwv6--2ECrOdtyNJ!|COY@@TziYvD zBo|J2d=9vZBsM$P`6G}V#)#K;5?5Nnu;3dWH785F#Tydn~vwDT9#)qM&d+K zsTRzP4IaJ4gw^>1(4J&vzM5b)hT8Gx&Wd(;tvH0|<;QI@)iDKXB1O zJoOtFDakN=Wqux4@2E-KKs-w~xRlzNn3vY_-RY?i|q zRO1T?pN!6KbM~Hau#3vj>vxRfX!4`+h=!x#{u}B*0}(ySgteE|K3IBm16>0X zK^TqM{X;nuV58>JZjY-Y;qV04Xs<@5HB!&g`p9-h(`7l#Ho-L(_r_XT%4o7q7H=lZ zF+Ub+Dr5K#t#JdHab$I{&xm`730UpDYc*3AzawBacX!>S-mqlB>_>Bcgn~J+L~oIU zy4bw?rc?sfUdc92Qg*w+*V^_mPidf`j$~jVJ1?OpdRP=2>Q1y$FyrKKB4cgY4)N7q zg5PTCQ)y7k+5Kg54X@1^BQd1UqTgti`TAX40sBn7MtgvZWmOJ!i`F^;F!1p~HB%0L z%(x|lJ})0*H&hy{zZV&~*C8=;r$=0CqHip`5WFQfFU@z8^ld1aa3j{3_O08pjr8uO zd#Ddq2}OyB24hLiHXV0s$=OE&kg%X8z8yxfbL{g$w7bt!M6y2*$lrdb47h*ps_c z@zvW(*P|O_$4fUq9sx84FEN2`8ZLD0GF7!8BNbulP3x}M$?6U z6LLNfE#6u){N?#T?3pKd(as^SM7O+;lbbJv1-kS~arl;8>1ArVwC9A&Q{MYNJ@x2; zqwIW$a?pMmG{-$FWMkz0S zYycw8k)Ea=-e+@pgF|Tqi>WKwGa?lZL!r1x0mK;y685TDM_iMZ9f7(Fj` zy(<5sskz(h!~2{?c2ktigHKz1@DXJRxrKnc3VFHuOpdaD!iioq}U^RS&D3po}U9eJcTw(2}Qjkkkz}3 zjREvcS{dQ@?|nirxJ5km_ROe!Rk|E(W?yX)zluQfM(#!l!F|d0 zJR$wH)eU7>QmOzuF%rtpgYVAFJ*FlkbV&b+s&v%E!Qvb+IdZ#{ikqiOXc&g}_jeL| zAhgJ=FWEDHQ&R~u2u81snHiTr)nH6DL+}ipe00Qn+N_49;RJH~D=s`z=GNVAFo1~G zV1|BT^uHvlGcQT(p@_Gd%Xt{T8V%w)YGb%^6e08rb$@y2PQXQ&x3|7 z=8=wH>%rKQR-nLk9#58{tgLDL*-}CQ`p_W)7FAV#NZSg?4LO9`0L-|44W#o@mfIB1 zv-Y^$SZ*?7_;MkXdEYN*Lhz8f%VQPG$I8JxI>#rOSX#>F%9y-l#O}F2?^OH2SW>nv zCG-MO(%|q{G;E*_MyWYifyFR(<>A+aLu1elBep8)F6|A=_er}YNq1}Ty&J1nYgm4c z3lb+ppW$R>uMq9$E8hrf2Xg!+QLDDI2v#Oe*IyHuuNk6#LlR>BN7oYDiL`)@*>01v zcq=jt@ZmK^^>!w~DyGop4M&|z92FEX#ff2c=g00^T!^KQQA-^GQ=tXJ+ZZ(p`tldE zLOLq@Zml1MJ-^rT<_f34;-8a#Ju7`aG*lq>R*#JO&KlK^)h@Gf{e>Bk`u3*w{4o4i z%RrxjMBtahp6@%vYAg=u4v1&S7>vsQ%1M*@*vEJ**ON6^27w5MZHLd9P|!xEX~fT# zbGpI(L-`!+TZ7^meq*EZe|}Ul#N})mfcQB<0=Vw)2ZUJ9igA{72_cwg6a? zX85Mm2qLk%;!{?)tdxwdx!oZ~pbZV|@2(yBcIEl?sNKN_ z`E~c>VvBeJHYn9FEq|`eewq3}l~)9VHKAqQ?SaNxN`|Nyygjb_g$IUmxpTFho^yqmMouK*DhmddP4p$uOIZXBjP z!MoqsE((D#FAngX5D4!+M%l^?1Mk(du+q&$N5}ms&Q#pQT>{bLxi9s;US)jADHCV+ko;H8s*v!&oJtKfD_{&4bZy#|A`Zbx}bnQ4sj}XST zcm7{MKD_|onn&L&$IKh-{wP#DeXtV~&01o2>&^fQ?Pb}4vhB5yg<+s4OMi~xMj&A7 zErvjbj807G`uvn|?7SB>rajrLd0`?SXNio4bB!qE*B&TeZ2BNgIbOU!$+vNRykV)b z&!`xX4jQl&xe0CFXv0JUecYn*&1+NvxP#kfbwUEa%*AGTxUn$1Z+E&X5HBcsEKo3_1f>(7{*A&mR3G7M8REF zH5GK^OcLAKHt0ZEXUf1b4a^B_hg1Z39C`1@?mLU*l7z5tT%T%Nq5+v`iLct^ zu^&$#(*Pv{hz{f2*Oha;apirpTn%4I*0c7*+8ZUsZBxY;Z~x=MB$i%fvA-z&=P4RLR9uI%@#wJ=tTB@ra(4y{q+$N+T4xUHyQYxs)JPER&WiQ zrW1%g1#j|rKgj^i!9RWH5%=}o>i3cBT>hy}TVDX|4L3j%-roCm0qiwMayl85c<3Hclw(UqF z^gPyC0fhPe)f|Y#98i2{<01QDBIQnI*bBRTqy_@421C(;)^VjbddWqfSF|-rc(1Rqd1eogXN!jCP-w8o@3N{5Td0Adf##Z2+NP za8)}c#&^G4K;(cs_j(*h#Z!#}CqZt>;*>RLH)N;S!*Y}WG+d+r{k12gU7-F>_3wj* zHWKBE5rH!gC~L58ww;&O%3WWw0W-xP1!NHv69i!>URfzdo#GkUeqTuv z`TCx5?aC#_*A|d`C;L{j3H!zepc7-IYN^3HOpG@Si)de_!TerALUll+7a^<#jd8^3 zY~3AJ(ZXSupzwGr$g+MP*L28moJas|$i(l*w0ujNRE**JL>b0LSO9xRYb#>WK?_$M zWz@93MFa2-eg&%bG4+7LQXYVf&1VnT1NlpSlHvO#Ugj%F6~eXZx$=v!y;ip@w`~9% zHUMf(2glrA`;iFIQY87BOex+xy}V6NT62sF$pqCBlzy1({a_-Ayq$RlOB3>z`zV?L zH69O>%K_0xb*PI#Z5-4WXJ7fz5>dW0vFAY4#wM-H8te)D$!RbTOX z=o*`{8NalI9nFWNK=*lw9NR+DVKI8ujn(Ab>k^vO8q=Y&GC&LqHgHHAJ^=jpMe-#g zTI__e3i^+H%#ARWSn={bMvZCx2`MV+hZqfL^D{)@GT*~zk>zYUp?>8I{TcopN0~=Q zZ0NzXfE{(c|C1eH7M$RDAiOOa(hLt@is*S97u;AfLtaE|HDQ}O4s7(q9&Bp@RP*rx zR<{nYHvAY*QGv}fs`sOg!paFWSv5^F)>jp^YZ*u#9VJkW;A>SLSwDpZbbw(jAU-)FtZX8-Z>r& z-`(6N`38;NV=V>sDmRdUVCw-tn6DG>hG!l zNDAoki6*GDYS&NUf9L<$ypyD;W1dmXn7@lDTj#_^imxivu$)=j^vZot5{DM3)WLJ2 z@6JhMSQV?Mf$Hea3CbDwBx?Ja04Se@hY@g)!KYeVy_Y0Lcyt2Dg2;C~n70|9F;&$} zz4MMjLdWeT19!q|66uwFPFW4%)rg;;NRDo;PQmgFHw`t{hXnad#PPv;vW7|Qu=njM4|x@$$svP7s>4{p z^a);z8`STfol8@|c~lB>pILGU?i5 z^U!{NkO#yHiXx&#IDPNDk8%LS#cW3aD^P1hK-A;U@!6Aw2aD-s@pV}@T@YR8NLrwO>JkskR^D8t*? zip?zXxY>tSs~AgjYx5HmPmcq!amr)zg&718D!jCPa)=ZMxI#F^lOLfEg}_8yCvA& zEi`&~4tYM>xZ&5c05FgTs+mE4D51+wiMJGt@H>CC-v@APv_DhI@Yi62z2}PgQFyLA z2DcILrte;iH2ox;TuN5Dm*14M=Tm$tO@?t%41jDK$0^w+)8{};Oi8inxhIhvF0-wb zqu^s?vSkCG_~Z-wx=f#Dw3UuWO66K|LRVKh;iMGajF-dX`y?`Z z^ntAV1UM+>W&vn+ywOAfjA3Pnji9EWFY$88&3ogF^@EZvD^@%fvVye_4s+)50Y(WO zdkO5u?rO+tyT0jzT;xb|0qQPbjf)7~c~ zWI6Z2=|Qb=o^87^ui?t#xrnAYqrW_>RX7oJMIIrtZ#`1Q9)8$&Lgs0hiSfnU!*uDN z^dFQv9bzNEiR~PUH^yc7ka?8WuXnIUJX3*Nz{`$Mq=AhWBwx>Hvv`K>gPxx3f8G+@ zqrYXXw=^S=!s<7DdNvKW?~@I?^`x=Xz9wZmM1>PUvC^H-t@NhOW=M-`yNx~Dp~(vu zCRPlhb~c=-7P~w$&Jk;??II{jRcrA_uNs;n@V`TN2Wn+-rz%ytIy=)f$b7aYlXsgL z`#B3mM&sSm#`HrbTXJ4Ca@!aKa_kgL+y#!W@#@}J6tS}BV%m46;%n>I9lGSsRZ%&0 zL(gvK;ck+Tb#@x88waK-XI#8ia<2i$sQ$q^+k%4HI7-v^vJIsnuImeGpG{L^!lt|N zklH6_F4O=gH?ayuZeuY89+nJo!N6%ZqlY11IXTj_UtXAbbBF14#L&;a_C8FUzxvu6 zw?6UC+|G<+8{T8}x}|@eq%Mcwlbh8RLg{ypN1=8haOe3G^R{Y{>q6p+ zlHcE$;C9pv(N#RG%@+1rtbw(Eu@H7Xx^0=_L&5UiFS%N6XWRvu0&M5m9F8$Iy-YqTFcGO&7d==m6YHMF=+wzF3qSP4q?O|oB@A}IX zysKMG$`=@XedNedy@z*CvmHy}Iso;02GxJr_TzG zB#xc$0S?g*8YZ+26sKX6?{VQ8f)seedLC~CxAP!F74(HOBE(hC$}};pH~iQ5_))dd zP$)gP?ACX%4|#Dj4@isxrH>xM7nZ-hJ47FyE9;QYlhn|}nsa9&(uLQ)E!Hyq*BU|sUW>n&3 zx#e8*VIt5YA1~9^?Zru-=8@<~_Mv79zTgpVeOtzr?M}a3T|!n6q+1cCW@pk&d!N0` z-9x2Zf7_q0HSrE(gFxbq?>*5tHiADD^or!*$FOOr9dnl)1}<&5YQ<8n($`pMG9|XK zigA%AQ4lG}$%o)-EJmftP`2V+%Un93b~X2<&hTp3^2K$Kno&nZQ+UOy7?wP@J0VSG zHGDnbNDHOBu#5)PJ`ss)lq?E%{+0LDuGdZ9dX=$5-=g-CcY#yT2H#3P0SK(59U@Ku z6*F$`yYphxRnocC0;_MYW7ft4*bOlQ;0i3`qPy&=%WLgo%=S!!hyu@vrdk{;L^S1* zQg!w@o`G}C(SX)Y+TCxj!j_Uugb!}i?F2?{bt0aZJ2r_}mm;DXSemPQOQsi%#z>ZA zcRXP}od&-5-Y>!vUFP7Vyks!3qJYAdhE4mb>dm_GnFDp)?R-C7?<>}=OZt5)_xVj= zMv*uE5oT^H2rjpakQ@D@6R+zp!yBF}i6(t|G_c@9Y%Lx}bBBMwPS{+DXR-#IX3mb( zIX1T|B%3E!*`4LFa7Yc}QNp8bQGq|}3?M>#oqh@vRmX)r248J7TzT0-mA0T0pSpfD z-b*uVW0pIIRg`-ch#!olg%dQ09`i~PRe zi>P@1fU6&i+&XwgllqK0nREFc76yx{h__=11kd}~zmRsB?nA3RzxY)8HKPTv3EuNo zqA7ibJ$Gb#oVVQ&Jc+zI5`q8#I?|AXZk`>yUCtj;Pl!gofa2jgb&=qbtLMni2h2F) zoO`82xgxCkCtDQ-gMN9{5CjozvRRz)mLE12-A#9GY1e(93!?N7=}VekdTZmeKX0GO zxDZTEK1n3`ec53?>5Hg{bDBjWx6RaX`gw|Lj6px=Ycb6am6P9g9*y_?$`PlzptJ?C z@USlZq?_KqqTjbY$v#VFZ3k`j(D@RCp zic(D4%&m<8WFFHJdBr7u)}U{t!Q+csTZOYJwmI*E;802NEn1MvNY=1pRIXy@1Jmat zO=xmlw*c?Cvs_YsBWj~w-=0<%RJq*^LG_rMyjNJcUYgWa?jyn5fihZ# zlfz=)5B&K)Fo7MqKQ@>mn6Wd`jlBNWL#tHl7flyAQb4HkiAQ{G)H8greFuh^PLV!z ziy|85N~xmbPFa#m;B~E5!2QPbr@U2dpT}4-53KHIKMZgqC~fFVNx+S;VkCmiH0RiP zC$GxLaQ){?FZEypt(UIce1A_5^S^iQFZ%Y_9~m~AJsui!1MdEh1)JXpc5@DP*L4ka z2L_OanueOPnx?Y4&NU4+T@4N0Q)iUav~|_g{JlBv|6c?ce>ZQB@c%b~%;`p5fWTt^ z4MA8>T^Hvdcjb^kZ;*$#ue+|Qs;ZYi#$DCf4dd;n>h0?9r|jYH7pxkL3HbNq=o%cV l?tfa#MJHU<)gOa#_X}15cF`L*{R(UfvM|47MnpK>`yVC1Y4!jB literal 0 HcmV?d00001 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}} +