From 7cab016e5918a197da252800a518cee48be1b54c Mon Sep 17 00:00:00 2001 From: FightingN <18300240052@163.com> Date: Tue, 31 Aug 2021 15:03:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AE=E8=BA=AB=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/mine/bianji.png | Bin 0 -> 878 bytes .../images/mine/bright-status-bac.png | Bin 0 -> 3951 bytes .../images/mine/dengji@2x.png | Bin 0 -> 2739 bytes .../images/mine/jifen@2x.png | Bin 0 -> 1277 bytes epdc-resident-mp-yushan/images/mine/right.png | Bin 0 -> 850 bytes .../images/mine/yiliangshenfen.png | Bin 0 -> 8452 bytes .../pages/complete/complete.js | 84 +++-- epdc-resident-mp-yushan/pages/mine/mine.js | 318 ++++++++++-------- epdc-resident-mp-yushan/pages/mine/mine.json | 4 +- epdc-resident-mp-yushan/pages/mine/mine.wxml | 83 ++--- epdc-resident-mp-yushan/pages/mine/mine.wxss | 148 +++++++- .../project.private.config.json | 57 ++++ .../subpages/status/api/status.js | 9 + .../subpages/status/images/icon_close.png | Bin 0 -> 1962 bytes .../status/images/ig_tianjiatupian@2x.png | Bin 0 -> 22592 bytes .../subpages/status/images/loading.gif | Bin 0 -> 3897 bytes .../status/pages/brightStatus/brightStatus.js | 197 +++++++++++ .../pages/brightStatus/brightStatus.json | 7 + .../pages/brightStatus/brightStatus.wxml | 24 ++ .../pages/brightStatus/brightStatus.wxss | 113 +++++++ 20 files changed, 799 insertions(+), 245 deletions(-) create mode 100644 epdc-resident-mp-yushan/images/mine/bianji.png create mode 100644 epdc-resident-mp-yushan/images/mine/bright-status-bac.png create mode 100644 epdc-resident-mp-yushan/images/mine/dengji@2x.png create mode 100644 epdc-resident-mp-yushan/images/mine/jifen@2x.png create mode 100644 epdc-resident-mp-yushan/images/mine/right.png create mode 100644 epdc-resident-mp-yushan/images/mine/yiliangshenfen.png create mode 100644 epdc-resident-mp-yushan/project.private.config.json create mode 100644 epdc-resident-mp-yushan/subpages/status/api/status.js create mode 100644 epdc-resident-mp-yushan/subpages/status/images/icon_close.png create mode 100644 epdc-resident-mp-yushan/subpages/status/images/ig_tianjiatupian@2x.png create mode 100644 epdc-resident-mp-yushan/subpages/status/images/loading.gif create mode 100644 epdc-resident-mp-yushan/subpages/status/pages/brightStatus/brightStatus.js create mode 100644 epdc-resident-mp-yushan/subpages/status/pages/brightStatus/brightStatus.json create mode 100644 epdc-resident-mp-yushan/subpages/status/pages/brightStatus/brightStatus.wxml create mode 100644 epdc-resident-mp-yushan/subpages/status/pages/brightStatus/brightStatus.wxss diff --git a/epdc-resident-mp-yushan/images/mine/bianji.png b/epdc-resident-mp-yushan/images/mine/bianji.png new file mode 100644 index 0000000000000000000000000000000000000000..85dafb5b4495c7a261d9f3fbee6224aba53e2f3e GIT binary patch literal 878 zcmV-!1CjiRP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0063uBQgL000(qQO+^Rg2pSP43(R3pKmY&&*hxe|R7l6I)?bKKRTRhZb!M*A zn3DrJNhJm5pF;aXMMOUI(jT&dQq!!5C?t^z!DtMchoXm|nxF?OqaOML6$t&odMF&t zASJ;PA!sPG!kSbP)R}u{#+gqKow=Twd(WAB%e7zDUTgC`zq8lg=d46DWgW3RR>Yh* z9$&@#v42ulGvi_(I&FQHPRuuhy42^O-)=vGLzewF*nD4ty_T9~vA4k=RyGe?pcm|M zbsCxJHSm|!&B5kXQCDW79X6-9WsSoY+5vW1G%3?z6ZplojlmZA8timg8oAK}I#a*h ztKcPPPYt`uF0jplG;+5CPS|2bI=|fa*k<-ruxoq^wwqUty$nv6pUy9^9XnlE47<)A z&|6hit1R)5lXzEq5$t;3fiKLRl*#Vd3Wrd!s;B@r*atpyNrCoN`Z21<^nBP7KY&ln zDL~!lFxX^f{yDoTy?GxOqE_n%uQ)gV2Hfl?@R5rOP!Fc6da6gH4(t{`gDqwkpdNMv zyy%>4eBz?p9RMGgRe)OSC`P@YZDJ-nxzj=LUbXPGBeB-sIOTa~P0pTPbcf$CWV7>f zQLWZFhGEZ{R+}Gp=GqN@wKx}5@|fc&dseC5igD*QgW!~{7S=^gvq2dHy0zAS+_-a( z;p&g#8&}j(^`s#TdRj}K_HpNaBboos-hV%K)zM<33I;uurz#73#F(t@w(_x58}GN0On=rH9Z`vL497@}h8T;{=9;&p$!4$6N)d5>B>$U}#AqBT zMOQ43mIkYpZ!IwrZzT>#=NWp-eTnt4GFs1ovY~kMAED`n@Ljl{jQ{`u07*qoM6N<$ Eg4+6v;Q#;t literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/images/mine/bright-status-bac.png b/epdc-resident-mp-yushan/images/mine/bright-status-bac.png new file mode 100644 index 0000000000000000000000000000000000000000..12055c2b7d0e695544ef2741d4df3517b2d067fa GIT binary patch literal 3951 zcmV-#50LPQP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 literal 0 HcmV?d00001 diff --git a/epdc-resident-mp-yushan/images/mine/jifen@2x.png b/epdc-resident-mp-yushan/images/mine/jifen@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2aef636c351e4671b0a9c341833703caaaf08e01 GIT binary patch literal 1277 zcmV004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x00(qQO+^Rg2pSP40W7qpUH||DV@X6oR9M5km|19CRT#&A zcQTo=X)P`^4QWi$Ce?)4h7z=CXnhcTu9{v!*)k*aJC>w$KlDNka4{0g*2*7lyx zq!dDsp*@875z&-IFPBz}_$Dz@{c>i4={+0)9S0RGH8WppON>;#mmz~9MLUf2T$=x` zMte9hyy5Mj1fM}Vw2b7EttIjI`q%sfo%m3Nx4#wWTH?)Mi(Qd*eP1sS94z<#*#}hE zdR$^m0Ba&;{Rvn+#ZMzu1el6TNDm-wL~0A5e+;PxX%Es!0R7cShZi!~Uj}duFiNnS z;R(RIpxc2b)97{rcX;~Ez^4IXTmecW<%46%3_j{I53-ntef@n%gDLbbyIJ$f{tOtS z0IAhv@IooTPna7c2)cnyK3OAh#wTkAPWfbC0XqZ683HOpNYzO77RSM@NN@RMT}W?u z`p1z@rO5P7i#TOSjZVC`q{X+Uf?~Iu5ih2I2vF#g--0Q$1HcQIW2qE#L`|mA zEyQH{7;ppdB2Z@$t2m6b(vsjA;KP8rQ^5P4ew`)3RbfevCBfamOTc-|6o!BV@TL2U zE87LE1m;|MHPB)i%W-1e*Z&M`wlqwI8-Ytn$1bsaF&su3w=|js-o+fGg_vDBgZYw6 zA`Bb^uEShgv+e*MbF&&0<6)#eOM+hjk7v=j47{E~9tWPah}9oPI&VpEGq4S_o1-jD z=YX3nFl(^f&8{$Oumtm|YJ+YkcJA7G%w24YSZeV&YNnVfcFXN$nRvkc`p zQh;gxzdQfJ+%&nOCfYF7lPp+Ak&fmu+9IS^kfKP1NC%Kg^YHgcv|*|Tz={1Zzf@KL zW5B9BMm>Vr$?Nj)0ZLK$;OGwtxvP%e#OX&K3bF{C|K!kb^;lftQ(4iGfLwky()O{}BdxpiWjs zFaRk60Y)Zf7FITP4o)s^pn|Oe3`~s7%uFoItgI|Rs~Ky7@(e73tU`*0j%>n#iR?;+ zB1Vl97jh^&Z9FI%bn%0VaZ*teCzqJGgrtbvx}>nyN9P&a7bua zctm7Wa!P7idPZheaY<=ec|~Pab4zPmdq-#2q{&mJPMbbs=B!1Fmn>bje8tLDn>KIR zx^4T8ox2VlK63Qf@e?OcUAlbb>b2`PZr*zM=<$=M&z`?{`Re1R&tJZN`~KtSFOa{0 zp#t$1ki_aQL7=~wSXh`@*g^hcWGV-FT#$uT(U48ZF_1m6P*};Rkwe63;=+vwIhBor zK8Pk2UE~r|F?p!^5#%+n&xrF_6Inikdko>P+YHVOOklvw#Kg?X%*@Qn#tH;%9Bd%K z!NmavTu{IR27DmE4+sB&hA;xnU}0fl2O#=E#>!6px@>XY_OhTg7wz5RpVacNu(|3R z9=Qa~q z8S4LE_004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x00(qQO+^Rg2p$RyE$$ZGQvd)UYDq*vRCwCmoOh6ASAFL{ zzjN<>x${g<4jRoUA}k?-BqV|{s4#X3BMf43Vr{RSsvOGYEy{R}*Wlf%jo@+CKp@0Bjfp*@)goBsW2JQ}E6O;>Jl@_pYA+p0A*;`H>8RnzxMHi_;BM8v%=1hoh^OT1lW-p_stY)in<&>Tl_+1`z;&;XJnU z3~HkVTFH?xMuspEdKM~?=kiGWF{colb$rVPKKA>8;H>le#`x!mKx!c}67CSsEZtRq zk0_|Lp1+{>+JBGmHWUYFY)oYs9}j{MM}|03A|r^17ZKt`@c_!r=vNRF(|-mS5sWC2 zF$3MGK-O-dIl_G8c?+uf{(Ig5yrciJudH~C)LR6R5sVSy2$D#MjKPSfXcRDKTS@D+ zI~Wz>cmS#x!3e~$S$Cs(^*z<|Io5wSP|tcHfZ+#O=s;G zp-<^?BwXnotdS3O?_ZZa3oB^Fe1q~Esj3F^X649qL2@1{2!yy5@j&cK~qQpi>A|WwebVLR( z3NZOo&isE1YGmX_5pxT0i=exW2~-ssl1Pb-@t_PuDu@jH0Xf@e@Jh;qI$(dH5Jdn_ zD*T#^6Jp~oGM}&Kf;eSVB-eyF8)CiX)v5-0wK=Huzfs^1|!8&l!9Mmu=F(h$c zQ5{ZV^HJ;Ehn@1s`SqW^_n_wO5#Ze-{Ead4);KahR*1MPiM>b=Gho~tSfGE*Fi<`Q zC5eSNHpDRx7?BT&=tqI0-=nc1&o)Zsj{V9x&KOTV7`%}#AO<9cs0Ps_#FJo3{fAi;OLl41qz%D_02HYB`^*_Mu`Tg?->iMTsiNKU0o`PfxNXdhZ19gDx zfB(&&y#{2TRns#@tRPWf?(mFUJEcRh5COKYf=iu(~;8vlq8?qAawu2BQL%)LG#vAsd0u)A}ycZd{94eP0g{@wM0c6WD zxL09{uSc_=(#DtG8|&Qv-7n=UE+?w}E@FR?-ojzfPoerLBsxW5OYfNhYCJ_G+dP$u z0qp@Y3i2z6`6Y+qN}4bbk3e-lGIk}5yZ|Xod*VHs^cI)=5oXt~3Z}FJiFTm&2OxVdYVV*s`)QD`fq9tX*4}sQjHyDh9ikDy25{tR zFn@rUR}a9{0OT34D}h2Sh#LTy+fsgK5FJqhRXfmzS3>CmL?tlekW7K81aRF};CE1c zHMm~~z2{uP8R9C897HBxhKyeY#chGh6x7ym-4_7Y0XHG$IwX!ghoz9tqNhHL))%H@ zdYuxB$8r1#lI(=?rAXx<#G^GNz6rHAq4r7C-c4ubE5My#9s`DOR@1)U;OuHUlXl#l0|c6;iv{vz8ce8EAGAb@!w03&2;veACVUp(CmU zmaky`^<4nC>wf3gG12cJNd-xQ3|a|*wgM&R9B!dgN0yGk+B|euk!}-gHw-Wb7Kn;y zu?nS8s7#}i`=C4yL_?Dk#8A8i;)y_QDQMb4?QffZ{p~*l&>L<;DtjO*hHJ7S=(S*8 zj`00pF2lsz`!YXUMmvw8?T5k6`!R?>r-{y=fL`arlKs;w9wbUGm+75QD2CY%Kj*;I zkn#Z-dl52n2^1!L=QRb_TR`2tsD1&s4KXKO^{~awv@roj2YBi6(sRKMw70qrF+669N~J|A~Rd5;}JrvfiIacKfv- z1G!nIcS3E<4`>)zn?lwDrx4YU%7rlb5@hTOC~ol`bs4y{f!e#keaf}&xD?m=1x(Rf z0h$It>wcne9*}MwnRx)2e;Cr1CzR3%6h_g~C=_aFQVtqF4A7-W)`9LC(ya%IZg>!r z3Oao$y5kBcjR&zH{@!TJn|6`}`P~IG^5>@Zn#YmoCM3EVlT`eBGUzR$%|~GEFxopk z1Y`_R?6*0n&Y=rW!qN;l_j8ine(f*g+#gdJLALGkle`(IHU--Y06U1PNbL}8xfYpv z2^6QnL}=$xwEcBO5+N#kKzs9EnK&DW$RYC&Bd6|z?h;6ZmZ#9#HncbjNhQcq6BJXP zSyfbxS7w2dCF>xaI?|j&+GqR(mnYF(SE5@l_MV)&07A_JOX8gXGL`bRBBeuq!n*V5 z>V4?yeb7A(^gL*Nvn$>l)J_XM@oh+ZZQym1-G1#=IQKc6o04t2p*C_hwQdA;ortht zD#+-iu=9Gf7Gz*l^PZi-7a zW(MGkz|97@ANV+c&YXZw`YH3oI27452&-A^4iPD6JJE;9)>u< zO&!8b=W-A)Vsa?3PQQP(vCEm?L*WtDb9jNE?u@1baF1lRCEJnT^+3Sgk{= zjJfoeFjv2`4tx}bqEznae^#^qy|DTSy8H;*dK5a3246WnH~ZTZ3Kcl?N+?cv`_Ng) z7J>~5WNqZ=SCO?jG^yey_Cs7+ZzeH3k2%}-&!AF3Di;t`8h_-<2Mk*H~qX(h1 z6Li@h>2?7bDd@h`t(Hv*_9ru<}i``53fLY(8sSFMv4s->Q%; z1^d!doy8c|kZ~yh|$)q>E^`fz;>x ziwk2=+JTH-4wVbN6BG?a+UzRYI|iM{(1ov|OS42TzfH~tbz~ey#=OZS6{NHeYTt)c z4?#RS0JwDuZ9E2xcVp9|$jB&C8uy-8y5a*QD5P!7vAZB^qm`|=(zutI;we*|1WPHG zqlycZtLi)jtAa_0wqB22egM~54D{?swq8T&(9ih&tVQ?m@1xz*81V%Id5+5%pj#(u zEkIJn?YqW{tUQ{QOhC4Rc2>|#h-%*lqu=K}twK(b&I8#w0^P^aY;F+vS(-)biyGZ< zyIIHnxkB(;3)vFdnS-Uf(cG&VzuJ3M)!j&SFFJl1oOmB-(?81QVLKl{mZjrhyJ(?? zD~uq{1$NH;bwRBL-K4lciB2KecQdBE9kpGe(TkA67`prQv>tjNu5lDa>CN4Rl(tjc z^MgoSqIAVOY5m)O!F87qBi^q=ywz72L9;fJwUOoH==4Rw^=^YJ`~Iu*+_~-bNO61c zrdEPC^$?oQ0Nvn4Mcx^37EODguAM_U0M%Nw*G1fhsJL41U9?Wa!k5u_#0Oj^Uy9Ph zwdaUxqy8nfl}DwZ*FqYz5G80~6j4u!Ib~{yG&$$xraBLR}fWqfkc!p`!(9%`Yps+52%E?Dg{>If7Hn=2&EpfiWAorKvtu;nSJ zR1q5YRq_+jw+}mi1U#r=cF$u3E;Xwtc6|`ZM4%3P z>hFmP$$D>UvqC{tXsPhu~IdJWWN-w^|{9(ra5vJ~LU zXM^f1;T+40$mk8o$f=z0{D$-d6m!hVCVi0wHfG#)M9hzC3wK!*S zHY3^h77E+1KMPRQk*%GkdF&st*5B)#LtL1k@Xp@c*Vo+>Z+`{OWjJfWI-GU>y$Bj5 zU{eolevj*rD`J;+QF{(h#XvlXjJ^ig>!}nLfWO}i)c*r~7C`L`vi&W{j<+Hc*Fj;6 zpT(i(y_n$ptMe?R3RuWG!OxESiceJi0M&Vl2{IN_q)Y*r9o=~6UHMKQspyCAZra;k`WwJL77t&_j#*^%Dj2;I$r|1^T|JD} zAB4s+oXZ0$>Vb7BeFM~GAhCBFoeS}g;PC{r$%_Jo$}W=Wmu)IThg)ge)nNZ4Ylr^| z=M)nnDk_3Hhpit$(*N3vsk{ja`dcYr5!J$ zcG)}ne*W;!rd>2`4&<g%To;^fINO+V&BhPgt>eSpf*FbhV1@n%&wnCw!RUm zzQ9`uwt=?pL1%75yX`vgbJ2}=t`6gPR^C7Qk#F8(?|3aV>geo;P^luteK7Juq;d!< zdy&e1+`}J0yNiQCqXTLa15pH>ydorzh58zNABb{@^T)dM(e6>`Jc?#BkTua(1Jun&H{LnB5yQ=kDQuQ$+Kna4KvvN10<3%kjYho_ zFnT4fQwN)RE$Py}Tk1tX1V&KJLh{r3Lh=y8liZv_F(JIyJ@rMO%``=tNB)sWVCmk! z1ea0W`-=6z?z|3ES$*)Y!%_*wl&3IBc>t<&gGiScFDq4o8Kxnd5b{nT41x3G(JVu| z%V^^p&<;QnR=XJE#a`NlEZubNz_~!3r`z6%O(71KXa?Omv~>#RzvQ=q_a4Wq}y>o+7zuyB_*>l4NV6R2hQh(t6pimq=5M*PJ z-8p*)mlsE{QpDTUCJr7|P7DH?dO))j+#I_2vA}g9C@nrHP1=KA2W&R?^g+$i$8c^Z z-R=O?ehV>4n|d0_dZ^8ie)K}T(X7(f(n4_g@m7NbQ6^4t&hLwAC`;FV&dxeTRH@(h zSBOg~@49wfPs-b_M$-=U2R}qy+X-3UQ^fTeVN!i?Mf1LipoT%hPD5%2ADh**i)JDE zuWpcy=nvmPy8)dRID6#jg9_gwOJAw0%SfrX`4y_D&2VYgv%eGu@w(iU$~!S!U#f~# z5F02qg!e=}W!m8Us4B5|!C`><{T~3^rM&Yc>$*|dekCG8VRSEKgHnXv{Jl8Mh%f;( z@sum#pBN!3@s-u;7bY<9`His3&AG-#~&==LUA01-iL z8fG?QP%#o_*F+v%=j}+G^Cph{8!*GfIfK~>MOxm4mTD`z7yRx zw$t`*T^<)DD63)>@Ghmd5rZ$T7IjKAvakQV!j9{xz2Ikw#}0xE5iOjL5#;8YI@Bs> z9{d>X`EQ>S)Rn^@>3eSEF0DF*U@sSHJ}x1~6M;H3%dnjmw%bOtl&Dhk4^xG-ht5BV z&i0G5KLh;Px!!-ywJ_05Uw;hvMSLkaIyZx!I03B|I7d|Uo{R0Yu&su7S%(vNQ3T~N zd;z&1kQ-u0vW&*J{s(sL)Zm@9os3-eW7IDHNlH7fB_7=il6a>gsEWECw$;FOyt0cb&*62{%^W{_J zakN-NnoGeo1y8UJB_^4E@utzBWc)&s@e4hnWF1`AMkK-%M|nD}y7%QIl}TC;f5@9t zfH?7ryjX+kxHq+I8sfhO?RCkTb<|l*p^Q<`BM|Oth#<73tA9LMRR=@W9 z{#|*U02V1!kcr(ujP}<0E~=(Ivb9xj^aF8JLVV8qpMf6*-UfUcu#8L~2d{j}K0TwF z|LE-xEdd{}??3oa;KoRzUo~p3b2yVWmPy7YF>zip*+#QAB%`qP5Yqg{Ai)RpPTWD^ zg4YAko%=V$W;Bm}f!4{dQr`Iz3R4%6j9{Rix9;%3Dv*?s@dIA7KK>PS=_KoPmFghZ znAh+Ivupk8=|N$I>fky*0>AOAj0}+|kqPTu^JSHyn8`hugV!UGLF>o*-j~Z#x(lIHgDw7rN_w-N1q5m{@=yLdU};~6u22O%%3CCX!^O88oc4uBq78J+Kk&jTRhFeYEr zulTht0;L*e|J6vLh_1~+ui5whY^zCksjqih&Sif-F?Df|VhP!?*DJL`(VK`*vpwtO z#ZkGE|NSg*2Y^dcddrKrZYRhqhpx_g`86_yIq-5!T*Tmra2^D_I~p6m;yE^cKMKbp zs^Z)E|OQ(@Y52;7^ZNuK#c$(CN%CvO5gA8p91;FL3bB9R)PBVEd_VFO zi_J(Ib-K&_1=daAPbaUrsYkieXY*&%p7otcWdt)wWq%I%V7}9yJ5APU`lKA{*=_j= zAj53C1atX~MCBS{G_2PLBRPQnf0P4loL~QE6cc%HV>2`fMv2AwuUv#+j1fgjRiaC8 z#B967n^Q|qK*$WJvt;ci?fIGEA$@T2rEmD$cQTirPJ7mh%HDY`-Q`7EbA3-^cL4Vi zfTUWZvV9j(q2%3G0V$8e5?C zA4!?oha9>A8JR}14tnO>XnQ3*MX}uut=ZG0&Axnp7W% zp#N!wq4nzP=&C%9?7JG-bp?`?(bgGs@loilhQy;{(;n@Gd3yEb{H`W&%a&W4w?7wv zes`dL`8w1&(zOO_PaYdS^_#$Z@}1(?1f?xoiIRdZ8CQj()z`M5G z+I;VG1?YDTDg--k=?v|~erBNx{4ww|`GLa7DCMbXOsNzK{shD!)on0-0aDxMk7aFi z@d&J(fYk+DbIHqNI|$DaMM$xRlqXx7^xn@*KAB8dOxVy)NzfS$d7W|2~EfjlC^D5EYA5rneK9N=WXJC?2Hp zln1vm32}u%svwu48`n>5*k&EHwFoQ6{npujg|%8s)^5>Sn8SA06-fLY@bg=4Z9eBq zs=xcC=^~gyk9G%4SXO5+wIagd7R4hHVU;7Oq6(4Z8L9> zHy6-C6{&9bEF4#SVZ_E9nc^!H^C*9N1znqk?(iZAAI@`WMz7JJwQyE`?k|B~+w!_w zpHm9$L-JiyYCa6-$XZRBGbeFr-djM zVhROJ{xw8$@CNyOhD|P2U)k5|(Q7v8)>j70eg;kP^7D7`_UL(U&l&pp1@zcq2Ze@DgC%ry{aW z=c&N@PHhpNkN*hp55T%vtxQi-s6DeR!ZU5>@53}Am?WV%Hbzt^(OEu2Ixq+8_*lWm zfvbTZ0A37Si#NxfX{!Tw0pA2Z58MN+4PTH{tCYs4h%3d-bNbHBXHfCIo4z{S8`U>c|a1$;zo4PUu@9G~fZ05}3X2CQs+e^e+? mnw%slS20n{;OmU%ul+x1(CAj7U^>|V0000 { - console.log('获取所有网格', res) - const buttonList = [] - res.data.forEach(item => { - if (item.gridId !== e.detail.gridId) { - buttonList.push({ - id: item.gridId, - text: item.grid - }) - } - }) - this.setData({ - gridList: res.data, - changeGridList: buttonList, - moreThanOneGrid: buttonList.length > 0 + api + .getGridList() + .then((res) => { + console.log('获取所有网格', res) + const buttonList = [] + res.data.forEach((item) => { + if (item.gridId !== e.detail.gridId) { + buttonList.push({ + id: item.gridId, + text: item.grid, + }) + } + }) + this.setData({ + gridList: res.data, + changeGridList: buttonList, + moreThanOneGrid: buttonList.length > 0, + }) }) - }).catch(err => { - this.setData({ - gridList: [], - changeGridList: [] + .catch((err) => { + this.setData({ + gridList: [], + changeGridList: [], + }) + console.log(err) }) - console.log(err) - }) }, // 切换网格 changeGrid(e) { const buttonList = [] - this.data.gridList.forEach(item => { + this.data.gridList.forEach((item) => { buttonList.push({ id: item.gridId, - text: item.grid + text: item.grid, }) }) - const index = buttonList.findIndex(item => item.id === e.detail.gridId) + const index = buttonList.findIndex((item) => item.id === e.detail.gridId) if (index > -1) { buttonList.splice(index, 1) } this.setData({ - changeGridList: buttonList + changeGridList: buttonList, }) const that = this $wuxActionSheet().showSheet({ @@ -77,19 +87,19 @@ Page({ buttonClicked(index, item) { that.setData({ 'gridInfo.gridId': item.id, - 'gridInfo.gridName': item.text + 'gridInfo.gridName': item.text, }) return true }, cancelText: '取消', - cancel() { }, - destructiveButtonClicked() { }, + cancel() {}, + destructiveButtonClicked() {}, }) }, - selectTabChange (e) { + selectTabChange(e) { this.setData({ selectTab: e.detail.tab, - partyFlag: e.detail.partyFlag + partyFlag: e.detail.partyFlag, }) - } -}) \ No newline at end of file + }, +}) diff --git a/epdc-resident-mp-yushan/pages/mine/mine.js b/epdc-resident-mp-yushan/pages/mine/mine.js index 459a521..a8c7ec9 100644 --- a/epdc-resident-mp-yushan/pages/mine/mine.js +++ b/epdc-resident-mp-yushan/pages/mine/mine.js @@ -17,33 +17,34 @@ Page({ userInfo: { faceImg: '', nickname: '', - partyFlag: '', + partyFlag: '', // 0不是党员 1是党员 points: 0, - grade: 0 + grade: 0, + showIdentityFlag: 0, // 是否亮过身份 0 否 1 是 }, completeInfoDialogVisible: false, - infoCompleted: 0 + infoCompleted: 0, }, - onLoad () { + onLoad() { this.getUserInfo() this.setData({ - infoCompleted: app.globalData.infoCompleted + infoCompleted: app.globalData.infoCompleted, }) }, - onShow () { + onShow() { if (!app.globalData.previewImage) { this.data.pageNo = 1 this.data.pageSize = 10 this.setData({ nomoreVisible: false, nomoreStatus: 'loading', - preloadVisible: true + preloadVisible: true, }) if (this.data.selectedTabBar === 'issue') { this.getIssueList() } else if (this.data.selectedTabBar === 'project') { this.getProjectList() - } else if (this.data.selectedTabBar === 'topic') { + } else if (this.data.selectedTabBar === 'topic') { this.getTopicList() } } @@ -53,7 +54,7 @@ Page({ // 触底 上拉加载 onReachBottom() { this.setData({ - nomoreVisible: true + nomoreVisible: true, }) if (this.data.selectedTabBar === 'topic') { if (this.data.nomoreStatus === 'loading') { @@ -61,7 +62,7 @@ Page({ this.loadMoreTopicList() } else { this.setData({ - nomoreVisible: true + nomoreVisible: true, }) } } else if (this.data.selectedTabBar === 'project') { @@ -70,17 +71,17 @@ Page({ this.loadMoreProjectList() } else { this.setData({ - nomoreVisible: true + nomoreVisible: true, }) } } }, // tab 切换 - chooseTabBar (e) { + chooseTabBar(e) { this.setData({ nomoreVisible: false, nomoreStatus: 'loading', - preloadVisible: true + preloadVisible: true, }) this.data.pageNo = 1 this.data.pageSize = 10 @@ -92,216 +93,265 @@ Page({ this.getProjectList() } else if (e.currentTarget.dataset.type === 'topic') { this.getTopicList() - } + } this.setData({ - selectedTabBar: e.currentTarget.dataset.type + selectedTabBar: e.currentTarget.dataset.type, }) }, // 获取 我的话题列表 - getTopicList () { + getTopicList() { this.setData({ - topicList: [] + topicList: [], }) const para = { pageIndex: this.data.pageNo, - pageSize: this.data.pageSize + pageSize: this.data.pageSize, } - api.getMyTopicList(para).then(res => { - console.log('我的话题列表', res) - this.setData({ - topicList: [...res.data], - nomoreStatus: res.data.length === 10 ? 'loading' : 'none', - preloadVisible: false + api + .getMyTopicList(para) + .then((res) => { + console.log('我的话题列表', res) + this.setData({ + topicList: [...res.data], + nomoreStatus: res.data.length === 10 ? 'loading' : 'none', + preloadVisible: false, + }) }) - }).catch(err => { - this.setData({ - topicList: [], - nomoreStatus: 'none', - preloadVisible: false + .catch((err) => { + this.setData({ + topicList: [], + nomoreStatus: 'none', + preloadVisible: false, + }) + console.log(err) }) - console.log(err) - }) }, // 获取 我的话题列表 上拉加载 - loadMoreTopicList () { + loadMoreTopicList() { const para = { pageIndex: this.data.pageNo, - pageSize: this.data.pageSize + pageSize: this.data.pageSize, } - api.getMyTopicList(para).then(res => { - console.log('我的话题列表', res) - const topicList = [...this.data.topicList, ...res.data] - this.setData({ - nomoreStatus: res.data.length === 10 ? 'loading' : 'none', - preloadVisible: false, - topicList, + api + .getMyTopicList(para) + .then((res) => { + console.log('我的话题列表', res) + const topicList = [...this.data.topicList, ...res.data] + this.setData({ + nomoreStatus: res.data.length === 10 ? 'loading' : 'none', + preloadVisible: false, + topicList, + }) }) - }).catch(err => { - this.setData({ - topicList: [], - nomoreStatus: 'none', - preloadVisible: false + .catch((err) => { + this.setData({ + topicList: [], + nomoreStatus: 'none', + preloadVisible: false, + }) + console.log(err) }) - console.log(err) - }) }, // 获取 我的议题列表 - getIssueList () { + getIssueList() { this.setData({ - issueList: [] + issueList: [], }) - api.getMyIssueList().then(res => { - console.log('我的议题列表', res) - this.setData({ - issueList: [...res.data], - nomoreStatus: 'none', - preloadVisible: false + api + .getMyIssueList() + .then((res) => { + console.log('我的议题列表', res) + this.setData({ + issueList: [...res.data], + nomoreStatus: 'none', + preloadVisible: false, + }) }) - }).catch(err => { - this.setData({ - issueList: [], - nomoreStatus: 'none', - preloadVisible: false + .catch((err) => { + this.setData({ + issueList: [], + nomoreStatus: 'none', + preloadVisible: false, + }) + console.log(err) }) - console.log(err) - }) }, // 获取 我的项目列表 - getProjectList () { + getProjectList() { this.setData({ - projectList: [] + projectList: [], }) this.data.timestamp = getTimestamp() const para = { pageIndex: this.data.pageNo, pageSize: this.data.pageSize, - timestamp: this.data.timestamp + timestamp: this.data.timestamp, } - api.getMyProjectList(para).then(res => { - console.log('我的项目列表', res) - this.setData({ - projectList: [...res.data], - nomoreStatus: res.data.length === 10 ? 'loading' : 'none', - preloadVisible: false + api + .getMyProjectList(para) + .then((res) => { + console.log('我的项目列表', res) + this.setData({ + projectList: [...res.data], + nomoreStatus: res.data.length === 10 ? 'loading' : 'none', + preloadVisible: false, + }) }) - }).catch(err => { - this.setData({ - projectList: [], - nomoreStatus: 'none', - preloadVisible: false + .catch((err) => { + this.setData({ + projectList: [], + nomoreStatus: 'none', + preloadVisible: false, + }) + console.log(err) }) - console.log(err) - }) }, // 获取 我的项目列表 上拉加载 - loadMoreProjectList () { + loadMoreProjectList() { const para = { pageIndex: this.data.pageNo, pageSize: this.data.pageSize, - timestamp: this.data.timestamp + timestamp: this.data.timestamp, } - api.getMyProjectList(para).then(res => { - console.log('我的项目列表', res) - const projectList = [...this.data.projectList,...res.data] - this.setData({ - nomoreStatus: res.data.length === 10 ? 'loading' : 'none', - preloadVisible: false, - projectList, + api + .getMyProjectList(para) + .then((res) => { + console.log('我的项目列表', res) + const projectList = [...this.data.projectList, ...res.data] + this.setData({ + nomoreStatus: res.data.length === 10 ? 'loading' : 'none', + preloadVisible: false, + projectList, + }) }) - }).catch(err => { - this.setData({ - projectList: [], - nomoreStatus: 'none', - preloadVisible: false + .catch((err) => { + this.setData({ + projectList: [], + nomoreStatus: 'none', + preloadVisible: false, + }) + console.log(err) }) - console.log(err) - }) }, // 获取用户信息 - getUserInfo () { - api.getUserInfo().then(res => { - console.log('用户信息', res) - const userInfo = {} - for(const key in this.data.userInfo) { - userInfo[key] = res.data[key] - } - this.setData({ - userInfo - }) - }).catch(err => { - this.setData({ - userInfo: { - faceImg: '', - nickname: '', - points: 0, - grade: 0 + getUserInfo() { + api + .getUserInfo() + .then((res) => { + console.log('用户信息', res) + const userInfo = {} + for (const key in this.data.userInfo) { + userInfo[key] = res.data[key] } + this.setData({ + userInfo, + }) + }) + .catch((err) => { + this.setData({ + userInfo: { + faceImg: '', + nickname: '', + points: 0, + grade: 0, + }, + }) + console.log(err) }) - console.log(err) - }) }, // 完善信息 - navigateToComplete () { + navigateToComplete() { wx.navigateTo({ - url: '/pages/complete/complete' + url: '/pages/complete/complete', }) }, // 议题列表 跳转详情 - toIssueDetail (e) { + toIssueDetail(e) { const { issueId, state } = e.detail if (state !== '待审核' && state !== '未通过') { wx.navigateTo({ - url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=issue&detailId=${issueId}` + url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=issue&detailId=${issueId}`, }) } else if (state === '待审核' || state === '未通过') { wx.navigateTo({ - url: `/subpages/mine/pages/eventDetail/eventDetail?eventId=${issueId}&eventType=${state}` + url: `/subpages/mine/pages/eventDetail/eventDetail?eventId=${issueId}&eventType=${state}`, }) } }, // 项目列表 跳转详情 - toProjectDetail (e) { + toProjectDetail(e) { const { itemId } = e.detail wx.navigateTo({ - url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=project&detailId=${itemId}` + url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=project&detailId=${itemId}`, }) }, // 话题列表 跳转详情 - toTopicDetail (e) { + toTopicDetail(e) { const { topicId } = e.detail wx.navigateTo({ - url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${topicId}` + url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${topicId}`, }) }, // 我要报事 - addIssue () { + addIssue() { if (this.data.infoCompleted == 0) { this.setData({ - completeInfoDialogVisible: !this.data.completeInfoDialogVisible + completeInfoDialogVisible: !this.data.completeInfoDialogVisible, }) return false } wx.navigateTo({ - url: '/subpages/discussion/pages/addIssue/addIssue' + url: '/subpages/discussion/pages/addIssue/addIssue', }) }, // 跳转到 邀请记录 - navigateToInviteRecord () { + navigateToInviteRecord() { wx.navigateTo({ - url: '/subpages/mine/pages/inviteRecord/inviteRecord' + url: '/subpages/mine/pages/inviteRecord/inviteRecord', }) }, // 跳转到 网格管理 - navigateToGridManage () { + navigateToGridManage() { wx.navigateTo({ - url: '/subpages/mine/pages/gridManage/gridManage' + url: '/subpages/mine/pages/gridManage/gridManage', }) }, //跳转到积分中心 - navigateToIntegralCentre () { - this.getUserInfo();//防止积分变化 + navigateToIntegralCentre() { + this.getUserInfo() //防止积分变化 wx.navigateTo({ - url: "/subpages/integralCentre/pages/index/index?points=" + this.data.userInfo.points + url: + '/subpages/integralCentre/pages/index/index?points=' + + this.data.userInfo.points, }) - } -}) \ No newline at end of file + }, + // 点亮徽章 + navigateToStatus() { + if (this.data.infoCompleted == 0) { + this.setData({ + completeInfoDialogVisible: !this.data.completeInfoDialogVisible, + }) + return false + } + if (this.data.userInfo.partyFlag === '0') { + wx.showModal({ + title: '提示', + content: '只有党员才可点亮徽章,是否要去认证为党员', + cancelText: '是', + confirmText: '否', + success(res) { + if (res.confirm) { + } else if (res.cancel) { + wx.navigateTo({ + url: `/pages/complete/complete?selectTab=partyMember`, + }) + } + }, + }) + } else { + wx.navigateTo({ + url: `/subpages/status/pages/brightStatus/brightStatus?showIdentityFlag=${this.data.userInfo.showIdentityFlag}`, + }) + } + }, +}) diff --git a/epdc-resident-mp-yushan/pages/mine/mine.json b/epdc-resident-mp-yushan/pages/mine/mine.json index a660765..557dd86 100644 --- a/epdc-resident-mp-yushan/pages/mine/mine.json +++ b/epdc-resident-mp-yushan/pages/mine/mine.json @@ -9,5 +9,7 @@ "preload-topic-item": "./components/preloadTopicItem/preloadTopicItem", "load-more": "../../components/loadMore/loadMore", "completeInfo-dialog": "../../components/completeInfoDialog/completeInfoDialog" - } + }, + "navigationBarBackgroundColor": "#e40000", + "navigationBarTextStyle": "white" } \ No newline at end of file diff --git a/epdc-resident-mp-yushan/pages/mine/mine.wxml b/epdc-resident-mp-yushan/pages/mine/mine.wxml index 1356c98..0865e85 100644 --- a/epdc-resident-mp-yushan/pages/mine/mine.wxml +++ b/epdc-resident-mp-yushan/pages/mine/mine.wxml @@ -1,8 +1,6 @@ - - @@ -26,11 +24,14 @@ - 等级：{{userInfo.grade}} - - 积分：{{userInfo.points}} - - + + + 等级：{{userInfo.grade}} + + + + 积分：{{userInfo.points}} +