From 2eab2ecf68ca94f765dad43fb4a8ee7a7882df3e Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 11 Oct 2022 10:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 33 +++++++++++++++++++++++++++------ common/style/mixin.styl | 2 +- pages/login/login.vue | 30 ++++++++---------------------- static/.DS_Store | Bin 8196 -> 10244 bytes static/iconfont/iconfont.ttf | Bin 2036 -> 3188 bytes static/iconfont/iconfont.woff | Bin 1304 -> 2064 bytes static/iconfont/iconfont.woff2 | Bin 884 -> 1636 bytes utils/getData1.js | 0 utils/getData2.js | 0 9 files changed, 36 insertions(+), 29 deletions(-) create mode 100644 utils/getData1.js create mode 100644 utils/getData2.js diff --git a/common/style/layout.css b/common/style/layout.css index f0a01e9..f2bc634 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -12,20 +12,41 @@ uni-page-body { /** iconfont */ @font-face { font-family: 'iconfont'; - src: url('@/static/iconfont/iconfont.woff2?t=1628753103983') format('woff2'), - url('@/static/iconfont/iconfont.woff?t=1628753103983') format('woff'), - url('@/static/iconfont/iconfont.ttf?t=1628753103983') format('truetype'); + src: url('@/static/iconfont/iconfont.woff2?t=1665454521636') format('woff2'), + url('@/static/iconfont/iconfont.woff?t=1665454521636') format('woff'), + url('@/static/iconfont/iconfont.ttf?t=1665454521636') format('truetype'); } .iconfont { font-family: "iconfont" !important; - font-size: 16rem; + font-size: 50rpx; + color: #000; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.open_icon::before { - content: '\ec0c' +.icon_eye_close { + color: #bbb; } +.icon_eye_active { + color: #ff6a00; +} +.icon_unchecked { + color: #fff; + width: 32rpx; + height: 32rpx; + background-color: #fff; + font-size: 24rpx; + border: 1rpx solid #bbb; +} +.icon_checked { + color: #ff6a00; + border: 1rpx solid #ff6a00; +} + + +/* .open_icon::before { + content: '\ec0c' +} */ /** 内容 */ .content { diff --git a/common/style/mixin.styl b/common/style/mixin.styl index 573a922..f564d40 100644 --- a/common/style/mixin.styl +++ b/common/style/mixin.styl @@ -1,4 +1,4 @@ -$red = #e74f1a +$red = #ff6a00 $green = #6CBE8B $yellow = #E9B451 $blue = #6798ef diff --git a/pages/login/login.vue b/pages/login/login.vue index 61769ec..0eea730 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -7,11 +7,11 @@
- +
- + 记住用户名 设置 @@ -46,9 +46,9 @@ }) }, async toLogin() { - // uni.redirectTo({ - // url: '/pages/home/home' - // }) + uni.redirectTo({ + url: '/pages/home/home' + }) this.disabled = true if (this.user === '') { uni.showToast({ @@ -58,7 +58,7 @@ this.disabled = false return } - if (this.password === '') { + if (this.password === '') { uni.showToast({ title: '密码不能为空', icon: 'none' @@ -104,13 +104,6 @@ _wh(calc(100% - 40rpx), 74rpx) _font(32rpx,74rpx,#999) padding-left 10rpx -.uni-icon - _wh(37rpx,37rpx) - font-family uniicons - _font(37rpx,37rpx, #999) -.uni-eye-active { - color: #007AFF; -} .radio-box _fj() margin: 25rpx 0 70rpx 0 @@ -118,18 +111,11 @@ .radio-wrap _fj() height: 34rpx -.icon-check - _wh(30rpx,30rpx) - background-color: #ffffff - border: 1px solid #d7592f - border-radius: 50% -.icon-checked - background-color: #d7592f .radio-label _font(28rpx, 28rpx,#333) - padding-left: 20rpx + padding-left: 10rpx .setup-text - _font(28rpx, 28rpx,$blue,,right) + _font(28rpx, 28rpx,$red,,right) .bg _bis('../../static/image/login_bg.png', 100%,,bottom) .login-btn diff --git a/static/.DS_Store b/static/.DS_Store index b3e36b4edc3c080c3d0f7583d1ded3853dc3318d..baec853c9f4d2d5b44a2eabc3ee8be578f9ba9a9 100644 GIT binary patch delta 1431 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 delta 904 zcmY*XO=uHQ5T1Ga=i9_I$)-t3u(h#GO0mV3nC4JRNkKe$5IkrVU7MI#k~Y#*+Dq_MFQOagy`%+qnR(y5Z)V>6W_Pb+uWhBf zvUzq303QLs)v2OgQop>t1;8l8m$|~7>&n=fApm8a;!-|qXO656jS%^rESaYbV_CUR z_zhW4zF1xe5TM*Txjp6@IPx;+D3nYtC{=l^!#g)xxcEwK2Uf_ zY7>O0(?IC~R*m8+pRBv(QJ1QpvA^nN*7<3fLY+a8=s2w=)lJiFQnHn7wlleF)ZL8+ zfJ82VuRdkJt2M?eZkaPKy;Qa{DLTk(*fl^J)j{3WG%EL5rYEQ+nFV*f;LZN+CN}4UxhXKn7VI1oNpRhLI z+`|_H)&`sq0058x z00H{cyKRYQY%ZeeX@000Jb0003%0007K5TiV>aBp*T000NH z000160001UThQwPlL!H4e`P;=#N6<|fq{Yf4g-*6U_?>G1OSN84Xt>b?UBI^!Y~j7 z$8iW2LWn{rh#vS*1TR|1CrVq%CwXie;m!w$A~HqMJxTaH%uUtL z9ID@PHGQJc(CMaLgGS9-w++5}(&GAOlD+wybJdOQ%Jy@|-nNlCfBti<_x-JkCmMJQ z>H|v-4S~0%G4KX81>UIUz!FAFU|FLzpu7MLz%*xgoOM*qZyQw*fAjWzWWDS`m4tyS5wr?KMs0Lk$Ayf%ve_`IPW5fYJdFIW$-~MKHX6F$g_|v|j9}tfa2!+%kw7~ViT>`he z3Goo(P`hdPMzWavne$!9!3t$uT9R`Le;YvGHo!Rg3%CIeqV7nW4?gk788-QDojzud? zhz4Q2G)=k*f19uYk>`p$WG{u~bNMiPe?2#H`fyWL6je=FZC(U)eFi zK;I0to_*)zcc00FylipC3Yy6+p=qe!oMDVNgsIJFnrLv7F3)JDsN>;8zh!Y#D586ub)1<+i2{@>MJ9fE^Y~^;@ zySGqi`YS;(Sn->Mg<_#q4g(jBR-xFglsdI$REwImPN@ugB=poK=ojgIvJl-(9Ae&-! zj|{8XBp>^-$qv%Q&=E{8qzs-y4|PeOQ{!@UAoXQ6o)a6lNB4Cpbvm!h*<*w*;l1e~ zU(n^Da;4(hHK~7_6W6b+)9)wZ9}tAee>MPkoMT{QU|;}ZE;sT0@%%Pl8Ms*(K;V8> zlO;0E!oc(pNO3SQfp`GqaR<@B>(^b00000FaUl5ECILy;sP83VgkH)oMT{QU|`^6C}3b?00AZ-4(0+v z28RD&J_7(0w*i*3mjgoqT5Z8W4nQyv1as#LaD8`UcACuJ&N!L3 zFRwDzuFa_z<*1lrJ7KTiVFMAj_vxRMr8{Qr@Ll4Pwul>z$GYu*#>C%GPFiyPmSFXghHafsQcel_tuk_- zw(G-%;}=+#OK*E}^zn%c&pi)ZUER?dwPV`r$1X==Y&mCc5vgZqni=)ULH=zKZ>;2+ z`7;%gZYn9680*~Nt#ok?Nq!Q&vfabpJk|7^bGFG3PBvxjBd!+Q`G)VWT9&<hAoF*_*aDN-G`@|Jc^<6#K}p{kPLu-;?uS8&)stD>Qu@I5o=Oe~#7N6aVf@Z|FBH z{%|(A@sh{NrB%;6Mc$OuPu+0c;rKRlD?7ec%`0)QglB&ImC=-AcXZ0nxxT0Wv2MKS z)Wc9QCpjS{A%WqM$T|D$M?Z7-85L|cXgCnNeN*fS6K>|qh6+ay9$&{j zsCrPe9yoA_fyrUgL`KmKOboW+OhQ1p#Ds(d$HNSaEDWLyIzZ(>;KY!`P{yzWsxcuo zATc3{fl=TjYYPw0|ARGb3_Q(@P7Iri*_;{ek`s~|81&fQG)$e?IdSI1)`?Rm_ByUm sGB(uTYr*Uh!pJFbmQCc8r%8&w-&s#xPhUZX)eJ%gm27MbYOKQZ0WF6&SO5S3 diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2 index 46da59cbba2d981d322322b1686a0abac27cd127..b16925975192b8ecc658f58e3d54f5070cdb7eb8 100644 GIT binary patch delta 1627 zcmV-h2Bi7)2ILGFcTYw#00961000JL01E&B000bh000ITkr*C-dJ2koh-d*e0we<@ z3lsnZAO(bH2Xh;Z3L_CFbQ41MR|(u4&^l@cFE&K5g3zLBYlUzxH(J)m__w-rV#28j zz6qYE{qdc-GjE>0faHYqS3m*~g|=}U*c1ve3nd`{rt+%H!h_ukR&dXXlT8-T$;q8F z_Y9649L&K9Xn+8JGr<1SHaBkz`G>MVQZkaysp(+R>jTZK5z%m07B(n&ACId}2_ zz>m5UnHy2`X?1V|Xn?lUDsjN~ECKBzo=YyZo|HkC9)bcQTJ(~>fx*!vEuOJ@DR~U6 zT|qEbEnYBh2Ei(XDbOnduce-8P>1k9cFP6ep#6RIfwlsF5IhaL&hYim=7#HYk4!iH zKl%~64F&8ifCp%xVPp}tr#Q6@?O}s;MOoV$#)BjR1l#K2i=Ul-cJ|q$XOI5>j~X66 zd$^G06iM8bg8$$N291ZsCjezZR|064_XOY;Ndg7#7=eI0O<=&CCD7m=5_sSq5m<1~ z34CxbrV#*t5b871Kqk~RkbGvIK5MJcSj@HxL3gO5)ZI+xDTAXCH#afj>mimoJ5S=* zz}=ndH8(6oIyeO3lo%#peZrzH6I&52*xD*N2#QUK=0ui9QC`5h1ZAmPaWKrXXu1it z!N!hJiAYHY@ddrP1hrBNBvm^BfH6*c8TKAVj=S6~)jN zCZIfzMF;``Q5No@ks@#d7~PZ9OEH<}@wPCmSP3h_e{2-HhEdUKTa^uSMnh@OD)(;| z(YUhce1(yioN>I!sH{3$anPAW zg=$iNkL2r!AstT}jY_?q(&@&bJOj70)LAmuB2S~8T`JH;PJ0l-Q7~QwHZaSe1a5=! zG)5AL<@tuv2kg<=Fob~@Xwpb_Bk7?4U58(X9cY7r(dj6?zV6z3q!&yf@sJlyOtMjw zcusuhOTHCcS+?9yCm$Q7x}thwW^K0U3NBuM4w@ty!m; z%A7FM&P{uF!1K`%xEi}8))mw_MB8So0I-X6^HD(gNn@nHBtZHdZl;={k8U!H1(uN( z3oT@p^DH7Q=l+#^EMI4CdIBh#BZgWc0e-^7VqN*C=833CoLSL1CVBSQ!*myFCqoZV0Z3AhaWj`0hzlGuHv z87Ra^V)o0SkoNVW#WCWvqvgw%CgM(^Wxzkn-!CfwEEANeXZeAEWk3O)vNb4wOAGJ& zT#!AKnK>l64Jq_(^QLiqjm+-$71v#N*ec@1i&9j;KO#|aL-0rn6OFG(Kdl3H@2yF! zOg~dvDZ`@@6$w1LEI}I&+f`qXsQ`L`oCo6=X$?)3!d<0U?f}Ra*|;iROnx_l5bl8x8fu0GFZ;p$9mU}W$)*Q+Znyi&ewuUKWIol8*;;Z2A zluPrZT~9ih`vZH@0}y=jK@(7>G}=1wh-m{$Ko3OJ>pwpx-EtabLZHf42NWsJfsn*S z(4@GjG}^o1k>w3oQv8L8u_azDrm8LFQ6smgsQ6J^@+5`V+D`AN-H_{lwE7#`v{0ou zh~j-$OwdgnV|<-hD@ke|>9V*VhJk6;+@Z8VW9^)Vq0D-hpyY9J)W|I=Dt^?KJV`BY zqkr#?+6}oTD&GlhW(;;taS#!dSJy;ZawL+2NfI^oj&xZiFzj1Qb9SRcxlaX6 zjmDgYTuxG5LI0ldf!+i18E+qQuXb|RnavN1!;e7fBi3jmac29N*% delta 869 zcmV-r1DgEg4D<#VcTYw#00961000AY01E&B000N{0009ekr*C-Dhh&df-eC!0weG6s{Z@oIshueBakpEpG z3>3|k(;4L1aaUmkdCD$Dp=c}A=*lAAt4J>ryo)~{e{GDGq{^JLj$Ln+(bXUR8|Co? zF6B4I%hl27gbEp}4`zVR{6B9X@Il912Ajz~p zkEl7BBe0+J#gmDAMB-8jcMKIX0 z?cADhx^ru&ynXkc6H;PbeWtai$<7_UoaX=X%i&CDDa>A4Gs@~@wxiF!Yt31VKgn}? zb(kJ2p;5PgZ>Mw1@!L(4w=7AGi`yI%6tlUwWOwxL>Ka-^yqDQox6L&*d!mzK`Zz+{ z-p`Cjw(b1z1ItHdSC1VWLtj65c0XL3@5f(6?+yB#Voa+96wQ@?$|8^+g`_YHzV|{_Ce9t0S z_^+sd*kbaTsw4oPDHWUYlnVOBzAun}sl zJoIo@DB%83zaf$gn93FoncqpdntAzi$X&W@rcw5@R9GrVx9qP@V#S zXjd9g(}V0|o5d6n1PY@#7tvvDvK?qf$b?x$?Zc)4iIB%JAz-PJ@8T$`%-deAe|rL{ v4QH<^QsgL6MQ!?Hg&53s1jM2smb+IAG*aks4>b4)%D`TJATbOG0RR91)XJY~ diff --git a/utils/getData1.js b/utils/getData1.js new file mode 100644 index 0000000..e69de29 diff --git a/utils/getData2.js b/utils/getData2.js new file mode 100644 index 0000000..e69de29