From 72be2372eefffce3d6cd7a2ec641cd183058d699 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 11 Jul 2025 17:19:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E5=BD=A2=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/app.json | 10 ++++- .../assets/tabBar/icon-shape-active.png | Bin 0 -> 8713 bytes miniprogram/assets/tabBar/icon-shape.png | Bin 0 -> 9263 bytes .../assets/tabBar/icon-word-active.png | Bin 0 -> 6002 bytes miniprogram/assets/tabBar/icon-word.png | Bin 0 -> 6228 bytes .../assets/tabBar/old/icon-shape-active.png | Bin 0 -> 11626 bytes .../assets/tabBar/old/icon-shape-active2.png | Bin 0 -> 6063 bytes miniprogram/assets/tabBar/old/icon-shape.png | Bin 0 -> 6249 bytes .../assets/tabBar/old/icon-word-active.png | Bin 0 -> 7740 bytes .../assets/tabBar/old/icon-word-active2.png | Bin 0 -> 4454 bytes miniprogram/assets/tabBar/old/icon-word.png | Bin 0 -> 4600 bytes miniprogram/pages/shape/index.json | 13 ++++++ miniprogram/pages/shape/index.less | 37 ++++++++++++++++++ miniprogram/pages/shape/index.ts | 11 ++++++ miniprogram/pages/shape/index.wxml | 22 +++++++++++ tsconfig.json | 2 +- 16 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 miniprogram/assets/tabBar/icon-shape-active.png create mode 100644 miniprogram/assets/tabBar/icon-shape.png create mode 100644 miniprogram/assets/tabBar/icon-word-active.png create mode 100644 miniprogram/assets/tabBar/icon-word.png create mode 100644 miniprogram/assets/tabBar/old/icon-shape-active.png create mode 100644 miniprogram/assets/tabBar/old/icon-shape-active2.png create mode 100644 miniprogram/assets/tabBar/old/icon-shape.png create mode 100644 miniprogram/assets/tabBar/old/icon-word-active.png create mode 100644 miniprogram/assets/tabBar/old/icon-word-active2.png create mode 100644 miniprogram/assets/tabBar/old/icon-word.png create mode 100644 miniprogram/pages/shape/index.json create mode 100644 miniprogram/pages/shape/index.less create mode 100644 miniprogram/pages/shape/index.ts create mode 100644 miniprogram/pages/shape/index.wxml diff --git a/miniprogram/app.json b/miniprogram/app.json index 57bacf7..da968f4 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -1,6 +1,7 @@ { "pages": [ "pages/index/index", + "pages/shape/index", "pages/debug/debug", "pages/shapePrint/index" ], @@ -24,13 +25,20 @@ } }, "tabBar": { + "color": "#323232", + "selectedColor": "#FCD200", + "backgroundColor": "#fff", "list": [ { "pagePath": "pages/index/index", + "iconPath": "assets/tabBar/icon-word.png", + "selectedIconPath": "assets/tabBar/icon-word-active.png", "text": "识字" }, { - "pagePath": "pages/shapePrint/index", + "pagePath": "pages/shape/index", + "iconPath": "assets/tabBar/icon-shape.png", + "selectedIconPath": "assets/tabBar/icon-shape-active.png", "text": "图形" } ] diff --git a/miniprogram/assets/tabBar/icon-shape-active.png b/miniprogram/assets/tabBar/icon-shape-active.png new file mode 100644 index 0000000000000000000000000000000000000000..fb56cf8cea4e00602cc6e3676f06f064e8f98189 GIT binary patch literal 8713 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 eey1;b~Jk@6!N>z#$Z~q67IJY+d literal 0 HcmV?d00001 diff --git a/miniprogram/assets/tabBar/icon-shape.png b/miniprogram/assets/tabBar/icon-shape.png new file mode 100644 index 0000000000000000000000000000000000000000..0c5336e0ae7053b527725a63a533337ee8cd681c GIT binary patch literal 9263 zcmch7i91y9`~MkxmY8f=vW$01go+_$%Sg5sOk@d>bu2^nZBiJ7v|Ccy=a9AR%Lok# zNsQe@cpGI+V+r5K=kxg&e!p{FF4vs%oaecp<-YIN>vf;_tCtOUI7K-j2;wokgfW94 zgwFmS2OGH4{V)#({}BFW1{a``9`SkbgT?=Xp#=xH!a1CY5F`Z|VstHnGk=YTgxg_j z)s`nKdpobjN}=?Ob&ZPLa;06DxGngm0%E(azERJXLP<4E5twOw1|^(K+1bbM@gJW- z3D}F=T)EEX>0iMxWM(PN%{F<%nWriDk9*H>@3ukfmq%4+JFUai=NLQTTPrfZHs2Pw zZ`~jZ_?yfQ_QCy)ET=V#j63g+xz=q)@%k z;cEjtsMRO17AwsV8NyALfw#(t=V{x!^qR;k8245-w;Mr0)s?v63T7x6^%aJ_P*X6y z=UJ>m0K&OXW#NFCMx zfyVAME^S}=Xv=#IRfZ6q3Yow`#|r6q=pcgDX8Sc4lUoc2C3LJqB~E8@tv|A<>%D#Z z)-KItHV3Xdtb<+*J@F1nHiIU4qiITbVLbs=G}--MI^Dyz+IxKa2<0pn`7WO7MC7Gq z_x1JVF*7rZO)JJ8=fn{N-MqagNaf`#I7pJY%w}wTNDAd?vHl@HKi~MdlD(E_kR}FQ zj<~Gr@9)1;e511G>VQAuCo)L$8eghGtMbpAWezO^#?KW`QtWtBd2obL*^-4Uh?W8U zNvVIKPVCr0tqxC2OiWVjxKiD51e@=5-duz(#GQ|J#uvt%FD`l)SSe(^g`3%w)fPj|XipsvXPplF^Yd6-Y;1H*qI7ymdNb4K8Nd3(4pnGE zJm{ocfStK{zg*XIrAfXZY0Oi2p6x}~j8J@s85BmbGyb$ANIrK@Dp+dq0`bJPN}exk z4NeH#A~*?8H9I;O-*K&JY4Qko&-`hJ@E@< zuXn8n;fwTmw`ubXJ236qo3-=h%a^NBW9@uiS4>rPr~%E)v_w4h+Kf1qIQKbiZRyRM zH{ttFjk{IAQzfQlQq4jkl8M%F)_?Y|r<+@$+Ttx@Rlcl5bZ`~}i#45kI>`p@K#S%B z&90}@;;`$fCbDZou{>fDqkcB=7iaT9 zIXs8haD?m#(M_FuuO3HHHk+cH#$x!qNU+%Jxey9WkCK^Smv}=QL&knrT3A@{v90yH zeJVlM#>U287PTah%3uz55^(Zv*?0qh96(Tfi4yKPoF6|Z{wDo^fn2~;W zVT-P73Yqgj1Y1Rh5e2XH8g_+V95LWQRmf&^SG~2ZUF}o!C;Z&*=8{d#2bOj_k%Op|*T1Y8Z8izFZgvZ&1(TCzar7IZNl$Y36I2 ze|L~cuI+8qUj@X)`}GB9(mv~MhVP~lKgy(A3^W`J?2wN8$xXAy^#3(NtgI*QC+%-22#rFR_qJ|SzuLcv#E+;E7!KigPSN~Ra|t`?5hjkjQ3O+1bbZ&!WWtDq z(g{y$$w^)wo^cJ=o=gN}@L?AZZJXi>KT&6nqp_!01ML_*(BeDIWa8NKPUqy3KW}MZ zlWdMqZm>B>W=s=1%BIyzr!8JgJ=&66est9MG!!Y&ay1B2e>ajL3H@GQU%!1i?I6UO zFC?A=kE4fD?{5$&3htU)Bk*&PSI|1?8!Xa%;u~9 z^X7r3z&}5SgLrs&ushlcPtKE?m~dWR5h4WduGTRr6ou#D!Q>kf$M9g{+Ma{O)$tvg zXbLiw>*4B>zEOciRR7sz|AT~ag@ffLn2BH8yEW~n4*kjsTNLre;lkM=&rxfVM^C^w zW9ZYdk@Rm`EGy@I(1d22vB9QhixZ7a&CSg&`HiEGx@KmHL|z9aW4&T;50B99)tN5i zXRGlyQSU7YaA-;UEW<+f@r}>3jOYt*mTQROT;##GgiSCn0pnrJW24*5ICuA9J&YDk zu8DL}KqWJBY>sgm^*g}T#+s6FafI|-JS7<5IEA<1G(oxpywJ?g8OVxMtt2_iWu zsga*7Z!(wA;fBu8WYuxgs2?#I6ML^JsP!#ioC^9HF`MJVsj zV!OZG)$XO4OWS(z)=93udf~)&wHqBrM@(Q*DMHYVj=#oyEY0s9+VG20HcN=b<$Mv* zF(%pFx%vBkB8t=aJ6dQW`?!s{-@KKv~WfE&qd~Uk!^^9Dhm}I=p`g-!UogV`5C1h1SyU!{oG#P;vh1D{U=WS z@xLJ?Hv+sB%2iIi(NXLU*M0NN?f>@eoBRJBK?hYuWKo_O>FFEGt!2vGrfND*x@PoD zTn}j;JIPbl?K|N$7Tn*^)YQc882p$8*_rlPCbYawjoj1Iqv;sAc5jq>u8+%GO(Y*? zPygSeBr!F`cYNF0LZ=T9rq#Q640=4lsp<2TMG^#5bdVuQ-#g+WCZmRYWli}~>v;?` zfNzzeGYwg!Sb45u8E3@j#d>mtJLlG}K!;DKiNt=7lwBicJ>FnDj#}fM8+SdOA{$WJ zsf<Fs-Xkz5)hGf*jNvx~xQu!`fWK&^D^V3Q;)hX)3*KBrS|dISd#{iY7x(L2iYFq(~n z?8XdWj9t!u%ss|9Uzt{XNsn3ll*qGA=bHS_r;(?2RA>8Go%KaUU-unLfIn4pDpW43 zqU(xd|2;cg!}WqGhwHh%vm_LCD$Ov%e85sPIkS(U1)x|208r#2#7|Bwt27cG zy2896Mi4W~`&zoSy}c*sZz@<+%hvHy|EKvt2a(m)I(*9b3GWe_{pfwB#vqcc;XNk<9s0y#5}CqV+qs>xW~zpktaNor2LsYzQ zxn{f%VLxc!L!I_GZNBej21*>QWnI2M&TNK9eySt@kf8{XUPNMRk9?Y0#sBY>eJI%a z7fT!End@Vr;7y{u_uHY{&+WAG;q4baf~k4=XX2}# zz-&WbzW8dQz1rNK5W_3;@?vacv4wegw|TKU+4HtY5eZ4jW_MA^8G#ok9>Huix7ril zLy?}+p-U#RPT``Kzbb}*ZkGAGZ3gV@?DSgwH@wsC7vb(FbPU(pDz20+{-dw>{2VvA z6J61&+;A&haz+!_CR)`t`MJ+PGGe>pcGoV#LA$jt0JYj*Qc}|TOv(P{=}bH9`TZ!Z z6!$W=-~PD3b(6Kqj|F61zHb)h0e02--ZHt1oMrX(=U9B>^EUJssHJL=SBgdo>Fv=nAYVGtHVBAUxD@ck*j}m{X81LC158IYpkWcR&)Nu2`HX{E7+JxYCw${(=7$liHz?VG49PI5UH6Y=k zPnHAJqz4adyO^I4K+w-Ok@e??GF;Dx50FDD8klkua;p$bIwXra7P6C2ocba1S8MO+ zmoHzMPESu)BbF5ouIT{!@lCcVTyomL&Ds#~7_Ig+A`~8C* z2s1wHzGdBbamv}zFJEOY-zA|)-UR6Cae>HW&fcUKv3ocVk1ab_SJ%fg_(M6BmHys# zcH=LH?tIQOtzQ50XLsVNPyyK@^_v>`KtVjQ?`?(b$}E7^bNeXZ871CM@wum%q+~C% z`j^$Kz0ZvD&M2hlzQbbspnFow*mcw>Kz0j8d1e!94QeA2@`@!3O}+TcdI!c`c1Q=) zv~T*u&P(@hSTMucz_p3tBIJ8W?)Mq+#A4lI$iTad-`V{Rsk3aF_mbe%o}#z04}6#D^i>g429WU>C67^@KLxX~1^ zw-kTN9QY%^!T=9zeURp5{W4d#s0NOi^ap%W2Vi*hC1FPi+K6E6eZ8pM($XbKWU_$@ z3HAV+&C=2iMGAj^xDEj?Lr?>*5PiqoJpnmjoL^EvhVW%ny-Qe~80L+Z+AzI8jr76} zsOmtXvESoSs|+F~;wWLVrbMi!q+Wfhyx_-?rC@`53v~smXtb7kc}`+dw@LL;Z4Her z5|Q%H2>k6AySiXRM8tx%jZF%ODiYAOE2jRCx368$dwAD3Jp8XEV?5~9yxzF{*Z+zU zm#r&Zy4|6`MACz(_>L7o)31%?98G@&-$c{u7Oz3xm&FE`y?C8N^{#jmHO?6BZDD5wY5vhtHN$HSR|@HjTM9B< zv<_wN6qe=Ug}NYO$6J)2tB=o8L_VAQe`(S(IBK@o6sU}&b7PH1|3{-PpOsG}=Bd#K zd%mLZ$!35t$D#1Ei`HfC8j(+6i98t0Nt1v@`Dqgd;H^uCV^dsCrx_r)y=v8N0zx)j z7qIZB)A_W2t8(Uode4|LH!oi*HNN96JW`lmoaYONdH}NY(T=^(83x%whmU2vWMPqs z#*e2~#MnXN`EZ;jLsFd5;&1vnV7xmLUv3q?JE#9+bB~pftEvT^K)JH%^35nJ#bhs4LPadAdQHBf4uEJPPxG z!O>mXo=fa7D4#zO^H~&8R#RQg7YfPnIIJ9#=2a>%zS>*vbqajEp- zjF$RT?OW9rMzBat2hrrq=;-z&YSjg&k&x=5gIVlysbpvT{%yk0@iz}a0b4(krYCH|g?GgX}oS)yc8H*uU5-i@N1J^F|oB5==HrE@)MOfqOzHU8`4N^Tj z5F?^2e5y?lr4R|FItd{h=D+66NO3f!bvkPx4u_q~Nf?(#afOA2MM(f*;!F$BO*X@u zO05*C5F4`S##Un`6si>ty~xMnvl6lQy=Ebe1$ZD5s4v`rX0ht}N)Ybp=kf(<9$2kc z<`x#>jFFVCHSf+H)IWgbFa2O@z{jFRKvM%IxoBe0pQPGcE8-<-?$%xb&X{vkCAT^E zC-_~ERu!Ym_qPI|8VI@hfLNSV|GJRap$A?59WiNYxW>HS>K1cm^i0?Dl&z*H-CEnM zQh1KpN;t?=NE3yUloSyOF$I+3LH%J=#tV_@I@$V9`f0Qd*Xrh987PvQ zMzOQA8~*~cn`>^2l-N&p`SpVOzg15j`NV^F+XPDx*XzXrn1(yKt?aIqY~EOrjg<$_de#2 z<0P&R#2um3YQOPu<2!mt%z?YEzFrUFHTiq#9fjfq0&WvNLsyEl|%%FuOvJ*>>#$_^_Cmd~HeC8G?^VgR0&W4R@O=-DiNps)p{z za>1cH_g!7&n^m|RP7!YQt|@wh;E_^%38gm#&4+LaDYzXMN^CYC=$GHjgtG>QhJts1 zd{8y0kn`wUp23r=IKuA+pfXA#g8NmpBfrrHike+3Bv7M6&;f`RGI0nx)~!67!+#b- zBC}oE59>vAUK3{$opDY>Bk)YBzO$H^lrAO`atPAHhdnVmD%1U>1C1t&QU?bE&qMwF zgF&?=^?*#J;&B931rQ}AV!!ixIVX19&g3-zT88%q`>Zu@g*r#Ube>!J&q9&fCCh~WxKa#P4oC_@ZNWtdMIel960s{bduoOt2` zo0U`ci>=F3ZBBEQK-gY@?8uOp|ZI={~Y>-pxs1sTJkAt0NZj|K1{fbG(=`&I>b0~x@3|JImJ z1^xZ|_eUgSzkjV+7GdL5&6nnm3Cy5{VIOFLLTP&eK6`5MLSa=I;(97a zev>i6)>Xy|J9oQsc&{SW^qnd&0~JkLG6%fN31~j9#18&vAJr=x8+UwxkfPMWX2lAY z5~lCXFD>m+69nZ4VY-0=kIanUX2O4jk=Z#xGO;t-?P3)-FLxY4(++Nu)XjDEnoFGpO$?2qxscQREo9ennLf| z!I!hHdsMfhDqirG&X_8WSIi+nUu9iW{#9@DkE~Zq+Y5-yXw&}7V$(Ozz9f|q|F&Gz zR5=;c28c`Zx_jmMOjk0BL^h?5pvW`ah(_SPSXL{A$OtjkKn>cU$@Ql&>}@$_a3$ zQ0&_F$GM8(%F;gj)Q5KW?p+>`g1E^awZfB$wgcd@>Wrf=EHq1@B82E~NS&qj&AVNA z;ZuTOEPyW?f9Xa{RvG?*odf?qTn zcrc$0oiCfq3Y+z=oq3i}s-SW197Ex$(J?0V>sWgp+HHvbz|zX*BjP*{4FRda^is~4 z56w;`q+4KSQ+100W%aX5f224jl0_7}@OBIvNXxS%SD4sQ9X`3&kc5LxGnoo7EL>S? zCJj^QoPY=**BSF$lF*ssgM)*Pav2_cVh)^`m2Z|9EpUK#&-P~m(sl}~c_1VI(nXTT zMQkY!L^QRRrtdpHHj19c0nyTu*{xc=P4b@9Mh&S9==5(I|BT4XqtJnY!!jA&8hUzq zQSTm_s>WIp4hVy_Ps5?N9S=w5b>lNjnU_snnmXoesp|^2&3PP|P0ENu=cAem3Md;H z;!R5_=aT&oL1GIn6;R2P#S51N9_1F)&@BB5fL@+uAbBwm8;|lfVgNwg%Fe^VNF3pS zV9U247IK{9oM6>l_bcta3y?g{xrjaol9Y{?v$+>dgUpg{wH&Vf^X5*(X^!Z`le5~T zIXTkKU+OEQR=PI9|a zkgd3B{|9;UeRogKbAXcP0V?Hefw2Z)BWL35Fj)Q+2&a%V%<)>2BRZ06*rFYDCxz5p z-?_yNbn6eGU~`(lBUG_~umvj5)AtWeu@88Zby30e`dfeuGvQ>yXd;hmC!Bai3e8Jbi&HoXQAPD7E?=0u1u5 zq-0S5S~%%UEusr%a`s!4BV=`0u0(_dPK3;H;bts7W7ZcXMM-|5YW1Ta-Tx%u;%Im9%%dC zx%1FsAZE0U?Qjl9*49??ba>aT-3LF`Hji1XbBhhbBjtd{Tp8}jr?<%YnxI~6B^P;w zy}4?28_z9szPJ7|HmR8*KAr7jbl@i9qf~Z5)85nAS#}6$eg%mg{Q3Ua_ouj9i$DV3 zjJW)GO6?*y=;BYxg9qW`x0IxGChZZi>eLNVMO((M*Mvj`>Bjpl1;@H^Py)s*n zB9jas_GNzKmB~AHL3i_TM$%|92S#Om$J@upC#CyT_G!S0+>xguukxdRUD`2U-p-O; z7L#T|o?qYbG&g_zwlxl=rmS4ng3o;HIM?u~)sDJT7-MTBt$4pm0T}cKmasl9P%M64 z;25Zfu{k&$=sJ^Tl7IA7@80+YbRI`3bTYv$Zq67k-$dx>>9w9kt*UYLoqN_bBj3VB zNT;y5T?0GJE+#74Q~5%&NKpRzgZqxbkBCoBwn;9AOw0@U$?4bF#2(!*+ZB0Kw@Y6@ z-Wcoe2hgSFSXS^<-*Bbt5(kZsYb9=9mZ55`wDB(}IGb}WbAE{?POR_TUD^&B6_=4q zXrFqHY5Vx><~dN6U{x0^xq%}HVU*YHG_|z67c$4&M8w6#%?BPsL+XG3YTHuZuS=Xh zDlYcg5!tX%1ZufYc6WDO6_Qicb@?{n(5Ac%E-$`#;F_ z6Q2XArD3k&F+38wegDt{o-eOKy4^c0BC=WB{ui?r5j6(ZvTUAsrGJ7RG7)$3hgozv zLiAAkH(|2e{`ml-1oO{jScNR;W0ijX{F&(~lkq5?=L-P@r9BmnXl?83zGC(e#N56A zEr5iK;B4=!C}~J6u{q--g`!mb(D(o-XX}7vja#78g9m@z&oh4htaA9LA#_opt+_Q| z{4p4lsT|RBmBrki*g=xFEKwK{m+=Y>4c(PRRXt;}yYoet{g;zHF%Ut(&Ul z1`=K^j2&adP%x^=7@aX=QNvb-=-D5Ig8A`SXsuuIvrFYMX60RnOV|_u2_=x-Uy#rX4Q;+Fpd4eL`p*~j09-=BHd>8yo9d7i{5fx6jJ`9tGVfEHyR&u;=04HUP{K^K9b zD0l#?*}6ZOk*{AX;*xL)>_H!1M%yY@*AvHh>v^?~vtoXPPBOeEne&OuoW7hOq#Db; zfhl2G6gI1)!K^h$keLg{^J_|2&9bY<|DIdC;N}AE@*o?*-O4y(xb`B-ZFUH%zH4qj z63c(ScUtJS97S&VdT>@yF1)L_sByf{0+YNNvA6fpj>D9<6so>}Z59pUc@mrrYtMsk z3?9_;rAwg6hVK9-g~&;z9@QJ6Z7LmjpyrmN9Ih-;n?jq zJLbGkx_Duo|1_cCH++ftCfHhY6C?1k0gAhoGF5WdEKeW^p#nhD;|`Zf`Dt)tW~GMf zzg=j(YL+BN;HkRvQmCMhKd72aCTX&r`IgJcIHpb z02+w=qJ~>2n62Y;yTG%i*d8vJLhOL@0r*qcU)`7(U++W6~5bK4Eovz{(>;8GOl9h9wv(NLMz0Wzxvv-oExiJTuFdF~>9440x ztpEU`_xl5bg2-UzQ#|+u!CD#X1B4-w6|lpE)i<$$fv-rIS0VriikKK)un8^tHXW0C z-6v{xV+T7_+!YUyx%eO)@L0gR{iS9)s|;&sk@{nQt1vT|84rHk$|Q5LckQBWE`F47 zbcvg1B$&SjZMz}m&!^8cfjsHRv9Z}-_RkqjRku`MC$0HXTicUmv!9}Qg>qZtuK-3tpC z+&HjB!UpbCM%Cihfmv~kI>{-OvR|yAb97L<8%$doQBW1cZMZ4cl?-a)JPo6hg(5RF zGI}#f(yT?Y^;80PHMXhZM`1oDu~w^Au~}tIL>l8ri_W!3)k3h%IO~vV=)ri(uj+Ph zaUh}A#e%9$O2O_t`2lNi%RQ*YWPVtp8GRdB0aC%~Y!uEmi4Y~l=;#R?+D^$Vwoh>nJ)8ijsT!68RKskCPC91kmf1!I$V|`#c zVe+x{GPuUJG*amj&7gRP-r%v4eM)p-I&pJ#fK8d8Y(d=#+4eSIcSy{Euo7O>`yS~jG2+wLMEWApC|WB-tgnhsjx!(}$LI|lodn=Tv)1~H2Cz;2WZ(Vpy%WNY@&$mLjm!<0ad4u$+_h}NpGpz zP9Tv~`9}8==gw&^ac-1w?>Z$rsnDPB2aRaE!bm<9r+Fo6Wmc=TJr+`Kux;Fx3>ra! zxMVUZm?oO*l09gaqW6dB9OSggJY3JD{W@T}s=#Pz6(EGm4(|tYN1UN$6*FgmQ`>ov z(=|>1V}j{^$KsI4)sWfBRm1MoAy!u6=HedRN_F6A7IuIx)qcw3BC7%FI8~DC^{!&~ zq(S*KQ-$k5u%(Op8%5OBw;L()bAlIjGwe<^-K-CsDqFH~@F?Gqddf-XZuV@nL%BWB z;-A|U)eX{NGPgOkbF=;>#W28X9DzIWqP_3EIEGzW_d@=CZlX`bgPf$vY>j^4YvMOs z^LSE{&9*)@4q5$170^UCcR$aa3o(Zk(J>BD-aw;^i#w$GY0Xb$ps`E-mrSQsdB%oC zd^X>e;GuPoWAR-jEV7@kCC)b~PeHSueMOI6HYqP%MI-}8_CG(~vw-_?vHg2)cOwKGHjy98#W^A~Bk({x3 zqk}-^-cEx|=v#|Kr(zLL+*E+68>o3dP59LS1WqBxeOG13Ju#dN+$^o(((OjUuU-S; zY`;J7&raZGRw_B;HmAV|I~3h2zkG|zDiZ(Kk`PYe)7`nA^9jg;Fep00OY9G~qYu!i z=NvCK51NdDCLf>tYjOjM)|8ii_ByNK*m?LTxGJFPhu*y%{#{i7obL!lN1G&wUGExH z!C?CeI1SF$!bz#Zi0C5D%Qpv3{ByP;A74%89+YKNE{Dd8#b9WHDuK?OEudizoYa=b zH#Uio4_u`LK-HS0o^gQiJvix#uyC}Nl>Bql;d53L{L_F6uw|lifH-fSh;jXZ3T%{0ZH68z?pRO2mKK->*dd+xCJ|`4|5C5&4kw%&3Il@w$|u z3RHQb-0QSC{wzk+2T+&ap?emA3%(6SZ@u`lH(9|59EWfJANWQBWTH&{Uu!gYuZ5b5 z@Rqm^87SpMM`w!l$P|7z=ZqA`m*cUTd}BGnAfMzmU83_c9vPE^cgx3roX=|-3S1yv z7^+a3eufBjf8D)q9BLc4#}EyJ5%&vT6p%tZz4&&oAsgJ@3N8`Qr`3evx6Jx*bKWk8|N9=vn21FKh`&RryX{wV1Z{?uU)zVV<;TD`lYY zc~NU@YMZK8H*>SBp^kOk*7`s1Z~0uRDhw!x(hj}|uftao&RmSH4VM#3_CaN~=Knea z46jXt5ekX_-lxPNr^B=EsTd-$?+!?fjQ=@~zj&!)b}Y@>A!2{P`F}y|GpG4$%eOr0 z;iOl2*mEDnISs<4I``*g?U!htN^p{)NVL{{a^@k*lI0MaYDW2M1kR{jJo9H;R!U)) zw|}+Cg^0CY2c)R<`2&&o@7AdY-u9K9P&5OlZb=?FGdkQch&7;p`rR!A?gn^~%DO#M23}L#q=P~ z85ZlU&Kbu!>!VLyAB?Kq3u8EvzxobN z>(6N~R^3kW8xZcbi@oUS9V8r%T%2LodK{Ql*l52O3~QZ1%-wOkJ^fe9q>Ot~T63qG z?R)L7n;N|ufy1%n>9$<&i2J1;q}RwzUj`-QW;iI0b|WETYzey;X`*UE_Bd8h)Oa~= zur*V+Bda{A1#iX2@2DIMv0lCjKNiM}VYKKFrZAa55UBs+vHJ^M+@G)(sh%6DXn3fA z`F8pMAf#o@)`%bZG!Lz}4B9sl8LoJp9c)JuFvEYXRqbhEsHr$u;kL;k24zstm}xM|E{813&skKYxT5q0YsuliK_`3%5! zJZgStDRMmaUJ+zSnQ?vZlR$JMepgjdG&+MdwzN7vQkJmUjd|4J-=M8VGC;G!m>&*4 zpmZM|W3GS3Aa-dwr@#j=1+rp<<~CVnU7Fe_4}H*I-oy1+6Y1qSV=(4*(@!atJwR^o zm9`Mq#JZUcr)77*G|4d3z3t&;?9St9Rp99zw}GutZ<^Gri2qY3)cs&VSD0E!zd90n zI{ET);JLC}elbAjjun4WXyIr1q$~)1n7IGQD2N8FtY(Ki@^*gO>)dFM%CE?KkvvQN z>|1;UZIcgCT5bFhkRY%tOy87z${^i1zPk)Ll&0U~S5v#5wQMu{j~VGY(HT{*pqRE} zw&(F>{e=L*{ru>75zjX+ybkghG#3|5OsmrEmX*QWccni+29V+5vx1|tG@kU>{DK$UCY93&1v zmN>DR^rs-Xt2Ie=XA{^NiqmH(4y#96KGftY{(ERTW#kl(8&Qo;$lqGI0x-nMIi%6o zu^@?AV(TpY9TumczI%FIVzY<1pV?9&ycrX+@1rTm#`lF1!69AK?@wT%^?@YJNc!OA z`h~UDUt0vgS<$5{I4toR)2$ESP_WA8M*G2@d3>i%(2w?bJvD~~d&agxQaN!y%W1W6 z5x4VgkMu zxPv|{rDM)vLfSG=CGRuF)$GUAl-M<$tBpjY}6jBe{BD1?=`_Jq|+)z9#&qV%%Aa zb4=>wY{(-}ds+wKmutHuZNrg<>5?-1g&Z9^_w`F>YIAMjNu06wmJh8|fTuDD|4S`v zW+qA=5?707z)LHG;N(4V$PnbEW?Ki!;+MomEFYkP_d5&{_iEu=haK; ziXUq}C4=_!u)XsfmEUfLBfSeX$jW#LU04k4@r=5rVryDnXd<;xau?T3%K6n=Lx=MsSSKsK&fD=?2Ib zhrgm~RJ)OAWeBi#f{L8)u;yL(!gcZ(o-Bkbn=02pFQ^=JmQZ{HB*3)EtU0fA)-R@bVNIyWA&J#P26_)%Q1XpnHXy?^Y_I;>*vq(gayC zwINYgG9cCFa)QK~IfJP__ zbdTg}uNh08xA&En)~N2g+t4nj87=Ene?mL% z#eEoggk(2*uU!-Jf+h!|y!MZjOm*VtLXcbK5m{&V~v%6l{<H#tBc1U;c;K!0_2L{S&B`gPf4)NOD@wT7Y`uKnA4Zdpr+h^J0`uch)ABN+H<-n96IJ3_8*#}uxhDX1PcJnl zbr1BshkH}M&bbNJPd!jxXCIW6jr>T~{WJ7Un6bWBboLInxX?j-y1++@YTIp&oqLNt7GFvTiLaqB+ZVtc{n* zVRq@rhO0xjC;MFsz)9~zPE zp*Cw`Rdr#8onnoYY!}@AF(<4mDB;65Hj>NiaIzv|BK#}q*ANtK(M7t4lv3DhIr{gM=5G<2rYS&~xtpHeu73n#wesDUY zay2HQ_k>Z`w>i^8#Sm2)A>8E4I)QXc`jR*uDz3y8`|#o;mXb6slhqdie1A*Q#|__z uGF-!pm+FA-FWPQI^3kvXsa!WDpq=va~Rh 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⩔RMqF>-Oz!EC+aQm#Dh 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 literal 0 HcmV?d00001 diff --git a/miniprogram/assets/tabBar/old/icon-shape-active.png b/miniprogram/assets/tabBar/old/icon-shape-active.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ee3711622f7dedd1f115d1bf53cf0f5b156345 GIT binary patch literal 11626 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 AtN;K2 literal 0 HcmV?d00001 diff --git a/miniprogram/assets/tabBar/old/icon-shape-active2.png b/miniprogram/assets/tabBar/old/icon-shape-active2.png new file mode 100644 index 0000000000000000000000000000000000000000..bbbc3a6daece23ea359eb1aae4bb81d51e23e332 GIT binary patch literal 6063 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 literal 0 HcmV?d00001 diff --git a/miniprogram/assets/tabBar/old/icon-shape.png b/miniprogram/assets/tabBar/old/icon-shape.png new file mode 100644 index 0000000000000000000000000000000000000000..f84289f634b3a7f4129c9eb959ed53a4d3b910c1 GIT binary patch literal 6249 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 ZheJFwvGAWh1O8nAm>XY3))>0S{~z*l@NNJA literal 0 HcmV?d00001 diff --git a/miniprogram/assets/tabBar/old/icon-word-active.png b/miniprogram/assets/tabBar/old/icon-word-active.png new file mode 100644 index 0000000000000000000000000000000000000000..8dbea7f362faded610ce51c2ab5378b49fc63025 GIT binary patch literal 7740 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 literal 0 HcmV?d00001 diff --git a/miniprogram/assets/tabBar/old/icon-word-active2.png b/miniprogram/assets/tabBar/old/icon-word-active2.png new file mode 100644 index 0000000000000000000000000000000000000000..136c70d2d75912ead569a0c6c175f7f283583ddc GIT binary patch literal 4454 zcma)Ac{r3^8y`)E7`tIID9QfXvQL(=C;Kw?U6vS2j6E_4SzoEhgo(n~M+sw(2??eyS~4^b6wAKuKRxO`*+Usob$Wy`#cXU%nVtW_?Q3y0E^KLJu6!O zgLY9FLA1L{rxAtL(S=zV>Hz9S_%~_7`7j+L8%A2Y%Xljd0N`LZ($ltydbTrfp2k1x z%0S(#uZm5Z)SrnA7xDBJcGivY>5hZrWaj41J2T2$qs#ZdCZ%0GlAK{Ys3-VMkj+(; znSNPYlo$;gbk?`9h%HYInIHH;x-Y)>)3JpTPBc4nMi1Zm^i*p;d<1Xp^5q2c_unRV zXYi-NBb#o>A|N}*|Jib#IEe`kaD-TZhbecF^G67di&$Qe=6>G&Sp~GoT<&3brtYNP z_iBAyctV}gM+Pc8LJOsY9)Wgi*G0{b5Qah~-N*=D?S*p<9F44nL-vqSC$$LZ_Ae$L z%An92eVVPmeb&_fJ=L4(TH27>Id4S=% z0eg@3!(~j37dMfo@Me|zQ=@$*aF|!6r*!Z#k^-j`z5mA@6wv@PganYfq$dy}*1M=Q z7JzJ(Dlh%_%8A|}$`#Kq8syVC{w&MtRHx?|X+=j8kx!N`KsTUhvD7J67rpKF9P%`~ z7ASZzliqN%yFHtnC;X#FuK$J8Dc1V3E3imh^C0?e)g?=Hu#4`8c90|FC{D2Ct08y5 z^MEvmp{9-=>AJix$#?ZaczKSPE9J;S(E;g@{OWk;!-I3%FEmiZng<)!>Z-4h zhX=P|&1+l>tbB>h5=Xa4L1;5@F`j;zP>7Qv;&_`iy@#Z-kWFM#NfvKHgrfXwKA81exo!aX#(Q(REz zqe`NTDCyD*gmNEaw`Rg*t>9rI#K_VeC(W(BkjRq*b3NU5*vf;EWsMT6r_3F9_AaI%)pRWpnsUp28_HZ+V2c_8esZ@+^ivoM{{jsiyWjk-6W zk9!erI6sqc-6A*o093Z+Meq-Lz1qFm1>p8)7A_VQUEDeeF&Z)sj>RWdJn452%j9`S zlgVIMQ_Pfer!d#$rhNXNVY(5#&WgP< zGb`nB3@4?k4Qg^ULs`%-fm!^{%Y1z3QqwSIn!hYso*Xg;HXdFtc}$b4dYAkdW@kUd zjYia=vUA-m8Q`!LO?Bm7pQeh)T!Naxf}ViiRB&*Zw*ra>>$T?e8Y5HaVarSz9Rp+6 zOVuL2z4`R`#_b1suzz7D{#A-T{Zpjwr=}01d1~6l&;fae5DwHDbahr2fN~R?7D@|1!x0GQ+?Ff@$$d(GUMa3+*OHLx27A@*@-GqsV-p-4*usLg@GW^QaHHqwu z-zIXF^fR0NmWw|f2q)H}((Hsr1Wa)m*L#0qhNzg> zo0DU43VpAt%=t`l*l{qHv|+CyL4EOcGg1*_pkU|=KxI!nWqecBex#X>P-(cRoH0z` zGd2k?sVHMq6DDG-rgG9R2k0heTdq|ugIY}WUeM+ncCtrEC2MoBw&j9pV#|Gp2-eV+cN$- zM@eL*Mv6*b@`KcvW|NN&?AOnQN5#HYc!5ge6>pVKvZbo}dsWP_zGIIr&BDQ>I#SK)dmHMZ4vaN-IJ4@K;MSTHfo7(aSZoC1Ac+Bq@lWd%I@MzMJP=R(> zCDz>0pYXqhWA?V|n`8b6#(GclSFiiy*4(^+E^r`3SboUtFKNO%5Rt~I z#w8Y>bK5m@?=ba+JQK-BhzbAgED^xphYhz=#vTiA9DkdCooc$LFI{+0R?wCeLh9+x<{^05vcHUpS(XjYF zgzT7@P2G-FJxSv0N=2oa)7^E$d=@#u&6#pXeqg^>ct~ZKu$?rqJpb!aMy<21(~~2d z?r9@kXHGz8Kld>xA=pP3?Wl2TrZk~sw^}jB-N#aPEW-nni+9SQR(CR`(*sR+C1Sjl zi3)0+o6ierS#7O&smw~&n3@6aGjEj<69p?yq)2KOi^mJ01%@&)<&L@hS{%d_?|1*3 zpH`&F{;h|c`Q!_R43tN$*(S@;%;=N8pxlJNo^EYk`Id0+XlQ7*W3Dm#j`HiM4tFWo zN}Z%;q#eY?@O(96tG^$!)URMcS(h`0Yd=Ly+6A=auyG=F-mLN#_@Gw-rO_9tz6SfX zkCCTmSL(-P$x2-O`5M79@1%eBEppnqVm&3D)sns%VHQmix{CRibADX<$m)_K)d>_p z5n@UME@*O+_OOuCXo{8dJ|AUedOmkFj9rbo<&(C^?2^p9P_J7Z`l$SuHR;mVt`#2& z92L!mj)lxFiJOLt9aGk%P8})NP{{BK`@qjcQKHGUj$6&+k{8g`sq^}i`Jz>YjGC-2 zNwx2H*Ue(5xLx0s@>!GEbSK@bKcy->1hYZ?tE4PXttoscB%hx{zxZHC&RB32jN?=; zaGBxxRs-_qY98&w%=G%yO(oBlZ|IE_@Rtk*-h~iZoqCE>U1_D1e~2-}yvN=8Mq-z} z1F0lgruROMnSTKOZU>2~05zv`#9jicAa5j$I!01q&$mKITVuA~6hP4+6Y+sIFT$`X znr%ib5gWEE8m$x_(>r3WLsd9;i%Gm(D^z@Z@FTrM!sC^e@?$mZ2_=!o;+If5fBGM( z__GrB(>A8x&tD$D`9YP<;IG^@cbW(amUQ-TVOYD4u|ju!Ff1Hc>JpwVQ4mLy*+nD!dk` zaHN1+wxRpL)v}$8S#%2HB30Nj_#u@uD(OLmfM;<&yRyfPbw-5s&caCUsfMVZQR~Vy zx>cl#xHT^aJbF_U1iX_q0sxv;{I%QnP3dOFjDSi`NSQ9EuzY*BFI4j;Z&}#l26TtN zO~&7W#yL|5*ZOd^n_B<@%k~EK5Am671Ua&z_q~pY)iv_4!9FSFyUS3oUMoEp4bpX1 z@G=K#+N{GIWY0wq-08>n6tBxa;RKoj%GmX15A(&dG2tem?Ck+u7X=NmqyFY~6hc4olMqR&%FYP&Ie5rV7 zRV2}OnmW&YH#9k3xsQ+(bQoRM7jh{SRH%7*3kq@KZXH*V$bKcXkVeFMmRR+a6=+>A z@x*QF(Druk{P;7&2fC3T=SS|a^=6l-kM|>;cG>yS`)$(Fq`P<(YuLA`x5}dxoOe_8F zP$1`iOjFkCLahFy#tt0Dz-5(&@9lxnx6(U`4W4f?UQQ1uUZkkfJ1`=+82}L+?q91p z`&Ss+^RMgF3Py;fQfxyirWm{F5+?CIzgthLF40oAVRk3u?%Pp?Prjj~jhpp9#{v^D z*|xNhCzc8o8?$hVyr+K$mq-9GFx@S#fVwn24j^3a(UgmOD@8jxhSi89PONC>)+G@Q z0Lpf@s}ATAO!m}!$q019{9ip>9CP_S97EX#w|;7hTLL0=Wu1T4|v%G8P`^R2k2eA^^y>reH6R!HSEf&!PhQu6G~ zkaMDZM|p}{*q;Ipt0qGNK(-=; z3@LnahR{mod)OyX{L1avCL+W`Rc8|MaG7q!S*mR_q8dzN;$&it*CW0;pzi$DSbUGq zgxLC{HUl*6B)!j6Jc$?Wsw(y==|@bG*Vt#TL}fBY7^4a}5-Mt4TZVGMXj4f3>o)*Y za^3wpB`ea9McKD#FnV|sP-K*trAL)eh1BPb4b%BF|GbcnalHaZ_%2gi*8*laVb|1W8ce`HAZPl$(Ci1wUBLOkjfX8 z@in%wednEoF^nbq8t>El{`dRicfIGjp66Wm@|<%&_c`aj@6SoTas8^0fRq3i7nhL9 zHMAwruK~|5Fdy*N{Aj`kx7ZA&jIw5N@^h5fI=1MVan!IBl!mJc6R87b;B zb+`emH>f%WnDZpp6Y{7p(l z^G-;Vfh97_@&0CSa+}rqLx!U<2(asaYYzk1+(fg1`nLM|w8z(+(MRBONmXYq@Ty~8 zS$6F2KTMt3Mh0J2YrYNAu^2#~(YVL5hhGqI6luBO#&STPkiwFoiyIIr59ui(xE;in zpXzFg-b_K*gF_>DA@%g|mjqwv%_9|jWdL6mXG=at5q)6w9OYHHbfhm=bePYN{1m~F zs2nfuLzUvkY)qrBNW9XG&04Kh_G5)PB~QT8a1^pc+HXJ8c|YcH1Z7sv@^5rqo;x}4W9%vw=24( z{orvZ{#)Zk`5TB{S>2p_=elb{{CGc8y&EYjK4lQ`^O2n8$*xC@aW1$9i>8c>46%&K zrwG~bv%IV{x6zXBWmV^o=6koeS1VL#@SlT>PWwxrj}<^-wl#JF`M3rlv3zV%kQB*C z)FVdtGU<>G=>Ia_EM}+|zAV8d#F1BEJqXeey*8e%H!UB>P?7+J^YxDQ`mZE$XlSVZThA~J#se59`MuWLJ6QiD{He1T zg(p`3QIu~)?6%GfkhJ-%XV?XWh>Xn-3I*9=>Q4)A0x;J6SHd5tC&QtbHgOdxMudDkTYb2a#nS zI{!WIx>sP4Hs7iti8-Y+6y-m)xe4oi6w$9H4%z|B_NZa08>vjc)bZ1dt3iUSSd{F< zn4m)8!lm9P?a|*>BOkLQkcVT*k;wKmOA+FMA9WtNaOFRW_WId(m3#tL*JcM0>NDq+ z050wkD!M(yGh)u?EHsS$z!%x&q6kKYc_lvW-8!Jb;;+cjrrIP!a~KNYVt{B&hHmRK%Sw&R@8Z0J3)I;&3i+4?+vG7OS|q;DdXJlLlO6KNx#L zkWaI$6E||$x!J;lc=>6eFtX{{-|iRNiAF(!bH{y13mX@&L)g9jg1QqDGpv!hIZy1l z)GzmvFVaqs8?(v*3!bs=*rr>|PaT4s9z%)seO=!A4w2aMAWj@Vo^$d$YIlSamIqAG z<@*vF^lq5*6h=%U+6g$Kz|=@Hw8Qn~BB$!j*3T|K0*UzqLig$2L(qi}M{kH@&2=OM zci=B>sPD#U6uYp>Eh|QtOjYlfb=HND`qI`sCN!0~d=q1xG|sxU4P(YM6AwOnt3V5C zl}*lQ$O!UbpFOV`e-?4R=JLo-jV9#&Hm^0U7t9; z;_(6uTKeLMmpml-EDcx;qBEdfrdcU|yBF7MQl8!^n`glA*9{>_S7|RNdxH5GDS<;+k4z z>D@~*#-!#EL0#dVn%idCl-!|hRCQHViKBO-OcLu(Ga^XgZBMX1&CT{oowo=u#wmEY z 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 T#88&|pN~w8ucNCBUE=-?*3zo9 literal 0 HcmV?d00001 diff --git a/miniprogram/pages/shape/index.json b/miniprogram/pages/shape/index.json new file mode 100644 index 0000000..0539588 --- /dev/null +++ b/miniprogram/pages/shape/index.json @@ -0,0 +1,13 @@ +{ + "navigationBarTitleText": "涂鸦丫-图形", + "navigationBarBackgroundColor": "#FFD719", + "homeButton": true, + "backgroundColor": "#F6F6F6", + "enablePullDownRefresh": false, + "usingComponents": { + "van-divider": "@vant/weapp/divider/index", + "van-icon": "@vant/weapp/icon/index", + "van-popup": "@vant/weapp/popup/index", + "toy-button": "../../ui/button/button" + } +} diff --git a/miniprogram/pages/shape/index.less b/miniprogram/pages/shape/index.less new file mode 100644 index 0000000..2e0eedf --- /dev/null +++ b/miniprogram/pages/shape/index.less @@ -0,0 +1,37 @@ +page { + background-color: #f6f6f6; +} + +.page-container { + background-color: #f6f6f6; + padding: 0 24rpx; + box-sizing: border-box; + + .empty { + height: 190rpx; + } + + .wrapper { + background-color: #ffffff; + border-radius: 20rpx; + padding: 24rpx; + box-shadow: 0 3rpx 4rpx rgba(0, 0, 0, 0.15); + margin: 30rpx 0; + display: flex; + flex-direction: column; + + .wrapper-title { + font-size: 32rpx; + color: #141414; + margin-bottom: 24rpx; + font-weight: bold; + text-align: center; + } + } + + .btn-area { + display: flex; + flex-direction: row; + justify-content: space-between; + } +} \ No newline at end of file diff --git a/miniprogram/pages/shape/index.ts b/miniprogram/pages/shape/index.ts new file mode 100644 index 0000000..646a4ab --- /dev/null +++ b/miniprogram/pages/shape/index.ts @@ -0,0 +1,11 @@ +Page({ + data: { + shapeList: [], + }, + + onLoad() { + this.setData({ + shapeList: [], + }); + }, +}); \ No newline at end of file diff --git a/miniprogram/pages/shape/index.wxml b/miniprogram/pages/shape/index.wxml new file mode 100644 index 0000000..c140015 --- /dev/null +++ b/miniprogram/pages/shape/index.wxml @@ -0,0 +1,22 @@ + + + 自定义涂鸦卡 + + + 选择图形 + + + 随机生成 + + + + + diff --git a/tsconfig.json b/tsconfig.json index 309f3f7..26b593b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,6 @@ "lib": ["ES2020"], "typeRoots": ["./node_modules/@types", "./typings"] }, - "include": ["./**/*.ts"], + "include": ["./**/*.ts", "miniprogram/demoPages/shapePrint/index.js"], "exclude": ["node_modules"] }