From f0b06c1aeffe933c97481ac02b0c42ee4953ec54 Mon Sep 17 00:00:00 2001 From: chenJinxu <2183691628@qq.com> Date: Wed, 20 Dec 2023 16:57:03 +0800 Subject: [PATCH] =?UTF-8?q?`2023=E5=B9=B412=E6=9C=8820=E6=97=A5`=20FETURE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 增加 路由拦截 - 增加 登陆和绑定页面 - 修改 tabbar 图标 --- README.md | 6 + src/api/home.js | 4 - src/api/index.js | 7 - src/api/user.js | 20 +- src/assets/com-imges/55_03.png | Bin 0 -> 3297 bytes src/assets/com-imges/55_06.png | Bin 0 -> 14290 bytes src/assets/com-imges/55_10.png | Bin 0 -> 468 bytes src/assets/com-imges/55_14.png | Bin 0 -> 382 bytes src/assets/com-imges/55_17.png | Bin 0 -> 436 bytes src/assets/com-imges/55_20.png | Bin 0 -> 339 bytes src/assets/com-imges/55_22.png | Bin 0 -> 463 bytes src/assets/com-imges/55_25.png | Bin 0 -> 423 bytes src/assets/com-imges/55_33.png | Bin 0 -> 498 bytes src/assets/com-imges/55_36.png | Bin 0 -> 474 bytes src/assets/com-imges/55_38.png | Bin 0 -> 607 bytes src/assets/com-imges/55_41.png | Bin 0 -> 646 bytes src/assets/com-imges/55_44.png | Bin 0 -> 618 bytes src/assets/logo.png | Bin 6849 -> 0 bytes src/components/TabBar.vue | 30 ++- src/router/index.js | 15 ++ src/router/router.config.js | 12 ++ src/store/prefix.js | 2 +- src/views/login/bindDevices.vue | 134 +++++++++++++ src/views/login/login.scss | 43 +++++ src/views/login/login.vue | 177 ++++++++++++++++++ .../myself/deviceSetting/personInfos.vue | 43 +++-- 26 files changed, 456 insertions(+), 37 deletions(-) delete mode 100644 src/api/home.js delete mode 100644 src/api/index.js create mode 100644 src/assets/com-imges/55_03.png create mode 100644 src/assets/com-imges/55_06.png create mode 100644 src/assets/com-imges/55_10.png create mode 100644 src/assets/com-imges/55_14.png create mode 100644 src/assets/com-imges/55_17.png create mode 100644 src/assets/com-imges/55_20.png create mode 100644 src/assets/com-imges/55_22.png create mode 100644 src/assets/com-imges/55_25.png create mode 100644 src/assets/com-imges/55_33.png create mode 100644 src/assets/com-imges/55_36.png create mode 100644 src/assets/com-imges/55_38.png create mode 100644 src/assets/com-imges/55_41.png create mode 100644 src/assets/com-imges/55_44.png delete mode 100644 src/assets/logo.png create mode 100644 src/views/login/bindDevices.vue create mode 100644 src/views/login/login.scss create mode 100644 src/views/login/login.vue diff --git a/README.md b/README.md index e8df1db..0388989 100644 --- a/README.md +++ b/README.md @@ -46,3 +46,9 @@ npm run lint - 增加 封装 toast ,notify 和 dialog - 增加 亲情号码,增加/修改亲情号码页面 - 修改 tabBar 文件 + +`2023年12月20日` FETURE + +- 增加 路由拦截 +- 增加 登陆和绑定页面 +- 修改 tabbar 图标 diff --git a/src/api/home.js b/src/api/home.js deleted file mode 100644 index 94c599f..0000000 --- a/src/api/home.js +++ /dev/null @@ -1,4 +0,0 @@ -// import qs from 'qs' -// axios -// import request from '@/utils/request' -// home api diff --git a/src/api/index.js b/src/api/index.js deleted file mode 100644 index 0b6b13f..0000000 --- a/src/api/index.js +++ /dev/null @@ -1,7 +0,0 @@ -const api = { - Login: '/user/login', - UserInfo: '/user/userinfo', - UserName: '/user/name' -}; - -export default api; diff --git a/src/api/user.js b/src/api/user.js index 9363358..f652445 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -9,7 +9,9 @@ export const APIUser = { modifyPassword, alarmList, getAdminList, //管理员列表 - wxAutoLogin //微信自动登录 + wxAutoLogin, //微信自动登录 + getVerificationCode, //获取手机验证码 + wxLogin //微信登陆 }; export default APIUser; // 获取用户信息 @@ -85,3 +87,19 @@ function wxAutoLogin(params) { data: params }); } +function getVerificationCode(params) { + return request({ + url: `/api/User/VerificationCode`, + method: 'post', + headers: { AuthKey: 'key1' }, + data: params + }); +} +function wxLogin(params) { + return request({ + url: `/api/User/WxLogin`, + method: 'post', + headers: { AuthKey: 'key1' }, + data: params + }); +} diff --git a/src/assets/com-imges/55_03.png b/src/assets/com-imges/55_03.png new file mode 100644 index 0000000000000000000000000000000000000000..25bfd76d8b30376c71328ec9a7c005dbdb63036f GIT binary patch literal 3297 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 a0l+Ko?rD2Eb@unG0u1zx^y+jRqW=d&bNagg literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_06.png b/src/assets/com-imges/55_06.png new file mode 100644 index 0000000000000000000000000000000000000000..85e3ef2168732c97c5af4a0d60083d1c3f6b8df4 GIT binary patch literal 14290 zcmdVBRa6{b^flOxI|=Rt2p%N3lLQTJ3D!V@22BIOt+60Mf(H+-X$abQH|{P08YrBg z!7YU0_y6W)9==&K^EUNRb?>fo>a4r#RIPLC?uydUQXwXwBLIOw#IIEq^*|sn0tCVY z;bA@?@5w@{9}cvil#D*nlg+dzoY!-|X%GySdq~Z~D{ScRn|N)X{nS=eW&5 zL@ZNzBeihjWb5SWbWGcG#wzr8d9`Am{^{s=@?bVPAPGKKf7sl%nO%Chy6)Q=Hn+C` zL}mVhewl&vEY@GH(q+ZwLR-Cbv!UUYacP_ zD&D$;S`U(0@QlCSIXIa>M|34PHF!_G3;SJ#I{&p$`#EZ>5V0JZwv(Q|_BHpYcWOPo z8i*^|Dr{N`$vKWwzgk`2Zy7wDL@PWOy6nuoJHK$&(cf<#yja>C%gmW|jP)}$|95$M zyE=9}Fm(54`(kP1dTZyRE&_-xshX?zX$||kvv@txmnrVJGF@re^GZJpWz`jUWnV@1Ns8gsU`6XPN;LIVkzZimc-imVTu~0rS;rWsdT+qm z^k%;6vL$IVA}q@G1H2?|#aJ`&`^QxW%hbZ4--X5No*y;Sb=ROD01JZ+f6vX3fUVds zFTcIE&3?y8&*+x>p`|R746KVe2!4I*GenhZ65=$ju% z$~9KK7r~Bffh+a?9|Gzqhyo2f?mtveJVmr6YAQS z+HTcih}sY%G)@!9H=NdmG&oRJl58HRQlqrYClO9n67LWkEn`)6E9fzRWJJW4DmbV5)w3)MID&|yFC#nM7}(O0BOu>d-%)PYv``UvJ|O_g$*}? zhT}!gUcFdyFd`*dD<83xdmguU<(dO9eR1g2hQ48;X5&u)bTHwYIj4MkVVRG-kDj7D z2$jeXVz)c9w8$tMDKa*785(F5zfUJN#;EAG1_6yff$`Kp!_yE89%RZR+Af5q09Ydb z$dCI86xZb-x!Um~NJWF&2^*6n<=>A5VlYUB$mA&oSbVVCP@Vtidnq1-(MHt3Y}I5j zz8=@muJZg34#b`UoJ%wPgd)l(u!`|d)H@_QqR{zy>v}Lu{fVWxtL3yQAvF39fq&?v z+-m*Srno``fiI50cXJ7hLDuuNGkJZh;Co}iMGW7>5O2-vG)|ej3P~Dd9*k`fK_Cdx z?1n5l2|78AJs_<`MTc)FN(iuK7R*z%6Wl@}DB)#Uw(!Q}nMg4}aPSUwo>uB{5+hC9 zevGRkP!O5K3%kQ^oD1@+40U@%2F3rJm?9=EQQqbEBn_rd%KC7qaqpo2(cP45X@^bV_jj5L(0EwCh&MR zKF=1Jy3Mk?cv?rikDPU{c1GkJ(w z{4!*Tafb}WJqEkQ98EpV;7T_Mtu0ppiBBd*-~RL_gp&ZH$xSCYOiZwfxPR`JMt^8s zq2#uB$R3qNd6WHlFo;?L5v3b$=xtl+`xIK4OyjI9y!*=RdXhVsZY%KlGy<-U@EMVJ|mMrH4F!K4D^4ZjTEseOV^8mrhnX zNvLvEC*>2n=$1quvZ$5?`EFy6iwSfi8KK)9$5G*{W2W$%Qhd3H7m^4vj|k)+XUFGG z?BgKFgj}E!JAmE@!4Y>MLHsTqugG8p77jZnJa8p<8(qK>T2TBxKLHTQ@i05C!7b0|jb+I4Pe8n%dccK?_-(e4FVTFPF?8MhaOXQ3OG<{|$fp=( z^{AVir9pp?m8xIGx(Q=(U%tq0tQhnC)OzAw@#j`P9{Z|h%n7EdkiP`q`ML8GKiXP?YavODYj zhj^V&AHL$VKy6i#lBuM@b)z|Z#4BzG-(AlenZ7G|`F&kr7H6?$UZeJvMa@M0p*pa|uGzC{&dSTmTKi;lt*D1_p9aPkPktwE zj5#W|eu79PBP%F5oUgV=;)u-ao$=%|{STy@Y)wRGQpFv?SP1<5P}Qkq^JlJ1usv=( zJGOYmFCU{SOmrwGqH;0+VhBB%(<|nwU{y!6KVATbd|_*pO56S6vBeJW{{yGOdtN$a zEBGT{XuWWW658>_>^~b`K$?)kxU=c)dM5M%GO%OpgDdsZG|Hk^}%z&W(gA0bP zGFeGsBw7Dt5>~@I5(_m$p6@|#J{3E!)qP@HqzQWrVQeEDQGrH2BZ6P}4yAL&3L+$$ zx%yO~hZe+BQll#d+1#j|5MIkfqreb%O-aa0x6YK}FZ>964at;TAWJ~=v0>S~+Z#`1 zY6zu%=_;>;il`zX=4eeW%VRLK`;HVJLXI;Skw7ohjjA6fA3e_VO*6=Tq;mLJw{cHR z0Q!S}tNxNY>tKP8L1O6al~H~IhF61v+~GfkT$Hh`4t=A1tvos5-Zz3))!;qe+^d|$ zlvCO)o53DefMm3J^_`9)0U9{qL%enBK=nMXfUheANIO)8l^w>AAuhiAHf@?5-{C|w zkpEz&D-T!SIr>6|2nAP#IrdzVLMT0^-dskQgc2Kgd@3o`2{!ejNO2G0C2HI-$mVUw zLQvJ%^HM=tZL;0&Rt5H(=&y;{+}Y3Gmg@wwxooNGc2kal7*lO&V)OA|(hE}A$TX>jkke2jjwpGq_O_tika^||g>H`1n`Tv9;v zY~72QpV)KSP&<8>0FhO6T4S3rb}}zDBh++ODRAiL+AY3|;O1@@{&u_nP)4LC8fYkPKr zyTlq?urXcwIfAbq%|e!{mGMqF~Z3{usx3!HjR* zR)VA*fQv_W7Q3^QD?w2FIe8rBayEi64v0LxG?XMrf~hJ#S(|b53B_yXI6s`jGnpl^ zU4=co^^P4Lx-}>g+jnb6$58UQlyX5Bbl{dZFa(VlA%r4GDHB@g*S_5`JLRFgRZ-3f zgQFE0!O}0pNPkGnGvY({cAmOo>WQ;W@wsVz!}-j9dmQ20&}#}tv&u?am|5@2lC(bvOqPb_~O6uytc2n(aF_) zF^@<*8~nLmHqF1!An;Hxu9+%)PwH)ijr_kB>i=go|Npwc|NrXuFn##ny*$K8PG&O& zI{scqaGw0x6j<>mM22H7q~)%}&2M~(h+hFgeTV2R0x1**BkswN_A>KKTD^iNX!k~o zKun~4G#^zLOj`c>@4)?MA~OSI8`^Y!9N-uuecSR8oMn4r9^{;e=AS5m5xew1+3nz_b4}E_li2uX2=R27k`BSeoSGZ^u1Q=y{IQ)-oiGnefbyMhlb5}Vs%0n(61D(I8b%SYw+;KKP4?Wu_n zmc3pn1LUxvC>0Gzv+IfV!o;{N4m8-9gG)&=%YRIpY$WLyHApK0-|kIv=z!NUWhv2A zGQ9nRHITR< z*>jf*hJ4MK%p=bA%gNA?U5QuEmA|Kg5x!s|!AK@id+v7qN&rqq(BkHV3Ydu3=-oj- zOP6f1`1c5jef+M?AkLI8f38;eOV4vzc?{^kq5Et_CmX$#=plc!<CK5E1016)l>P^C3rKKRLqJk{Hs~08xjbsj$VN zq;j~>;C=;NXejdo%~CsRB+xrxUM+Ck&PV+QlyUq8^J*8T{4 z?siq-;bQD7YOt0&D%cdOZznFlSlQj--A^35->E44!~1U_e${I|3bY?ci`-@aSLo3EnG%u4dl&6QBf?4>h4CNn17h9}2At*K10qR5w-q$b zDJ^$y-H#r~kYt&WuC=1M#RoHqI0dk~rA3#bp=Q4)QwQ8Qj_$;hnn#X9fD! zOrgFmc1Y^wRdqCjfwLO*R6#(hYVp45>>(Xq$4L#lkt6M&R@H{?wGselk4apzivmE@ zYEUcSsUiiMS>nh+o3(qjC4mM0NldIe}zKBCPT10hJqQI!GWkI_xy z<$w{cV|YzrLEl3F^N2gw1wtNG$p)NFiQq*=4a64?*pwMO##O{83)Lo@>H&ESiui*? z^1vk*<>umpZ$Z9{5Ew#3xmk=4)TI^ttn^|Gf^yB>HviW(ojAqn#X$Gq`C?ds4+S0a z;LpKc?D^3``@o~rfk_n0C!_2DsCR{eX3@#?pq1r{_f3)=Yb7!2Y+n7@)-b;$sca4^6^@o|B7o#9Lj8i=nU zq4?B#P{Gws{KJ_KxSE}Whk}#3gMUI=n10v2h(tA!uS7fy&0;yuZB2R@a0wB3qz0wW z{;=)-itv!DxjuOn#|y9cH5ZD-KbRiGkLAW2LVw-|W?0)PP<0p_50;L$j0krHdC{nG z^5+iQ)~1sikJvUQmEnc7(8y_~58Dz&h&YTGbR(CD(lyhoiiqp>McA-ixDCW?gzX+Z z%{Gf7l2F9)cx~ZC9LiCj5(#Ue%xNFGjzK;7?ZiU>h;>eVmvajfYI!t)4vUAgF~w_1w8_Lyvp8-0-&zc`?l zcFBkyGjBXavI`TYl-Jf3?)q3yt-*~x`4>u(`0e$r$?d^fqsVJb}$*RhZ6;RV@=F8N)umlT6ZGD zdD5QFZSsr)GIi?rieOiUbZL!4IuW2V4{^N7L(+C}WX#|f5p{KN_Yv|7?3bu2=ZK$+ z^UM{ZL}f739IiG?swFTpuv_USftW%=z|;R!-zY0M?k&1uvx!zT9_f6$T_Uleta7Vr zqYOsWi34Gnt^ot8F$BBbo^7qcg?XZo1X`daEpJ!X-u4@&ywnjl7C%YCXC3+6Gy}xd6LhFO<+JqB8empV|YfzCcu!X zamK7czjcGuxpQn4!THo}{^X&OMq_@9Z>CIyP-3~EljsJZ+VyfXU8%2)-`t2qULtNX zItM*T2_dlhrg6afu~DX|+B=vMqV|Jz+pWu@FPN~opO8_*B&TobV~Nb3U!_nP6~mmI z+`a@BLxm!JvilTc$Z!|~gLX-9qbPQS7}vJ6wedG%afvva!{!{|E1HLpF+*dFr)&uS zL#%XysC|LZ_~EwCOBYU|ZAYA}*xvf|6C{cGvoQ_s*CX#^2cLWiANS)LWaLPnBtlQO zI-2ElaD4pk+zaY((bIeq0xGAwzD9W4-&x2z?&8gZQqQuF*jU4?0OQ z1n&aW>b%YVI4Ri;`t6-fxS7ImWCB|NdjVV8ZX=VNM?0Mmea5jYCxVl~#IR;=y+5So zI}(c{i7kL_iCNXzPT2luC6=Sy3+wPbC5{aT>UrMuO^do3)r5Vy-}K!7UIfmR&3jrS z9`mGDd0yEVm(xWsLKMtv1qiV^_{lmF#$`!8Dm6821K23m__PUOnTZSX{UrQsRr7XO zovGGPiCUrhS)Im#iu>3?ylyy1eENg;BpDAc{U)l^gP@6RO*~(myrjl{pi(+QlDm{E z0q||i9;$RHF$huEcP=e`9(-Gnv3=Pw!MXRY`n3l+n;W@aa`q^H87!}i1Rbrx6e_m~ zZD6NmSoaS@jLoma?u~-J&%( zZOry->Ou_9W%#F(x~fIHb=%6BZUvCl1I0wkaJ|E(d)Gcx zFlTS!*`GfVMu;^lFsTH)a;k@*Wa86j?4H#E9+)7%Uw-pljiHwrQ z@CU}LXu*)2S?SvSdD%IdBuoYExTJKiC@Ci3#K0KeO%r=$qGxnEOTow;B|oe|-`@L+NG;AciQU z5fokdEZ{gMv3}vu7XAq}VP2a2zHurA6lDN1Qf1pOL$+^@$ji~26Z z%b?!sn5b@_WW@8jNbS#*=sfSVBgR8kdK>hwShc#9D4aeq3Vk;(IhE@hQDtcM{bp3L zlkZvQ$s$L;__N;JejV&MHU2R?7iAg-6g9G=g*q9!xY;sA$pMYgRN`g)IIu~B;=>Dd z#Ov1BN`bCVCF3nUS|7bK>E3G@s|mL9vRTrHr>{X)DO~rGhc=hexsMH>amcL}Ch9uH zT@lbDDn5s8)cC|vYEd?#K*P1|pL}qj!?X2&^>zAfej)j2+$Kw%g>hOa+@;lak%Im&3t7-Ic$d8fk(AGhnXMpM1CR71SwRl z_>^>|sHJlHMaY{dC>c~fTbo3|pO~#$s8cVv&GUqg7g;lt3-mirA&(gZzbktT8x{ui za4T)ZK*;G2@^{ikMySob>wLJBUDEv$zC>kmlz(D>ZivKlS=Ql*bs{kCc!l=6-MKkV z-)D}hwi2uo5`j7ecWgFY*L0pYvEsWl=f`CwjBZ`k#5Z2V|8O$|F@~xrfcriH{nK!V zp>kH*x0%8+RGk=Jm%mu(M*v2R1}=+#BU&(`J7 zan3H~_wFw9Ys6OfS1!Ff>H4{V-jV9fE*KAp>cMWx-Bf&XqlwVh4 zbXCy~yg!?A+So!EB66HgNc5F3Ac~CQV16FIN!N zurwJ*77X6H#VC>YYs0Ktp{*fIeD_|6ZhXa^-SL`imHFQDQ+7#*N{;Iknin0_T54oS zhO(K_Mzr*o_!3JyI$_>;$&@AgOyFOhO$8Nxv)(BRNa`lOjO?s9%aD*rpghFc`uX)| zc(_d;>|f$`hCdT(#iZ)=tPcZ~UlhQKusZx{LKUB7-4nyx%3x_2te_FtC-+@`-N)E_ z_bkx1Wq4qEOMD2<%!?z=&Qvj64lii^5>Ux@hPX$`eec-9pZ=rKWU*Lvs?sbVKJs2S zIym$37|A}Dm?oa>Trb&Vs3*}*E@GLAg!8ZV#opf>mg^6kUVBE82*R~%MCIDeoXYUl z$#;jH_zUpeB6s*ui{_iaG5%-vR(pEKBRH}2jc;BrcP3Nfh?f}XOBJK5_d6xO`&WHw zw3k#D&rskIp8-xf0mUo?^=oaWoX|D0{3R%R>&OhHu)B)CG9THp6_R5 zKI%Xkb_n*gb~d5dXF~iEZlI-ZNIz}s*|!(mmne111tG6t9tdUXROP6+g-?z+aQLLk zCYt~~yU*&^eKJ7W(?9cV;J8r#XF9;3ZkP9_2sqSZ+GG4&_FdwwW76dcHCtn^)?q?j z`3teRnCBm7A7iLQeYd&|mu=$I&FxNlin!ePcWH=yQ`p)C=OeYD-ga&{^r1a8G1p6f zbexVCP_i6!Uomzlg0(`E(~4H#9%bCV9w<5;-Z)fS_DK3^VWU^X+^FbZh#Qu0y>I>E z_8s=$M;E(Ex4AhG+>)Ou-%|UNpZ86otz8Z>b<-Grp`RLa_Lu*@wY&F%i+}e)iGR+! z*;sBn3cB355A^oUUXMw`A;=7Hi~T}Rz)(!hc*)VLspi1kmho?EnKbBh!yq(U+MP<# z()pQa>Sc#iuopZiyAT%a7D0(_ziRpXv4qy@sA|C2KTy$!!9VEu_GsmHbspBvO0&c- zO!5zq>XYp1vWa7Hh+3{p9y-lFOVIxs-@?1*(}H^z%rc9NoFKga1kDx==1$Wu;hjLg zHB2n&BqCX2^iydfo2;jwl)pL0Ol0ysZ6_tXop06hTe2j zgH4<>3Y!e)7x7cOBsGc|@X);t#s23!L&PjDp7tU=^s#QgQl@q0Fx}3)M81<^F+TRi zjpn>dIop>?Ya=pIqwrd#YNgT69Kp6Bk1OO_>F_$5nt;Kh4vU^1ft&6#$CmGbcI>Q3 zvw_NI114?$mKU070^{NeRX;zy{8-E`6VlQdeKOGIXF)p)4p2g55=^ioR!*r`8X?<8 z&pxCZ3a)>~s?rTmnQ+IYNtq=(c=^Y;gH#Sm^1-C;l%nl%=$kjud~V9h_Co%Rof`bT zUatr<)&J}mb)PpVidJIYytuL^*!8^1HLa@U5!*a0JweV7CyTNoHassB83Bs-4bqNhVeHP z26Bp4NbCmU8v`u~99)qj9F@cMH|dK9Y^KR4Yvy_F z3~}HQ)lWU?Rz_-L&*80CHYx{97$#ag>sTt1xb~mtx#THG`Aso&yTCtQXF;p`-x=gc zrwZ}f>mQ0PQz}96BX&&lnZ*Pw7$YS4h|FLO}!$OS}JBXY5CV@~E7`N+1%y%%=TUk4G84-4h&x zzarmg%f+9N#%+an^f%pyQq?<|ARm){sD#>fGriW7*oL)R_U{bZZ|yPAn`=lu?n*4? zb*F+VCPhnE)d&c$e#PWjW_ORXZRG)}kor59pIY8D3-yjirFZPCCv=C=-}H2WHPwF) zD%nDbU7^$63>LR)p>SR+q9qb+^vd2E`Kau7T5hwb17}ZCAI6XVlB20kM19VEt>2)( zMjFz3P*Hn>X3=wbSP*4<^q050(=;%)<(l!h-XdzH{A98F+pMnd1b5(d3WkZ|EWIMGbc+xBu+h?b-Z!BY*ZBOj1@)EN&!$;KN}c*c z$m4T{6IdO~krTt@n?V2N&~?TN8GOL%8-6FQ;^-}g%foWuJdJY{Z^dM?s1J0AhY{l( zaFYvVi|4Xa#4BXTWe#QO@Ne#6SeIRoaYa6=YBxz*Ab;>U z4%$}3gegL9m7OdoeO|;9|K=87Cq#Vyn2^LI;r2aoiXQoPtB8mlP%J^i1%OCDFPHu$ z_!MTmZj721R6J~GbRHR{)l?%7yrsm}q8a6i`=1j6s*Y*|h{3v1fKE*;u$tk@S7^Pa z9j4BU!AT=`jL%?h=<+9vSkAe+(p5UJ(v?9r4UL(Rs6l#zcUY4+x^Sui2=V+F)HFWI zl>7clvu!&7BjOZQ<-T-4L5|2$gE9_C6ul=BgRSF!GBou9?S-Dsj>M`8_lSK0+>m$b2 zdY0Di_YKBTNiBoE*>z-4GLM!@G~L~g?lXCcND_X=D1O&N@W^W=kFE5og3p<)!3vhN4u(jZrqlcwc{V;#K#`s<9No#zQ8(nX0(tMnu z+Q*dRf>--xtt+qE?6d!}{SDnMc8wjegOQ6-UGwgr-gDyR*@{a>Of?NY1Ae@gT4rx7 zt&OZOvp7t|O)RNZVeLQbEXg>!mk`xZ=NERzjSUh#?%6}-NZ0t8HHxu0y9mu+M#JZW zAzY0@m!bEe0WZp0{I|w$+ztwfLcu(zrjB)>q$VBK8RYYTj!@AU8a-DnI zVoqGDki%tP%=aPt8RQ$~^=@HXKtSrTRV|_1FAfE1v+v`o{r+!$dgKmaTV&;$Qr&J< zt|KE2OlD;9IdBe6%0f;-Mv6VbkF$=Wf1hCMe!$s{Onr80mnPYkEE#<3H&6iXF?uPa zQdiAe9DWj>US?BvG*Scs^cXm1D5#}cIV^HAGSZvGM8oT~C`^AF?R94sooyUH%U`4a zf≪+}M=wYBP@**w>hE*0NAA;bdCm_{ZjX8e?|;{Zf5Fc*#n} zp;k!LJxxfP+g;*;R`fqT<4*Fsh{4D1dK5{~E9{VuKmCsEE8{7HLUJO+-Rbhgjv2Vr!T5fHg|)x5_X<1rzFOg_e%6C_Y=Zs;ps z%rWddO`73!VK-)fH3l6|XkFGg>FwOh_L`KMlkt%LPwK3suj+G|(*}Kf2sP%zdj`jG zIq9h#kmt*fG>l^DzO@0kjZTBsplxo+-spm*RUQ?RzvW;%nd>w3^Iec_D&x!39IHiR z6r=3E6kGk)jI7|?)p=V8r@XvMoB%I|9r|AGBq9BzmnoAg{pr8q50_=##_@+CO27hY=8l+xZ~cv-t4iF8f6kftlNxT)B)XnoPDFWJkpQi#115bf!Qp&oTBj(-_8pHx zUn5Ppjbl2ISkpxRbj^tMAVn(8opuJnGmT}wA2DxqH)=(fk5#JJ9P9aL_fj^>tj7v3 zSBhJ^jsAVGdE=>|*hdfTZdmuxHA5|`(F{t4IK=SnMdzxmGmMBm3qEprof=uz>`8nycdNB$NnVtzTk4`$ zZg0l1epP`&h2|2HcxOh4$$?p}M9ix%l^c30on#5a-kBZTi`ae<~&(F&3u0!+S+^s~8j9#FtOtcw( z0D7`6+)-Vq@T9IJG~FR8 z%y+ag0GbWv*XY1AeNYK6BKKb;=rElhHbn`!q?Ku0@c?JF1IQ2@z{dQvI6F6%bXuc=HKFsw3XB|E?2S*O7T0mMsQ2D!`%sJvPeSx6$h;3p( z=IhEe;Dae4uu;|eP~Bv44x!^^{-<#gv;AOqs@%R_|DRnVv%bvHRXPPI%N)4L6DZtn z`!}GiR^Yy+rY+k-0{CNGQoIU;;RUeB9CdOkT_$ApR8@dRNui~uI=LQp-hpSA{7z%3 zf_*@{DF~VYyZs$+mgChLDKFT1hX0_`$TH25saD?G2lWM zVC&zYS^6YM9|Cwk<{^Rr5CKzfuX+9zg-v0hTl|6O2i*kJKjY-en-OUbCRz7S%keGe zItas*AVskhm=#UM__RK?H^g}8wyFP_oz>k?18EULohJ)#=+4csK_!?H(-!wI1gICB zg#!>+izrrt_+LO(FHM^R{}V%jN{G-8jAKH_PD1?%{sSKJ?BTZt=z~z{|4~QlF+v*z zv5pRJ$ARkP-~!1Zybq!Wl*hIDcn}!)gnfzcD%V*|%7>Iys-a(DuY&y--hy0gqnq99 z=)Y0qEl!=?*jbr~bPxh{Aj3_kX5>%V2SV`UTFjIwk-x!*j&d#s4_SqYZnn!HdtfTA zZDhy3HUnF&v7ybuR`!2}Mu?Hupg6hht0u67JkldbSFgDpEYX4V zsKBZMxbteGz*z!7^O6LP*)guA7sf*(d4(LBHFo|T5KuhALSAzp+o{CvebJV^{StCz z`0!)apX|u9G!Wt|!T$}FUziY~-ZKAU^#3W`yXNXXbA5X)KFEJ9pHvcZeITC=;jIL; zo_@S~I_#Bv{QGl8ao-vr!o(W2*-6aLXbe@B8wMI;cS43f)1u2Q3X6SvO3xxLH!u-aGTQxL)()bAW2;g&d&kg2^f z`JTk*8tC6t%>PrCJ?^L$KP6?Z-Bh>pM`S94uQelB-A7ukp7L0Fs901VFbNhuUFPF# z5*pCz4l|B#V@ zp~9L*yZSnZYi@Z%BbO`R`N-m6`eNXGvSe;?z=hO#)<9FixwFbJ4rQSN)nBj%!vf3=Pi%CJ+{ym`}=pBS&jkZ<267;aW NR?n(5g$v>$A`c!sNKHyADJoJ| zRyH#>ZfapI;88%{nsr#Z#S&DoiQh2{VM|IU{at^v&vDGBlm26E8>gTMcC zK?Vj!K2I0NkcwMxrk<2)R^VwlysW{Sd(Z#fWlc$Mofb}?H!JwZr|!c>jY0JRo>R6g zZ1MG!Z?2S-i%j+1kdZvB(*xyRtTUAyM7nGuIBrJ1$}c?-(2^9atA zwYsrk^UL#f#}8S}iC-Znex*^iZgIBli<7fs*N81@XZ>csU4Db@y%KBf+ZyFEr(zeK zUG%u(k>16`Dvt<_)qJ`o4>>clA0`JgMp?(3cjtulM((}!&T4y-aj1*-%N=XF^^g5& zm{FcT?Y!#x_i|BpkC&fV#lHXK&SSq8y;D2D@bOKprJ=#!rNEG5@O1TaS?83{1OTXq B(=Px3 literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_14.png b/src/assets/com-imges/55_14.png new file mode 100644 index 0000000000000000000000000000000000000000..0026b8195f99cda2fa005975c78e5533aad8e29c GIT binary patch literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^nn0|@!3-oNwVJX(REcXuNpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo^#Gp`*N-1Q73I_)J97HUF!Z>C)2JFLLr8tC}; z#{c^FYGv9>B7CrP_5|$VIw7@8}$mRl#2wtw?^w0quFVdQ&MBb@06NB{g#Z8m literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_17.png b/src/assets/com-imges/55_17.png new file mode 100644 index 0000000000000000000000000000000000000000..bfd8dffd22bd4e9d52f41e5646ca7fe671ede133 GIT binary patch literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^YCx>c!3-or_Mfr@Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=eIs$w`Tt9yJbmj7mqMZ6w%Qp6P&UpOr>5i@Y=1gB2=9hZx z$mx{WqK4}3|NsBrW9F!Yo^?u)vCbJYT5bt z*!TK-C$nzNNQ(6dkNnTRDT3kaRp$R~4~?g7id2hDI;ye!o0HXW%- zLVF~`Wb4rLdf%c%9?i2_Z+2sn*L#nd$qsiX8qNrQYIVhO_GSJ(hbC?A$=V}x=S}Rg z8E0RnpRhdYweH-+k8VmYq6898=2gTe~DWM4fVRy<{ literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_20.png b/src/assets/com-imges/55_20.png new file mode 100644 index 0000000000000000000000000000000000000000..06b4fe93fb901748fe8d4c137b9e1fccbb82d977 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^DnP8s!3-p`9I8uzlw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlBJ}{D5Z7ZzPB&C{7v`$DM=D6!Jh#WAGf){`k0`I-$lT=g#m z$^QBOeVyO#8?HxHXGa>%^RQ$sVm{z65vKQRLM`tkmy|QtZf3ZJ%nL}odpab~%6U%T zsjC^hOJ){cm5Z7;S42-{g$j?qRHo$tO%a>|)^st)71y??VEeGeXCPI(<9kf>{HHf_`2 cJ=_Ki`PUrhoO;qH2Xr)pr>mdKI;Vst0PI4PI{*Lx literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_22.png b/src/assets/com-imges/55_22.png new file mode 100644 index 0000000000000000000000000000000000000000..ad3cbe37a5520a7e369894dd27768a16ebdd332f GIT binary patch literal 463 zcmV;=0WkiFP)C5jdy9^VnE(I(gz}m@0000DbW%=J|NsC0|NsC0|NsC006pj;h5!Ho zB}qg87%XLA*Sw|*BNW&Tx&5Ti+Ez$*kPi|nZo1H@_YDU2!;x@)^ZZu zI?1c*FzAUTZN*#f`GIlOl6Zf+Xr8Ob-L1}hsc*NsV@eNfX;Wd37_A!6}^v3^aEh z6>FHX*2S+K_oX6#o~pI#mBx+8VKg>pzK56$sG8M>o9nx?2xu_cUb(F7yxfNLN1C3-5LM@002ovPDHLk FV1mDk)-nJ9 literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_25.png b/src/assets/com-imges/55_25.png new file mode 100644 index 0000000000000000000000000000000000000000..95aa786696b09287b0c4932ed2a0a6d42444e007 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^>OicDSr z1<%~X^wgl##FWaylc_c!T>(BJu2(MKXsGV)>zuJ_*~X6_J{9HEA3Jh7CAMhC)_rrP zFMa&*X_#N?|Ns9dd~T}*YT+#j@(TuX;ef&Rg;E<(;;*NRV@SoVo+;Ov4l8iDN;WP2 z_y7B~BN@w*?oSXt*2+}*mfhU>?ul1(l!UZ7KRs*BO5Ezlx5PH(tKrYQ#v|Ovi+op9 zY~GVC^Lb6{7S_hU)r-Sd&e`tra6{pmWmWrog`=a{PH6U7Or3U8@ri-wZO0~`&4;3V zGYS;f9L}Ze+}~(%^39RCyE_b~{A!}{u@{RbP$n|D83 z-(=kPE`H_m|3B~S?Ma{RqHFR*vYf$X^X_P2Ay)pIPfp!FzU4m?4@0z(eaEybq7Q%p O!QkoY=d#Wzp$PyOg33Vv literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_33.png b/src/assets/com-imges/55_33.png new file mode 100644 index 0000000000000000000000000000000000000000..9aa1d60bca4abb8e58ae5334f29d9957b24c47f4 GIT binary patch literal 498 zcmeAS@N?(olHy`uVBq!ia0vp^8bGYY!3-q7y?7Y{q$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c73Bo@gt)R-*nj-+i9gJmX`=I$%Quc4IlXGxM$UXY?sQw$ z1_y-@*Bx8;73I{kbU3*LM9rDLRLRH1DKa`Kwb(E^u%M(t#l`vY!>2*<>1x(aMnV2U zt`=?{ktSY#ym2-HewGc@-3fUmeVsEHX1e_U|6f~v-YTHIDkVXF!9Xq{z!0Is%L`Qh z#?!?yq~g|_t2g-$DG0D$Xmre2x%J)eYajpr4~*)$;??+K_D8!(&PBqPqIamW?Q8h7 z>Sxl|CDyX{JQW;~uMnnGf6FOt_p~@wPds`%1qy*S)HF ziyo~19w*ZF>T7qDMxV#w%QINUd%;O2?*sgK*`K=WA z_u>13TUX3>+i;xTD7{eONnQaLhm$$S;{F9$3Th5{4?I*4xPIRG?$L%d(h(_vJCZI) zYus%-@3rD+a`md0kGJhAX)6tinwHxVZJc@Eci$fct?Cf9Vqd literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_36.png b/src/assets/com-imges/55_36.png new file mode 100644 index 0000000000000000000000000000000000000000..d0066d4ecb65b40b24ff24f25eca6f4bc31db27e GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^sz9vC!3-o@n*_Xolw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlqKW{Y5Z9hLyQ^v@&EI@!#r}J7$xTyN951Mv`SHW2#}A)| zMwIQ?y03ZShU)UJV@FO`wJw=6eW{OoQgTvNZf;vyNk?RK`R47%8mhY&ELgv4^{%L} z{EW=jjMSR*S03EE_oTCJ`maC#RxR6j2i)=ZL3^V@SoVCs&ROH7f|PJy;sC(dBaW;FBfa(6c&^A_gPyvDlAc5QJfZh!tv>qRayZ;?m-XMXk{;&c>jm=smt76|G)SL z>`lmV*x2v2W8QCxn7pVLyEV3Mt$VaJY~|X>lFT%}M>8+}v3n}yY<_I|`OcZ^{ywZb oFu6AUSDU)!6pM`Vd?p@-d%2fqM5e5r1@sStr>mdKI;Vst04TWdbpQYW literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_38.png b/src/assets/com-imges/55_38.png new file mode 100644 index 0000000000000000000000000000000000000000..f9fcc1d2f10d7798438e12a7556c26faec2cc846 GIT binary patch literal 607 zcmeAS@N?(olHy`uVBq!ia0vp^YCx>P!3-pqzN~lyq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c6;%ZIgt*RH;a5=RdhE#QzRnqsA3m*b$ou%=)0N9N)*T4m zc{XgxmcX{5%5^qSL+HU9;1(4&RLU|Nnpg-r#8N0zK__mW;#%&GjQ<@Wv+if=5p6M{YeYnSR(hJX}M~|FL z_Ut?^rI4VnzVYm*c-9{?_ZTleap*$$#dHVBghxikJj+Go{_)AC%@g*XexChW)f$P& zUGsEKoHI@(AwzY&{0+rx-qqJ=6Op>5tKV-4>I1R?p_neB?JjR&~=lg*zSdRSxa>v^Z8L z`QhZMh0}K3-5#;|UQ>tmI`Ly>|F}+C$?RKvy7S5`MVF&Dnr|#-bI%IOC@+Xj^*DKD zcK*rsJ0Yi6`y0pKuyz{( zJaZG%Q-e|yQz{EjrrH1%Eeh}naaBz*SMoO1=&@AIG1q9Z{P^M1j;;IDYb;b^%xoil z^}QS$s=Ez>os>h&9zT5A*E!?UkI$=?ZM<^%MsZ2~oasx|N-QGM(vBTDonBjF6X^To z(=#P!lQsJ{>p3}ug{972v8;J=@9wJyy%VBRbBiCpde+$7)70I&_V||O*?p<0MJKMD zjm%4*w_#avO~duqw`@Fp!{gID10pA`oaGe}sX4{!|NsC0A|)pRU29enI<}^KU{HJFHi&4>9Aq zaw;SLuikQz3nf9HT8t()wWf+c>P-$fx3o0%$R&fa#QSR!{;ai4Vf-1j+=}&@?b$C{ zF8(j9>J6M5Wl#6F-F$tf(4$TBL>AlQ=gF)$RtlypVc6>-y-eF-1Ak^;b`KSCtoid*`v5~NKi8>Pm*sDPvB2Qz>gTe~DWM4f0DC{p literal 0 HcmV?d00001 diff --git a/src/assets/com-imges/55_44.png b/src/assets/com-imges/55_44.png new file mode 100644 index 0000000000000000000000000000000000000000..4aae16783d6e3ebeb301cca1b244c69459bc5656 GIT binary patch literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^>OicDSr z1<%~X^wgl##FWaylc_d9MbiR&LR`DDOV2G@@bSZ^mpe8tZEUMeE}T(Tw`$qO%{~1) zw(cv4%&1AoJve=OeQ|TBcS2w1jAKVm7vva1@( z+Y4fH>oUq7KYSYE96o3I(xQy2hU)IwQx;r4e)`|{Z%KX$1&M`yZBvqhQtI>Tj_%l3 zm{RuW-op=X-X(g)BuC~R-E-*s;hq2g|9=sk%nNj(QAvxEyJwG{ zGBL<4R}_p}Slz{ayMzDPPh+9&KA%P0w@nhN=DfW3dQg$d=N&g!#LwHQ+xB(aKcPF$ zEy;80IP@NxHLDkJTxYL&y>n&e_J4d&iY^uJv*eq7g0K_M zO6m6Fi~q+k-^tUATdyVadVZbH_TLY>=Via?y!k$pFKuhDbw{P*w#LNwhv&Qtu8HdV zR2w2Pci+w@b{m5h?X8-=@#m*KPhb2s5}szNY-`XE=cZSp%#wU*BVX(FqZ=Mgi<|no z``dwM+ty9=5@(xr#O?3xmH#TPa$P)WVfmb|Y{$HHb$*W{w(krrH|J~>f3)EIk`wFy d{pB=ZXx{ig!O-@A8ZguuJYD@<);T3K0RV)RN=5(x literal 0 HcmV?d00001 diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC& zL0ag7$U(XW5YR7p&Ux?sP$d4lvMt8C^+TcQu4F zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}& zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1 zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G zwDA8AR)VCA#JOkxm#6oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%+_bCw_{<&~ zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj1fo(ce4l-9 z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4 z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^ zn$5}Q$G!@fTwD$e(x-~aWP0h+4NRz$KlnO_H2c< z(XX#lPuW_%H#Q+c&(nRyX1-IadKR-%$4FYC0fsCmL9ky3 zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#` z2QhvH5w&V;wER?mopu+nqu*n8p~(%QkwSs&*0eJwa zMXR05`OSFpfyRb!Y_+H@O%Y z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6 zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o z$=#_=aBkhe(ifX}MLT()@5?OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{ z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX zoI=B}+$R22&IL`NCYUYjrdhwjnMx_v=-Qcx-jmtN>!Zqf|n1^SWrHy zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez z={AM*r-bQs6*z$!*VA4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz! z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K zXQr#6H}>a-GYs9^bGP2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9 zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(LgacooD z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0 zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH; zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK=t# z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB zHBolOHYBas@&{PT=R+?d8pZu zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86 z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1 zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~ zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0FB z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72ydrFvm`Rj-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc# z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S)4^*t8Va3HR zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOMlK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C z3HR9ssH7a&Vr<6waJrU zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N zQUR>oadnG17#hNc$pkTp+9lW+MBKHRZ~74XWUryd)4yd zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T z9rrj=?IH*qI5{G@Rn&}^Z{+TW}mQeb9=8b<_a`&Cm#n%n~ zU47MvCBsdXFB1+adOO)03+nczfWa#vwk#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A zrRQ~(Ygh_ebltHo1VCbJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L zFlJ_th0vxO7;-opU@WAFe;<}?!2q?RBrFK5U{*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16 zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?-
- + {{ item.title }} +
@@ -25,35 +28,50 @@ export default { to: { name: 'Development' }, - icon: 'guide-o' + icon: { + active: require('../assets/com-imges/55_41.png'), + inactive: require('../assets/com-imges/55_17.png') + } }, { title: '今日', to: { name: 'Today' }, - icon: 'notes-o' + icon: { + active: require('../assets/com-imges/55_36.png'), + inactive: require('../assets/com-imges/55_20.png') + } }, { title: '洞悉', to: { name: 'Insight' }, - icon: 'apps-o' + icon: { + active: require('../assets/com-imges/55_38.png'), + inactive: require('../assets/com-imges/55_22.png') + } }, { title: '优化', to: { name: 'Optimize' }, - icon: 'diamond-o' + icon: { + active: require('../assets/com-imges/55_44.png'), + inactive: require('../assets/com-imges/55_25.png') + } }, { title: '我的', to: { name: 'Myself' }, - icon: 'user-circle-o' + icon: { + active: require('../assets/com-imges/55_33.png'), + inactive: require('../assets/com-imges/55_14.png') + } } ] }; diff --git a/src/router/index.js b/src/router/index.js index 2ab61d7..86bbe14 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,5 +1,7 @@ import Vue from 'vue'; import Router from 'vue-router'; +import store from '@/store/index'; +import prefix from '@/store/prefix'; import { constantRouterMap } from './router.config.js'; // hack router push callback @@ -27,4 +29,17 @@ export function resetRouter() { router.matcher = newRouter.matcher; // reset router } // TODO 增加路由拦截 +router.beforeEach((to, from, next) => { + store.commit('fromRuoter', from.name); + if (to.path == '/login') { + next(); + } else { + let token = localStorage.getItem(prefix + 'authToken'); + if (token == null || token == '') { + next({ name: 'login' }); + } else { + next(); + } + } +}); export default router; diff --git a/src/router/router.config.js b/src/router/router.config.js index ab37db1..c1c8fe0 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -235,6 +235,18 @@ export const constantRouterMap = [ name: 'news', component: () => import('@/views/myself/news/news'), meta: { title: '消息', keepAlive: false } + }, + { + path: '/login', + name: 'login', + component: () => import('@/views/login/login'), + meta: { title: '登录', keepAlive: false } + }, + { + path: '/bind', + name: 'bind', + component: () => import('@/views/login/bindDevices'), + meta: { title: '绑定设备', keepAlive: false } } ] } diff --git a/src/store/prefix.js b/src/store/prefix.js index a42e0fb..651c28e 100644 --- a/src/store/prefix.js +++ b/src/store/prefix.js @@ -1,2 +1,2 @@ -const prefix = 'card_parent_'; +const prefix = 'health_student_'; export default prefix; diff --git a/src/views/login/bindDevices.vue b/src/views/login/bindDevices.vue new file mode 100644 index 0000000..88bf7dd --- /dev/null +++ b/src/views/login/bindDevices.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/views/login/login.scss b/src/views/login/login.scss new file mode 100644 index 0000000..4febcf6 --- /dev/null +++ b/src/views/login/login.scss @@ -0,0 +1,43 @@ +.login { + position: relative; + height: 100vh; + width: 100%; + overflow: hidden; + @include center(); + + .login-con { + flex: 1; + padding: 90px 90px 0 90px; + display: flex; + justify-content: space-around; + align-items: center; + flex-direction: column; + + .login-bg-img { + padding: 5%; + @include center(); + + img { + height: 100%; + width: 100%; + object-fit: contain; + } + } + + .login-btn { + height: 120px; + width: 520px; + padding-top: 60px; + .login-text { + font-size: 48px; + } + } + } + .popup { + padding: 60px; + .login-text { + margin-top: 30px; + font-size: 48px; + } + } +} diff --git a/src/views/login/login.vue b/src/views/login/login.vue new file mode 100644 index 0000000..8cc380c --- /dev/null +++ b/src/views/login/login.vue @@ -0,0 +1,177 @@ +import Vue from 'vue/types/umd'; + + + + + diff --git a/src/views/myself/deviceSetting/personInfos.vue b/src/views/myself/deviceSetting/personInfos.vue index d8aa9af..ac00eb5 100644 --- a/src/views/myself/deviceSetting/personInfos.vue +++ b/src/views/myself/deviceSetting/personInfos.vue @@ -11,7 +11,9 @@
-
+
+ +
设置头像
@@ -204,6 +206,7 @@ export default { height: '', weight: '', rightIcon: require('../../../assets/myself/health/right_more.png'), + imgPath: require('../../../assets/com-imges/55_03.png'), isDateShow: false, currentDate: '', minDate: '', @@ -361,7 +364,7 @@ export default { }); */ APIDevice.getPersonInfo({ userId: this.$store.getters.userId, - deviceId: this.$store.getters.deviceId + deviceId: this.$store.getters.deviceId || '398b4b34-221b-4fc9-a9fb-e7bec8876248' }).then(res => { console.log('用户信息', res); let data = res.data; @@ -384,7 +387,7 @@ export default { let fromRouter = this.$route.query.from; this.$store.commit('notJump', 1); this.$router.push({ - name: fromRouter ? fromRouter : 'psychologicalIndex', + name: fromRouter ? fromRouter : 'psychologicalSetting', notJump: true }); }, @@ -458,7 +461,6 @@ export default { ToastService.success({ message: '保存成功' }); - this.getPersonData(); if (this.$route.query.from === 'watchSetting') { setTimeout(() => { this.$router.push({ @@ -473,7 +475,11 @@ export default { }); }, 1500); } else if (this.$route.query.from === 'login') { - console.log('注册过来,下一步绑定设备'); + setTimeout(() => { + this.$router.push({ + name: 'bind' + }); + }, 1500); } else { setTimeout(() => { this.$router.push({ @@ -545,22 +551,18 @@ export default { .registe-user-infos-container { height: 100vh; overflow: hidden; - .nav-bar { - height: 100px; - padding: 0 20px; - } .main { position: relative; - height: calc(100vh - 80px); - background-color: $background; + height: calc(100vh - 170px); + background-color: #fff; .list { position: relative; - height: 78%; + height: 75vh; background-color: #fff; border-radius: 8px; + padding: 20px 0; overflow: scroll; z-index: 99; - //@at-rootpadding: 0 20px; .avatar { position: relative; height: 240px; @@ -574,6 +576,10 @@ export default { border: 2px solid #333; border-radius: 50%; margin-bottom: 10px; + img { + height: inherit; + width: inherit; + } } .avatar-text { font-size: 36px; @@ -583,7 +589,7 @@ export default { } .item { position: relative; - height: 60px; + height: 50px; padding: 20px 40px; display: flex; justify-content: space-between; @@ -665,8 +671,9 @@ export default { } } .bottom-btn { - position: relative; - margin-top: 80px; + position: absolute; + bottom: -40px; + left: 0; height: 120px; width: 100%; @include center(); @@ -674,11 +681,11 @@ export default { clear: both; .btn { position: relative; - height: 100px; + height: 90px; width: 560px; background-color: $green; color: #fff; - font-size: 32px; + font-size: 48px; border-radius: 50px; @include center(); }