From 2c79edb80c3d525f3646739c392c552ee93ec8f1 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Fri, 22 Mar 2024 16:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=AE=8C=E6=88=90=E8=A6=81=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E7=AD=89=E5=BE=85=E5=92=8C=E5=AE=A1=E6=89=B9=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E5=92=8C=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 17 +++- assets/tabbar/home.png | Bin 0 -> 6372 bytes assets/tabbar/home_select.png | Bin 0 -> 6494 bytes assets/tabbar/my.png | Bin 0 -> 7243 bytes assets/tabbar/my_select.png | Bin 0 -> 7525 bytes pages/apply/index.js | 88 +++++++++++++++++ pages/apply/index.json | 5 + pages/apply/index.wxml | 11 +++ pages/apply/index.wxss | 26 +++++ pages/login/index.js | 9 ++ pages/member/components/memberManage/index.js | 2 +- pages/my/index.js | 5 +- pages/my/index.wxml | 2 +- pages/qrCode/index.js | 22 ++++- pages/qrCode/index.json | 6 +- pages/qrCode/index.wxml | 4 +- pages/qrCode/index.wxss | 3 +- pages/waitApprove/index.js | 93 ++++++++++++++++++ pages/waitApprove/index.json | 6 ++ pages/waitApprove/index.wxml | 21 ++++ pages/waitApprove/index.wxss | 25 +++++ project.config.json | 43 +++++--- service/user.js | 19 +++- utils/index.js | 1 + 24 files changed, 378 insertions(+), 30 deletions(-) create mode 100644 assets/tabbar/home.png create mode 100644 assets/tabbar/home_select.png create mode 100644 assets/tabbar/my.png create mode 100644 assets/tabbar/my_select.png create mode 100644 pages/apply/index.js create mode 100644 pages/apply/index.json create mode 100644 pages/apply/index.wxml create mode 100644 pages/apply/index.wxss create mode 100644 pages/waitApprove/index.js create mode 100644 pages/waitApprove/index.json create mode 100644 pages/waitApprove/index.wxml create mode 100644 pages/waitApprove/index.wxss diff --git a/app.json b/app.json index 4cec556..28d7ac0 100644 --- a/app.json +++ b/app.json @@ -1,29 +1,36 @@ { "pages": [ "pages/login/index", - "pages/invoiceList/index", + "pages/apply/index", + "pages/qrCode/index", + "pages/waitApprove/index", + "pages/home/index", "pages/rechargeRecord/index", + "pages/invoiceList/index", "pages/meterList/index", "pages/recharge/index", "pages/handleLogin/index", "pages/member/index", "pages/my/index", "pages/questions/index", - "pages/home/index", "pages/index/index", - "pages/qrCode/index", "pages/invoiceDetail/index", "pages/editInvoice/index" + ], "tabBar": { "list": [ { "pagePath": "pages/home/index", - "text": "首页" + "text": "首页", + "iconPath": "/assets/tabbar/home.png", + "selectedIconPath": "/assets/tabbar/home_select.png" }, { "pagePath": "pages/my/index", - "text": "我的" + "text": "我的", + "iconPath": "/assets/tabbar/my.png", + "selectedIconPath": "/assets/tabbar/my_select.png" } ] }, diff --git a/assets/tabbar/home.png b/assets/tabbar/home.png new file mode 100644 index 0000000000000000000000000000000000000000..87859b46d618b02118c92ec43c761ea8ecfa6103 GIT binary patch literal 6372 zcmbt(cT^MIxAssC5HO*H&?F$CNGKr|kRF4Cpp>X|>CyvIL=i-~p@>LF6fqi*rt~6G zl+Zg;gMwhemyY}>g1|TL_x=2XYc(?yqSq1FSjT+006v3 zL;@LXyZ${PoZz+0>P;Tlumq9~@xYq_@qYjSnP)`Mzk0`h<$7rL^=r3gm-?W%wvw>l zQi2R=>_uc+xAy+$ZW+SY+TB)ZD|j_*iEZNolLY7SD0=G!Uvbw@$b=xuB4`GYHpQ21 zPZ(YLx!SY_{q)#_y@uc1yCR2>+V@$bc1^9@y^R z-U(T55{5Kqv$#3hb4D~cab`#U5pj%M|K-SuaE##i*cSb759!D`k8Q;fwPq$uE+8Ev zgNU?-+zs%C@$F&L`4|=i@qx^fMv+J0&HqXyj=!uX^O!`?kbrTP@ru6SthZPy5ndE!+v&ZUoyddG$=zH}Ur+_-lXEohZgp~{9y z5xhtp-*b{;c+D5+$kN}(A=BpgK--OcmvTy)ilCM}8HNIOOZ$iWxsmZ z8$W)0sfV+`cEH=b@(%ENwEPx4;%_zfw-kjyTdldb~&y&Apte6a|EC@@l1 zGmeL}a1CwZrRNKyQ1#ONXEk3aAt3&lHRCVwRDEYF%lajHdRC)o)pZw6E7U`cfZ8D& zUFjIB#pNOP3&3vm+J4pbmlVFz@;Nz(~8C3xC!#E+xiWi2W(R!?DWZ};yUjP3VQ*L^d|_V}2w$EuhVc27%^ zHYXq_8IM&7*pA+EHcO1SElfAm%z|wl#&CP9G zFtNRJMfakip@SL@=VE~0D&E~B_aw?YubhS=h)GG_Wk2&ldG)WauRpc* zQOxM!azZk5T(e&{sq8f$A-GFTJ~&1ax~j+bjHDP?xE(^Rsim-R;p2_o%mXi}mm3=! z-wF!~nlUl?HtTm9(*tj2=8%_C?3(NjiW!B)KADEnk@GIcWQZXVT`WbTHfwOaIN`C=;O1einf&_)tlr8= z55>-H?`&;NJ&Ip|)off=KxcfV;=PohJg$f%o26nHEm0o*JcVp;5OYSQkHKK*Z{>X7 zB2d1l(8GA)7SnCzdU@JB!bw=EYiC)$zHDAQLJQfS6elc?*xVNZW`?@PH;!gg$<55+ zvlDI-DlpCZBy8|cR0C`yS|1h`!;X=r3dO_bAHu)<#5u^(!#F^lAA_p(7VG4;bE3cF z89N;M>;C-Z*(g%cG)u&y;-C9O1*7H$#;f-;3#5kAI)7F%=kr&OnUfGf?Q_tY+S!VMhHGD!T#Z)a;@i-N7<1+ zWW$2CeIk>bM~WGDQs%NUkSwsatS;om|wT{nGR2eZk%>M$6eRP2* zZL7vwPXe7nq6ZL=aXiW@kMKdrIANj0cJ&$^+Uc||3vWuh@s`k$CYe-xV<&zuBQvlQ z;=1{>-!S<0?dfX`S0{4m=?*kjZ`ow*PaJhuIpHkKUj`CYkazA9Tu$hsA;h&Uj(2cv zY3U^<>CZ)lAJ?xM5!pJCfhVQO&obz*(rXKxSKof-VXVIVwYXTR$x`%Y!dRijgdxjumyZ2zg4)(n0Lsy6M#_VmCJKVw zVn(fMoV1$5Y*Jw5kI;pz{5}Lu#bP~F<{dt+J&N)_dQj;KXf{qddmRUPMFL-4B^@hX+Z;CPLK2?4| z@;_T!yaer<*w>VRY&!@88CcnLyuk4o{Pxw7u{rQqBY&;oxk%|gI#WYGx^E!3_AM@g9{Iv8oL4E~Lp!a)tpJe{td%Gil@+MOV*9NZbq)0Qi< zsqqqq+Z#JFZBQUg^ftbGcS^92rL|TSYRRFmx9ycJ{iYi0bdxbv6mxhoEc6jWCGjY=N?ENjp*zmKn{Fo6>82ZWZ z;E6=Km|P$f*O*D%CmTK;zFJaxgD3LM!*7}o27>{s<^97W*xVUj*-cROk#E_}zLqPh z0I;*)JXpxtA@d2j8BBP8reHtZcRSh#MC*CFaTeLv^(BO&n{{N$X{hhheA;Tw4< zh`nLtST~YXR0p(D2;zT5;ll2Jw(h!d&}zc3mEHN#!jGO;RzQ!%M-!xKR6sk9tN%4j zIDwk?9o$6xX+FBbt>u+;iTjnEa!bdiR`Ih?hg5Q^IPK!)aLsQbE{8Dq8fvla>h0S* zG&W-=0Vlbr?x%Xy6k-m0ut_ChvG`xWU;}g(MD5rb>x>mB zLg;3-z6i3{8DKK!yLy6Z=-s=SO18B=Pg#38PM!e`K!FRVk}l;fT(^=Je4VLLzs@+z zg;eb*Exms!%!xJo-W#A?s|?pmhEvIl*MW5r?tqV~T5qi|;SX68u_G>yK|w)XGrnVa z+75(aFJxSJg_VrPu-l6}Pn2QvO1bV6UgVV0Pc$OG3&BOto3a!?Ib9}fxcPMAdd#W}|im|W>_}pq^XSF7@ zP1Ww7kUW)`-FTSuRfyBl_cL23(qBtT@VrdFdxLWS5qpHb6hj%9OrqY%t=o(LYaz3J zKmM)T-|W-@@WmzY4JJdoCYR@3V-_DDpU$TFYdhupU7K2=grh)Z!h0-)wfJMY;0xTv zXDnIoDa>k5e^b*(Lh%Q4#$h3Ob??mNQ=UF^ide35aI%810PTT1fphBm;=%R)KJw0ckm4=ElQDI_UK77$tE_0q|b zK*aGhcJ`Z5Yx}ysrvt?&E%J=%=Ic*nJMg&9un=6wUy}ouc~yf_91d4_oR?QSTTrnA ze9n>$=%xrspU~WgWHU|9*v@qqMHOqmRe-S0+|LUlz;-+PrwcCU+7EsCLYeS=hKI%d z`sW|(YM-gf&NN3fKj=A8Os015@hY z?hXQTJ{)&#x?1pkT6J6PCQk2h9T*E1EK9EKUm{C?-FyBj-H)0m5UQ8a`y*;0MAo-0 z^Z>SzkAf5&XS_h2_w-qoe8y7zo-*_P4>7b69ix8ou3*c?YfAiX2*sGN{A0U<17ChU zc(J1Mgy!zw&B5n6iNGmZT1s#8ut$Mb3@RE~wc8r8iUQf%d_FJ_TEomM?T_4~m@<fSexJ^pA2_rDBdH#xrDFU`bSoK5W3!)?Y6bn4rRB5Mp=T3PQny)%r%ntCOqtTtu zlarHDV_sWofch~w#cX>`8|)4|_1V<`a zXY=BJe*OC8|LN1G#I%uPK;z#2e%-)K%X7iB5naEKZz3@PL8BE(*xKbu5voUBA}1cA zm=xYq0NVibMj^+ESf_g5g@I>F#&mK<U;iA0uJj-t9O)a7rWW%N$^Rt$>|T zCMePe*diLqG&Bh}{ZZBK3I=gSNo-g-BoLkI4zn!yS&r+li=kHBEJHWCu~^BB8-5IyZRJk#NFoBV!p%%CCm_ACIrm zmX3d?SQ1B12#CeaDY{AWolwN`KCOIGSAXw^h>Ucg%~I&Myg|VVg@Db|i?7S|x;~vf z=ZJ{+otSb#v~5>!=I2xq5u2H=UB99HkxjvQ+S|cZQ&kWinU4`9=O<@qOV_L^4G)4_ zYKaP_UKVndnRTxYzKbv(>z8fq$HF87PwNgX>j1l1UN!GLJv_QB79QRzb7(m%pP8|@ z#aeJn9f||V$s96_DRNK2dk>H_>LXsQD}_^%LTKSXEl1y!J|?GLojYGX$1DvNmd+DC zgOXxcg2<6DH!+0v4)I3bWMj+I7e`jNd_FihNaHIw_9P5X3b_W=br&w%>fho>9njgn zlAJ#BMoqTG3iUmGfHxaW%OI<;N4TF_duI>aEL__cu4i`E*laOJ82bPf0m`c69jw%s=~*MtvO7;-5e{mqOD_}EB&k1 zP5U3~1Qp{7^;fkoxOiSk8Q@+2`v?YhEMYsRT#r_s(R$XH;I5F_Am2|8vra&NSf5_# z!BN=~txfM{&i9frd_@$GkF1_V_^h*r8Kch1oJcG0A5k&Sbe^-tBn~~d1RXM+{fU$d0tn)Tgk2Fvq;xoEJf1(6k{KRfDafN6ZI+~b z8wy&x-Z@e|g)xX)l`*$+^E7i)K;-GmU(C|v1ear1p(jq97hyb;;qJxo_F&pS;vnt6 z0y@8f`VYxFq{}DjZ~M zK6fZpcSu*^h}TiIsz2!duk{(WERNbh(r)w77jNMa!<03r?ye=2m#^}4_pQ} zm6Zj#>lhoC+vGm|n~U-R&3T;gQOYaphBL_#Mf+mHZ$Z4~=*?1@MNG6zh36oMVEB}V zwi(92I?v@oyuuJvftNcZg+c#HpU36}9L^f%r0bl(L>=|{WPhce=#^tYAy}%Ix%7@( zyV|3++#er{g%#E&7yMGH(i05`j!yqQC~8wPnXkm|oTMQJU-QITK7QgJ*=H&YTmq|N z+=IBdaQ^sF1hOtxZ?UQ?15aJDX*DmEwMOx9yQ2QdZMQOtpBp{PT5(S?t5*^X=+W4{ zoOe7tuD(4i`4omz=#T|#1&f%AGM>@bd~Q|~V}%+NA|m7H&K0|Qi!ByhqCT3Dlg+38 zFX;0Br}3XRn3Mzg889z>5-eb7JAeuWInU?lm^i^= z0xHJJE_7*3@_``ta}$1uv@pFD6AtVYp#z9(m)<$AxLIjmmCgH$dTm+MX# zu9da>c6h^WE|8L!kxBWo*$>9X**`yK&>%ydnxYpxcn)Nv!xpkavr<4N9?v?Z{l8NZ bd30<-!`{K~=pHNh+X65$Fd@9bJ4XE<8%Mc& literal 0 HcmV?d00001 diff --git a/assets/tabbar/home_select.png b/assets/tabbar/home_select.png new file mode 100644 index 0000000000000000000000000000000000000000..609f7a707560e391132b637f56b88e42f4e9d922 GIT binary patch literal 6494 zcmd5>S3DfRw_aws)_(>E%`{tn4-{Ps>)1xnhc(SaU;fPg^w zy%kcJnnobXDjt$tP7BX}E85gWQTqL#AMf@KNG;KnVdV5%W4UM(BBoKvs*A?H$R8|9 ziIX%@=2nuL_j&J-oEVm|ZE0FuT3Tv&rMMZmId?GUW?(*F5&&JJClAAWu%edlvOvhY z9Z?`e^&OV;+mt)W5wY>rzG_s;x8rOK+5hczgjRUB9U3J z=7tmtvGRW!!ouXAX{vDd$&{>%Mc~goyA(6sVg%3$_eWW+0ksM241^<@0Yz~|cUnMx zT!5>Mc0oeDa_i%>SQ@?R!aK1jHlu&{Y#Ly|rErWOpykCTdNKz6k zRw5R0Q5{qgqgQL zA=l>_57JjYe&YKSs+A-30k(IcIVp$ua`>R9AIquzfteZs{CKBhOyfe07uiTV%%Fzd zOz(aK?a>QFLcw0qKBWiT0HtJBGp2p=9%)fi8Rn)LqEgOY@1MSd>C%yoK>KJ<#d)ok z*Q(RTNgJ6YG~jxsQ?~<@0qlby7*zy->d_d6nF^h)$pXQP>w)HXW&xqfH;kS_z((xS zG_PqYH1KFRH}z*rUoHR(x6R#o%70+wk>M_lh+ou`Y%5JxoW6 z#EAn?(R>&MT4d|LNuAN1=*I$$vW=EXZCPJG4d0I0V911azM7fipswH8R4#pyCV0lF zzIHX&Szq#Vsz%Lfcdcr3vW9`wg5q8VY2zb00P5~HvyP3X!5R+gWzu6`fuH-b8CXn+ z5t-s7qWxp=Wq19z1Ej;*9VJY!MiQ-YL0#jc09Cw#d=UT`7%(h7NF7sqO%>p;srZSk zvyC#QGL5U_JiFP0mfB2R4Gm{tG^_ucOVa*Pq}I_t#=CuB_q2|KV=n6|c9jwh5$HxiVRwgx)_&okID+MN*mo{4_T<2De8 zLqy|l!$L1>o_z-!>DusaZu-$&3ao|cyxPxp*pR(COT%61k2I$Ss7jN@`$std6;mLh z^?RZt@QjMKj8bABv-plq@5pR!v4?TDIKinoma=r)1`WqjMjMHxTD3Z_q_Im~&;|O* zB<{aWX`R4QL>)NB{E_OBUg!;*7#BxC+&pPgng=_4tk=`KVGZq#03@Pw{-wMf35A)IZOwa>!`#1< zClPt`1919nPXDsSHuAohpDC+)eWg zu!oa;n)TQ4p6CM0vjIT+>AUfk1gDC9v3~hUf1BDAl!Dv*&yOue8HcBy57ABTt=0X9 zL6ec6S-9hUN^8hN{mgzrgLl_%q)zSMp%s=qPlbLTH+|(WQ!9J$$tpD#pkgc=?^YE$ z!OCkl%}lc9*Et-NFl{|`74iINP0fiC-!G7gRn+TxCeGJMk(2E~VMv*;rVY~-PKt8; zEb@XPySd|7&|Uf~9s8|czzpn9KO-h#Lo$cQT$MJ%8h)<@O5{5Iljgi_evE&%`JdLfd13|TT_SK@ft zMPYqXg?v%x?bW#aYpvzh$;q3-~RVDgyquwH7Z|h5H8KO#)7Tx%vIBXsb*Z z8L9lLt7tQF$zJ3_7}S0$x$fW7&q)%>7+LADk%+{zH+1gn)T%|t^L8@i1fIz~^^*V+ z?`{Iz?h`g!Fqpb`6DKd(dNS=-MSm-CyYwQyWY<4ny~;{!Ka1j6`Mf&x8zWjQwH1I? za^qw;k+-Zq#>soOUQQcr(DNkr_bte$jB>8y7)Y=s&L3AJQaR5kXqy}Cwlpq;;F!TA zev*_vOW*#N>;HURmZPlc;?Q99Ll-VuQNK+uajO~*A-`s?%3oko%oxhPZ1fH2M58E- zOA+^@==m$LhldCT>{nbS7QX%FN)y)?lpfuIXI!SVJho^JU@7X#5ADUAIZ`g=VQit7 zPHky?L-QxS84KrE`T;VvCuw^7J-TJ+UG%IJbIcJ$l%<8;AF0h`g(ATpqP(AW|B z!fR;g>bUq-plF|jd$;ogyq={U7r|^7>A^6Vpq>d8ugR8js!`LcaKSK|uM>URvuOhy_8q$5C~Soo87P;o9g_FL zCUe#5snXcf6X_h3if^2}PCZpSJCYp(qg)p61lI>_|Aa6jJhHE z=<9D^0sqD&s;i#hP?D$lS03<&TW>E~U1w)!OuAFQ*>S1%F!D(2m60V^{x#%rzm_@? z(3CX{<9c)49e}KOz{+FyMnwlzFX3^RoysP=a_OgB2ONn#Qw&{F#ZckhBVS9U`?A~j ze)y;+nc9*F_!sU35p#ac=R=cy-N>JDh_SI1Ogt%Bc=oQSGVqHgU{NHC{0ES=?Kst_NnAZA&GkhS7gNn}=s13UqM0G0OiQi$`v}7M^2&L4;o!OwoX1D-A zH&tB1^ZV~oCYkEZgOKFivL2G9d(~PmxjX>~Bah)dS@{Z(T_E|1?e#ROoIknlQ0d+7 ziu;t2>;CF;r60tWCsD8R1dI5qGE}idbVnLw`EWXdU&J#^TMo$dj}4kKyCnLY11@Z4 znTKpI>=pD3Dj`JkSfm3l(nuv*w}RaV-Z}+Fkm`z$vu@SwNy!`zdKO=ew{+K+6~UWa zqDO}COymX2z!B;eF3@;0Gsi!~W&Z1-e|COwHE<_tX6M2ZZAA?d;U_JY{uHn~Dypa@ zYNbNMq}4clZG+C`=Z^AQ$B72Wz$9KU#F4ZZ`SZj5a>CZ1KBp=1BJY=P>8PSSm=MRm zza79WsjSQY_Qwwgxv6vNWeXP%P>|{3Eb2JeRW0Hrm0s-thm~XiDMjkTxCk(Bb>qpi zwNbfCKE+gJ1XeQrNBL4a{S6iJX7ezsv`OwxZ|3_n8}hmZi~Mj;Jn<1j0PN)@Lqk0u zRR_rEl7PZ;@Ht``{^w~F9-#~?&~>Y`Yh=ZJ2?SG=>-0kY{M7x|Sw9n0_S5Ix>G?ToTjyRCwq#VaNHSoJOsq1uxMO2<-G2_BB9Vz0-JzQaVzhUN2o;tuG57w;T8vwW;hBd4OFZ7;Q zWV>}Fwc&o3&f?7$Z3GV|wG-DLI|0wvs-};H6BH`EA@fx&=KZQeNr}5f4m7tF_Y8Sf z(%*VD3z@xmrL(#uqZ0@B*|j?TzAN)--jZKFm&Y8oG|oNt`w^yW7`S|CQCJv3x8Oz1 zGQV>{3Mk2aE3}vwnM0%ZPi?p8a|K;^9nm}(A;;z53E3!X6Yc` zKV}Mij=5iO8~e(Z4=-wa9PUSy8eX(x57N7D2L6n7;$Q(=);m4n{3BdH+DZ#CaL_u? z)^UnVOY?T2j$y*UDLy~PwZTerc1a$a4KFoa8rRtEOkOrSo_B3qIpviUF2RB;IL5$A zoT?sOzJcV(9oYhmKY^Cb!s8(%_sL)Lp1t4@qwIEulIq7?h0sft$4l112F{igA{na9 zVzd+^HeL)N*EifJTy{z{r3gIdyxy7DB4>y2-_@_>fNic^82GYkS|P`vw4Lg2fLRYB zGjxeiVzj{zDJE_(-hHOv2`heHGB7^;ZN;HwS_0ePCoG$<4N$Mqa zYRbTvX+@+`T=#Z0YHZ7GnG^AilLXj!k?Mn^eeJ=sqy^g^Y1cEGwlpUJ{9fSbA?lN6 z3;2+rQ|rH87rPSY$?2j2Xr#S+pL^qv4YC7Q_&{VpLuQGa8i;RTmMd{b2t6OX)zJ zTf!tzE%d1#+X!@I@=#p6G|M|N!tkU0EjTdxL#{TD0%C@Zlh4WLHSOr3;F~fK8V;S1 zazbmOEx&%{{p32ThR8I|usz_Oh;ay`NmKW?@jGG+7&e7q(djV^-0qkOE z_ZzzBMJ4yoRv9PjEOv?%47TAVdhs^J zu)Sjv?!zf(Zgt_NMpF!=Pzw$3E2MN}d6pkUP`#NDbGQJ_mEb&Y{Bz4hA?jgw^JjtB z!XHUd>o-yW%P+s6dFi2A6-U3%VuVK)XylV;<0zubr;G`1H!+gCf{Wh{mmyP)e^@%P zMWbqgl4+HDTom(py^aFG$Kb(xQ2b$pQxBJjzd6EFT-8{i(w}a-99z-R%j&iJMt5$9**AMsjggheyljG( zoHdSv+)nnr)h?dp?;J!N&C`)}90nFySKBy0Y8#ixjOYOj7n9iBg@}wU^&c4*h|;m4 z;c7zk?fkCj-Bf~09U*{6QXPXCWEClPC+HRsVU?=2KKbCd^S|S4m7J9RRWrH5_x$3? zwE69C&+}$;GX3v%cpnVniQ%Z#8C6?w@Sabp8w~)v)w8)?>`s@eZ`aDjWoikH5;EZ? ztf0OBM*N$yiB$AFDnANunCyKtWLih}7}-)090F6^=MF6hL@8~g-%X6mc^YLpEkQFM*;4fpjLs-=kMKY! zXo+T)p574I-J$Mzk@>6qLN|D>|H$)CTP@&l97E!c)!r?>q} z@O?u(2iv(=&f?3Jlvs7ACz(V>$(UEQl2ITz4->4lQV~BEl8;hjxamlk9JxV_m*@(`KV-Xh)*(7WK~*lH6_*?k}zGEz|Dci z3lp{19{vBjSo9A3RN?gqa>|H)O$ZgaSV!h|-lYhuNF=8gZPzCa=}hgtx5 zFU#3OQS9FB-RMuYvuZ2eRb^nbOUXAvmvwDf)_pj3M(jFw{^)2rVC;(aJ}L4^yL9m0 zl$%ljRLh0$PWJS_pq~C*YejWC5#nrLs`sH_2b8m`TK+>5sspc7wpXAo77qq|+(2$? zp9+bwyHbNY8N46-{nvlcgm%mFSv`iD*Y3165_O?AZ}H(ysDPm>4Pr^*hCGBfKVS=2 z?&t;I1ZUgcP8{5o^L2hLL`S6ZzzsMWZs13Kev-?Er)-WBbx*T3%E(qm@?n2PNxE*b zY2K^&j!2wo{vw(qSyOhAJChn;9o2%mi#Dzap#<^ECGcG*X~1QWcbZ3fAE_?qO+Qx7 zRELj=Ti;H5m$wa6F3`x--Gg~X;IGG8Fx@ns5t-BCF#Z={dmyJw zI_#_$VfejnvtEg41mEHX6P<{x-U6IsWZOkfad(MIb7Q;B{<0rVcuC z#y6N^#J!U|o~>R7eRLf52C_nMhtNt9mkg@wuY7zPM%#GB*bBPyw(4#BYHG*;PK>f_MUk`MR1us6V5j zas4YJ^3Z5`sd9uR8u}fBc8F<-yf2)|pYr{)K!{twfvtuL3ZTW^BChm2=Bl4eD(7z3 zD}+Nn89f=Eo@biK8z);oWVO~J^4{E(jOX@JaG>19Z7M?!|ur DCgkn+ literal 0 HcmV?d00001 diff --git a/assets/tabbar/my.png b/assets/tabbar/my.png new file mode 100644 index 0000000000000000000000000000000000000000..459b52ac340adbb287e2e32df664398a4e65a8a7 GIT binary patch literal 7243 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 F^FN{tqp1J@ literal 0 HcmV?d00001 diff --git a/assets/tabbar/my_select.png b/assets/tabbar/my_select.png new file mode 100644 index 0000000000000000000000000000000000000000..7895b8cb46876f1ad664cf413545a8f6f52b9957 GIT binary patch literal 7525 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 literal 0 HcmV?d00001 diff --git a/pages/apply/index.js b/pages/apply/index.js new file mode 100644 index 0000000..a8e3abf --- /dev/null +++ b/pages/apply/index.js @@ -0,0 +1,88 @@ +import { userApply } from "../../service/user"; +import { alertInfo, alertSuccess } from "../../utils/index"; +import request from '../../utils/request' +const { OK } = request; +// pages/apply/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + id: "", + name: "", + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { id, name } = options; + this.setData({ id, name }) + }, + exit() { + wx.exitMiniProgram() + }, + async join() { + const { id } = this.data; + const { code, message } = await userApply({ id }) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("加入成功") + setTimeout(() => { + wx.switchTab({ + url: '/pages/home/index', + }) + }, 500) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/apply/index.json b/pages/apply/index.json new file mode 100644 index 0000000..0b81116 --- /dev/null +++ b/pages/apply/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "van-button": "@vant/weapp/button/index" + } +} \ No newline at end of file diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml new file mode 100644 index 0000000..d1a7c88 --- /dev/null +++ b/pages/apply/index.wxml @@ -0,0 +1,11 @@ + + + + + 确定要加入{{name}}吗？ + + 退出 + 确认 + + + diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss new file mode 100644 index 0000000..de189a4 --- /dev/null +++ b/pages/apply/index.wxss @@ -0,0 +1,26 @@ +/* pages/apply/index.wxss */ + +.content { + width: 100vw; + height: 100vh; + display: flex; + justify-content: center; + align-items: center; +} + +.text { + text-align: center; + margin-bottom: 10vh; +} + +.operate { + display: flex; + margin-bottom: 6vh; +} + +.contentWrapper { + width: 60%; + margin-left: 40rpx; + margin-right: 40rpx; +} + diff --git a/pages/login/index.js b/pages/login/index.js index 3a85a81..1e2d3a0 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -24,6 +24,12 @@ Page({ if (!user || !user.id) { return; } + if (user.status === 0 || user.status === 2) { + wx.redirectTo({ + url: '/pages/waitApprove/index', + }) + return + } wx.switchTab({ url: '/pages/home/index', }) @@ -58,6 +64,9 @@ Page({ const { token, ...user } = data wx.setStorageSync('user', user) wx.setStorageSync('token', data?.token) + wx.switchTab({ + url: '/pages/home/index', + }) }) }, getPhoneNumber(e) { diff --git a/pages/member/components/memberManage/index.js b/pages/member/components/memberManage/index.js index 758a2bb..abbb82e 100644 --- a/pages/member/components/memberManage/index.js +++ b/pages/member/components/memberManage/index.js @@ -32,7 +32,7 @@ Component({ */ methods: { async init() { - const result = await getApproveList() + const result = await getApproveList(1) this.setData({ list: result.data }) diff --git a/pages/my/index.js b/pages/my/index.js index 54dcde4..7e2c43b 100644 --- a/pages/my/index.js +++ b/pages/my/index.js @@ -5,14 +5,15 @@ Page({ * 页面的初始数据 */ data: { - + user: {} }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + const user = wx.getStorageSync('user'); + this.setData({ user }) }, /** diff --git a/pages/my/index.wxml b/pages/my/index.wxml index 5fdebc6..585601c 100644 --- a/pages/my/index.wxml +++ b/pages/my/index.wxml @@ -5,7 +5,7 @@ - + + + + 扫码二维码，管理员同意后可进入 - \ No newline at end of file diff --git a/pages/qrCode/index.wxss b/pages/qrCode/index.wxss index a543372..832d66e 100644 --- a/pages/qrCode/index.wxss +++ b/pages/qrCode/index.wxss @@ -5,9 +5,10 @@ display: flex; justify-content: center; align-items: center; + flex-direction: column; } .text { text-align: center; - margin-bottom: 10vh; + margin-bottom: 15vh; } \ No newline at end of file diff --git a/pages/waitApprove/index.js b/pages/waitApprove/index.js new file mode 100644 index 0000000..81a2c6f --- /dev/null +++ b/pages/waitApprove/index.js @@ -0,0 +1,93 @@ +import { getUserInfo, reApprove } from "../../service/user" +import { alertInfo, alertSuccess } from '../../utils/index' +import request from "../../utils/request" +const { OK } = request; +// pages/waitApprove/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + user: {} + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getInfo() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + async getInfo() { + const { code, message, data } = await getUserInfo(); + // if (code !== OK) { + // alertInfo(message) + // return; + // } + this.setData({ + user: data + }) + }, + jumpToHome() { + wx.switchTab({ + url: '/page/home/index', + }) + }, + async handleReApprove() { + const { code, message, } = await reApprove(); + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("提交成功"); + this.getInfo(); + }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/waitApprove/index.json b/pages/waitApprove/index.json new file mode 100644 index 0000000..965cc67 --- /dev/null +++ b/pages/waitApprove/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-button": "@vant/weapp/button/index" + }, + "navigationBarTitleText": "" +} \ No newline at end of file diff --git a/pages/waitApprove/index.wxml b/pages/waitApprove/index.wxml new file mode 100644 index 0000000..10d305e --- /dev/null +++ b/pages/waitApprove/index.wxml @@ -0,0 +1,21 @@ + + + + 等待管理员审批中 + + 刷新 + + + + 管理员已同意 + + 进入系统 + + + + 管理员已拒绝 + + 重新提交 + + + \ No newline at end of file diff --git a/pages/waitApprove/index.wxss b/pages/waitApprove/index.wxss new file mode 100644 index 0000000..d39bdee --- /dev/null +++ b/pages/waitApprove/index.wxss @@ -0,0 +1,25 @@ +/* pages/waitApprove/index.wxss */ +.content { + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + margin: auto; + width: 600rpx; + height: 50vh; + display: flex; + flex-direction: column; + justify-content: space-between; +} + +.status { + text-align: center; + margin-bottom: 60rpx; +} + +.operate { + display: flex; + justify-content: center; +} + diff --git a/project.config.json b/project.config.json index e51e7b7..6958653 100644 --- a/project.config.json +++ b/project.config.json @@ -1,36 +1,55 @@ { "compileType": "miniprogram", - "libVersion": "trial", - "packOptions": { - "ignore": [], - "include": [] - }, "setting": { - "coverView": true, + "urlCheck": false, "es6": true, - "postcss": true, - "minified": true, "enhance": true, + "postcss": true, + "preloadBackgroundData": false, + "ignoreDevUnusedFiles": false, + "ignoreUploadUnusedFiles": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": false, + "autoAudits": false, "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "lazyloadPlaceholderEnable": false, + "useMultiFrameRuntime": true, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, - "condition": false, - "compileWorklet": true, + "enableEngineNative": false, + "useIsolateContext": true, + "userConfirmedBundleSwitch": false, "packNpmManually": true, "packNpmRelationList": [ { "packageJsonPath": "./package.json", "miniprogramNpmDistDir": "./" } - ] + ], + "minifyWXSS": true, + "showES6CompileOption": false, + "condition": false }, "condition": {}, "editorSetting": { - "tabIndent": "auto", + "tabIndent": "insertSpaces", "tabSize": 2 }, + "libVersion": "2.12.3", + "packOptions": { + "ignore": [], + "include": [] + }, "appid": "wxb34b4e70f8a5c6f1" } \ No newline at end of file diff --git a/service/user.js b/service/user.js index c033823..4c605ed 100644 --- a/service/user.js +++ b/service/user.js @@ -17,8 +17,8 @@ export const getWxCode = async function(data) { } // 获取扫描二维码的列表 -export const getApproveList = async function(data) { - return await GET('/wx/getApproveList', data); +export const getApproveList = async function(status=0) { + return await GET('/wx/getApproveList?status=' + status, ); } // 审批用户加入 @@ -29,4 +29,19 @@ export const approveUser = async function(data) { // 移除用户 export const removeUser = async function(data) { return await DELETE(`/wx/removeUser/${uid}`); +} + +// 获取用户最新信息 +export const getUserInfo = async function() { + return await GET('/wx/getUserInfo'); +} + +// 非管理员重新提交申请 +export const reApprove = async function() { + return await POST('/wx/reApprove'); +} + +// 非管理员重新提交申请 +export const userApply = async function(data) { + return await POST('/wx/apply', data); } \ No newline at end of file diff --git a/utils/index.js b/utils/index.js index ca69c18..7bd445b 100644 --- a/utils/index.js +++ b/utils/index.js @@ -48,6 +48,7 @@ export function getConfigByEnv() { break; // 体验版 case 'trial': + api = "https://zgd.hbhcbn.com/wxApi" break; // 正式版 case 'release':