h-^~mjZ#>R zX^1WGxvnxjJ$*7Jq3*xGUZPVy0uf}y7k%y>)uSzaazd$ziHWlww3ICDs;9i;AGc_8 zlYU4OHTQ&X9AO{pK3|MBKXpUU3Z3Ek)y=FGr;Fw|Wo2bCMAN_#Ns^j;ZYSsG!>Rbn z+bc3zi&QFAiNaSdn8`lu1i-R;u1~u`SKDluV_V7{y_3-O`Hd7cRn?*5{x|J!-gCX` z%_Q%+1SnsOd-Td|ZEdY){MD=Vt=&E1&eGf5kzSk1TJh54I6}nxB>q*D1L>gu=68 zYzF@cb>&lm0`JFl$1RqA2txlZ7JGi_>-*&D%$n?0Lqq=8Cr|pwP1PAVSNc68WPaMD z 2WCb_+E6tCyB*fbHX0<0c8<@g zJ6dwh_-Yv`f2q3D{II!1A|Y;VZJq0!l|8!Gr1bGgb!nBRx z!NK9B%DuSsTkf01Io}0!!-mF}0?dDYn+iD#6#Hqe zm?DMtkQU$dNX!7)?soSZrm%o%T$=u#~KiSd=bA5;R8iQMPB4vajP_< z*c1ItZ<&9ISrKo?mE(;rgKV!TB^t0*wmHjvvi`Q3w>V+21q<92P5Lyq+DhV(29Z&Z zjSqw>y7rg?cWef)3s%h1#}N$2&1p?==1sL8sk#OsfG%>gp4-0nnBEjXUN~7SbdoNg zaI9NJT3SXMZJ+6}J|uRWb~%*7(EKj*?^0V>ZSRF$aG_KB+p!mUd*!Vk&ZT~uNMB`) R4eW0`-!B8aTS(y-{{Tw6DzX3o diff --git a/static/tabbar/icon-scan.png b/static/tabbar/icon-scan.png index d55ebc6848ea7c58b9bff91d0b3f49179edffcc7..3298a9bb824d5da68aab2ae5202e7f9ccc3827f4 100644 GIT binary patch literal 1116 zcmeAS@N?(olHy`uVBq!ia0vp^9zg8L!3-o<=1;i5z`)26;1l8s (Qzdru@*RfZ>8ZLe*I`i2x>RBc*DD+B#{DK+&eq{S`ikJD@s{p}_ zB;)5#?=0-C$P2f)uw_N7%C)_9C2n#O|L%L~A33~z+SIn~YN>Gy3`|!&T^vIq4zInQ zUVO_zfbBsjtBUs*KDM6fNwz(?UD|qu-MfST{kK0UvF75UCO@b1$5WrpwSH@wFtIJ{ z#9I^NMKdzrJ>iOCUUZ>1ic2=g)VVc4C@R#=|KzPSrV7uaI(idyy=oR4UXoDAE$BJ5 zMxnh+(q#3nhL{$4?&sT=DVV47)=UkSa9YJ fCktJ&9I_!whQwlm#wd%Z=)mM-OEH&}AD!}`3e%g)}g=P9T=vo7QLn&iz5 zM<&E3Er@@^(s?NS_2n%UC;SXA%#c-@I4!N3=Xvutg9{0E9O>10qATV61Ll975cT)W zORm%GoUxaFdpMS`hCJq2#iVk?qUi|B42$=Te~&rXFOOa9V<01XY+XgujKxVi_$J)` zXUS$IHD@Q^WUXV1xI}wgS lzQ5qTa9s2AGwCTV z`SQQx^7?9)PdgT|WMSvVj6-_IlEn8}YYBgnthsxCkCoQ_InSl!KFcWA$IdQeJ+*Fu zAX`-$f1j76ie%>s_Srg&YxIO&)=w;xam;1NI3j5BmwlOz{E`XozDKlY+vS7^POow4 z(DJ#O`LQWoHuk)I_A7(M-NpX%A0NnmviNvgiGx*5=0)LYhGn bO;$!q0^^2Kz=FZsA z5a;Y?Dl2x`=!D{8M}@8Pcw$;hMJq}^E9ogb+kL=WKkPz#&=tigYo{qKXkM^IN}%zU t=96v4pGwZAY%6Z< Y%Q~loCIAEv8-oA< literal 2605 zcmX|D2{0R47mg775?*boCDMf|k`Ocz>x;c&CziH}M2RJWRHBrmEw36|Ev3Zr=&z{S z)z(&MsaC71ilV3rs*A3+E`ELgoBz(7d+)jD%=gXr&77H==7zVIk%UMB000?B2b{<5 z>98A);-b5IX%le)01$GfdJz}|m!lYRRHOlk5)~9|z>1{r)&T&lC5uiXhX*sDLBSzZ znmKH(y9WlPQp{n##x4jK`k%p}REN_s!Jen_UgXo^WHbe4X(5SaVRiu`gBc_!D>8x> zi(#3={=voU-hV&CVbFhC7~$qH>)(V>f{PpUJSsIh^GJ{gHJgqorakR}MUAxaNw zh(Mac5vFjYkv;;6L6~5S(9nMu%t8{1jiH>xc;M{*CELx+VWA8L9Rr6mnM?zwkwH{U z2pow C ddrJ@ zMRFXa@wjM&k0PO0C$DW};```2uf;NH $t+0<>*~k6Kxd2=f3IA{Ky5pr-fe3p!}E5R@oG5T22K sqe*ebpySNyRiGD)RVh$Y5S3jNeu>gx|a zA**#KzK?4qKQBKIrI+~H1LsfQYq$S|5baV7)u015(fL;-UMh%c*d&%L53u)gd;ouO z1T@_`g(3Me-y`}fUgc(-Gu1bOtM<0Yf^$2GgwOfN?-$yl&yiF=*suxxbZnc^f~D zBE;(a16V3X^X(+qmJ2Sdy365ROe^@#I_Z@HkucD4QsN)z+-lpYasSl{51=ilhaN9G zSo_Fs>PYaK&Vi8zPH<8JO2#j>wN1w}(kBWq+t*t@1AaQ$TvwX!BEK|#+2ACBKKHlK zacsVK^X=wCePzA}9M8AqOdL}&L64a~gzup5HO;zvPgqv~Okn|45_ w44e$#~4QRlNA*#S4_F9k-+9 znhV6-f{S5lfw>hmb`W|He?D;FUaQsN&vFwScPWjXiR>`NAFn8>{TW&w?q@1CO!TB6 zm5}#`sH4u;bLwUiE}1^bs`mL}d-eU3$sXQJ|7v!JQ*Q0^WgirsSzM={9LLJm&bsE! z743Wc*nNF=)PZm=)8gEdwKvfoKd=fWs^8aK?nIfswo+pU_)~yK&_u6eYV4oOsV|su zD(tGFQL>MG5nFS*r%`GT=mRsX38{ jE3wr7ZB$TCt2vn z6*k_2<^{H;zTHV4@CS2j_^YeihWdUo=NZI9ZfoOCxU$Uz40tGOw5vU>QiI?R9yB(N z4|y25|8Ux+vfHb-zPF;J_11%4O-HS_MEDfG)I1y|J)|%WRea`XhYHflXgv76okx0V z8WfETG4v0TOkQ9W$v<0&I9Xd#Z1^5B-F@6zL8dlS6m|bp(d*L>K9KxJ@{#CbWOUD% z`@(Ys!gLZdCQhZhz;I`-Cbo|lht@oI#G&xgD&%9jfTcH9Wa5(IQ?`k1^t&;8)Rcl& zLjczUmGTL3uBKT>)yAG&D~mL%dUh2IK3pzH#>+tV!yu2NUuJ!(Qu#)L%AXei0}8Y| znATYEwECIK2+X8wY~VGs5W|HYI|=m*TeR_kiq!dGi1LBEp+%|ny>+1osV0Pi`E{v# zn8sIDmdr;P6@QZy-vs%NuaLtJX`e?O88fmmu(Z*xgd7XgqG?N~a;$-SRuac4(`hy4 zQLZUx{8H|}1l@m#yt=REruW?j5bH>x#`q245Fqk~Lycn7A3%SplBbtEr6*=KuZV9L zTzGbwZmJ?z{Hs+j+_T!E?o%Zwdi?PQc88J5As^RM+YGzdC>q7cXx#qB%^Z?TCnQDa zs;a0euW;aFpSf|WK5fdw3CIL5u}oHz+sZcHw-?kE`)kHJ&Md`qvTh@ZiL;N{2z1T< zbIY1CC?Mt->2 0tqo1$NrV zZH0r4tAqSws>)7H4%cZ35+TdlUrbdrZH~)cl@yaMR@(LSt4^k)Il6PU!LL!gn}qFt zz5k Oh=0Yjc_E0KH6#0Z>lLJ^7GHP;2;p9C zy?^MT{F@&)N+oq>=2N#$Eeutg{e2VW4=B(uwM@evu6^`M<4W1ICy5qTpQL*#HZbJ9 z+KV7*%!y(dfa{B%Lf+X4VXW*Ar{@bl*Q7tLHJsqo_x=jl`+`X;B;T$~FM92#6vuGc z7fy)y3B610=T%T} ~6{+uZh_lW4HW&atsY@lQA2|6T zhFh?~$q@O-|ApdPO|2)@aJ_t(32aTPk$9kDzfJS%MqanusjY4q)(F@BS-M!$`*x>S zl;lRxro_>$j(Y-jN-K#QCUk9Y^_-U6#`ZcbT`~vs!DgyFy;yz8VBVRZ9GG`QsbtXT zOE*u6(G5zLi~n|4wm@+Bf$ZXQ)wRw;?+(~K}gxyeIJi4+S)sx zt>zC*^QHJ)){2v-e4bU@WoSZ|@gV<$vEUI7f9{0vFA)Z-)i=jUoT8nE^}Dslk+`Eq zSNvSWe*kxR0FxiaQyinEAM9gs*>i~@*G7T)eWh*~KnFH`y 5<4e{)M0p28+BLDyZ diff --git a/static/tabbar/icon-select-fun.png b/static/tabbar/icon-select-fun.png index dbc2af9e1dd6226dffcb56b0e37ffc4770aca1bc..9f48b2359648d0889868acf58869aba0381ac2dc 100644 GIT binary patch literal 756 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*Fy#$pJngu0Wb$(aS-FGS0Zp0J_Sc zB*-tA;l?SUFZ1&`uJkYIdAj0ZlH}WI6)%q-+|?A$cl+GFHM27(#{IarbyJ6 =WiZ$=`+M96#M{u^1-Hw-x z8s#Ph-i*gw#a}F$(f5?ml+!7}e%kf!Kiuz3rd&}}@MPN~{E{wu{S8>u!UrXGntc z7S?|gkJukn #q86pQb2spm5@4lDA{p81V!#S)z(GKL#lA5T<& zm;PvLdCh{D@|p(T+&$}6#g;4bJy@%H?ZD&}tZVKI7k~J`qp@jk`MiwD5B76c>?&w0 z?AWHP=O0oba+8bU`1E_hAxWDn;ytQ=-^pxpSo%x5VABV;`cA2xoWc^UJC|}yQL8_- zCwGrUk9l|T#OF*2)0=a@#Teg{du-*h?PdtWDyK8iA2#Of@ND`nVi0#Y^ymJ##Ey^F z?6dZL($G4voPR-Vwe8=6)++}ht9K;rxHC0S;PBQ9efB)! n9Ef*-?`}q1QhDN TaFy;4hWmp?Y?T}m)3p0GsD%s6>sxcwB^mwIsYFEGqVOv Um}9r )0@J*>RssDsmmkX2Y^&9UBpckY8@OHAK2d zxoit*IVU=j$gjvHN`+i T+3IHIt z7{5S9pocpqf<`q7i=>5a1QLB z9Y!n`?y#!}3-s`YInolyFmn?N;|P?QDa_K^1Z9D=HZ?m0Gex2-5lBk}3T=!;VUQLW zv^DHUz;RHRZ9-%ehD31wp|(?D;U^djItGDYGMOe!v IWZz3hR%qg#ld!=Vd1n>3@jXu*i}LNkl8s9@$ZE@#lIer z<93Wm*m0mrBlIHxNc0g24t{|d4@=n;B`1wuJM>Z;$xZtCtu$B Xgiit8mabkY|GVHwp-e%6Us=N6#eY;78fjC`xaZUX4E?sz893-;*af5@FvyQQ@u zFC2WU51J}HqkMaxmEs8?4~%is5x1zdjM}eelriIpegmi!y1tny^G-=I;It@6(vN8W z4hrJPFhI&8tfKIN-=ZI1*|ITyH1m}KP>X-M{rN6 {IVn7s$oRa>mx%<6d*cD>A-U_GQu;PFQGs eE7Jo*?6yT%2rKBgSk{aR0jdgmTw*G<0rWS *!{$s?f3su~s8^LLsZcke8WDSidp?wx>WtZ5g{3cUGkepbtv>G}(zO{*SL z2Ru|K!=9+4WPb|JZ;SR<7XOP=UmjwJxZ1uHfgbCpf?qka&9UCoKFq^wYf-DRNNMMh zKH}%1#8ecXOM;~%@UsyOAimUt{WkN-@v>*~F&vMF{HNb5!~8v!@i}MhgRBsQMVbt< zu~5||k4K+ym@}-Bk^$%0=hv7bire-aL8NOPsk4Xv&vD Y 8qD4=Uw%yd1y<)~|Y5{x?JUB95;x-)BzqrXC*!rUGl)ezolkrkYLC54C5Kb%Q zG_7$f8S5Oea^770xvNlSl2rN5c+9=*LUp&Ov?rdW?yBj!5FBLU#K-8M%lsojW6iI) zrCo-@c5+>0SGQ?>-%^cXE5)Q|R8RnQ^0JnM_hCcdA~IYO$#Z9jEiSA{I5DtNH%+%^ z=*`4qdKkJCl3=wwfy;KcOnQHAf9fP|V&wy8^(Sue`NN-z#!oXE9;<{p6 Zu$ij_-zHhbO|%liDlcC%DtXLBr1IUI{kBOzJre5_Hj _eQDc<5y|Tqu*dPlPuk3itjfC zwHp+-3 EU#&I{xfPQMU*Il8z{cBgi8Vfpe0pj&Z*qN zYj#%DGB+9$;+=Ec0-ahrI5J>{!4wnNrjzK`(p#!Q32wNhMQh{T7lG*HNw|d%P5T=b C(yyKX diff --git a/static/tabbar/icon-select-home.png b/static/tabbar/icon-select-home.png index 15dbf6e123b05992f71445c1a0300262a64e62cb..521f9ca5c81b2d932f3d7d5aad1e0bc730528734 100644 GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*Fy#>Hwb*S0K%>=;eT*m0jkNK-)D+ zg8YIRc!kX$JexjAW0%zY*XLV4e13ArS?-Vi)%HTMA4lq{vsBr)&WZF+3t6W;!I^=9 zQP|VPF~s8Z(<^t2nhXTm9`dqnUEri-&lR*J>-XLNqSsQA4g^J1-}&A$b8h>|1Ls ^G_A%|Cl z@ve=KQ%Oj3)Dx{KyJnPV9o@S&a&M*~XQGvBnr@^>^^W^H_u2Tg3jEtF_kkn+PXp&y zU0IP6`PH{|9SxX`Gm2^#%xDx$;lIBA;P(B8&)T=#z5KqjP%YTBA L0+ z*LD5Qizn~g8_u`TOqesp R>jP?9w)j(l)(xIXNdUms+`; zRcoZ9>j)`}l)}0xjHNoc r7tLLxhdA`r<{rNthf1X2nttJJwLIVH*^1szH z0RXZwC5p 0zHWL${$WEYR1Wb )po7`!KrNbqn22{^nL7UzY laZ@<_6gCT7fW{}V)A?j161$*+{VAhc5c_LGUGd8!I!k8^ zSLZ+lB5o1@^sa>l2S!ozY9u?85z$tnW}o}Rm8CM%HMCT X}><{1oL}$Wn*r-%d*?)U50| zwAb)n-^ucm8U%G#Tfx)LGqepK%l76K7dl(iElGhP^i+WU%l*<(l#G7&ow?On#>4L& zfiHceOL`53`A~bi$M4nyFAn9x1l9sr@8WR4>sfymt^Avz$U@_1vhSb%n@XP2Tv;xV z`<(BdHZYgUEnltyM;_ZhY5pSG67MrnYZmD$b<}Er(pDurwQ)n<1phf90xjB`plsmk z%>nu+ZR(1=R~JENVOg5}WT>iSt#kW?a!6JXDg?fW_ede$22J)oTei!Mvo=Py*Nbk5 z@ZHt^22D#dMez3Cr}m4T(<*K1O=O~fYn7kC&9MI0LEH4ZIsT9uB{;>X;W)I9h?nef zS_>g_n9H@vH+7Ae*FgqQqy7flTF?`LaY@vddLm$I@kbe*<-Nl)
dWsl7|27x8zY>q0-aI@y||#o z$s{tw;P}i0Hhs;^UtRdx%E3QoNn$o_K?37$sj7w`|UmI*mFwd*HIGlWDw9>`c)I zXyrU-OJSF!MtMQG)q(?1lp tkA*>#q(-?rL%%BKEuz#W zxxQvIfQ`N*<;DeB=ynFN>iT6D6{8c 9pfWU zU1)9W72y2u*CJEN85vN8$MUwDv9aH)7y^36*yqkCse^;A7smM2=b;hR`nIUrinjx9 z@a20Q09e4HD-KmBI-{m9ePlQ-k3f~;THiM|ZSQLK3kaR*5^fDP_p 8J>_-_X_eG+@Mqf}9D!{^B&$9*!g%d`RZ{*MR0 zJ$nuv_)Cqd+W_o0^*xMAv(9Pks!}hJ#%v#!4SEu%Ov5_L;C0g`skIY}ZR;0(b$}Rh kDE$Y^WABR7;0R@Na!%Qm6GM{)3wI!N-KOA+L2 xZpD*_%-Mnyg+eB5lcc*r4T)Aj!YpJuombBpA3J()S3D&u0 zk n;S9-cQhFF|#opN(lwu6XUxgblYg3 v{f>Fili>ilzB{q+qK z%j?!uR(;rG5%pzT&}mES4~K5t56zmb$#61f;gz-T8A~?(-M*Y5{a#&5&KePkuXbC! znfm_w-{V+*;7@It-kGAe!nd2h{F2GHPVf|6%W>@dMDE;`iENiY* zp>?6&9mQ#CPA|Os`0X#95ZPvBIW JL>y;`*1(715p7WO-5RZH4_=`n|IKQ+Ts^V~eytE^pSB|Gvxo$Tx1 zOz&Lo^yQ$YkZ4cIqUr5NQhq)3d>ZHI&wI*Juk`r)1JgD9O)s`>(|I9vRQk>THy0kn z$|~JW6>hH3xwbChZo*5A_jRRZZDm`!4>!MCa4-7f4RLOn-RE96-ma?bOx&8z`26_? z@lB^n@BE0!I WS9N7_Y=}hL?Z0)xZDkuIm@6EQif8hMFzw(| z^}O)Q?wp?9`kqCpU-KQqXUV*sxBr*z+QW|CSsopK|5TijVQ&5)|4h~V^aF %8}A>*XzE2eV< 7wIgG$!4Do0T9&Lz2Vho8GV NLC2ikU$`yF<3Mfi)00HgOM=_ zOm+YV$&A^*%lHpMp~uizj3_oEl8M-b1_VaNvPl4d-c><=li4{C{r`nK#s41BnLEa? zb{weC^j`siq#EogmhRNd?vjXbWoz|&-1zR>T}5R3R!<8B?r*AgHDm)_s)~WlEH8UQ zzCll;i1Gws=aP2@^GJb`p;w))4txjJc@J(Xx(sv8$s#8xx@hQMs~K1MB>I@x?U(dA ztMpAo>r`i0(ud0MxQh0W;BCC=S{Gqr9S#}r*;JNr154R~*_XAhLC-+*A-42RHMU1~ z2d|;BS_Z^biGsKVE;vKp;)f4_;Hy$mMl(`kT@zUjob&wg3#qc=(O3c8B<**>b%CSM zxX#qpJS+_>ga~Z_7!%}qX%@6< bjJ@dD{h%?zc z0eOymW$aH9Df#AF)}#M`&PZtEKBm+(jO2dN tHPoM@gAGAPjNI0xRB{oXdj# z)AhSR+mCj|Z)z1nR {hf$hGM~Dy;YEt1bQ2 z`wB5QT20*-X;}K-5+|Eu#4b3jl~<9skf&TJ8Q`p4qy;{^rEx+tZ0XNiklz_%%~#&P z$-Wd=CeQd+sjhbv1@JJ3mDICgI@??+lxjlDy1vx|=`C%ws4QjY1H1{7vjzsB!U%V= zUn@&jW+hoszS zY+w@jdgzF{kG8%Z5){#3crl~OFW <`8tBaFg^2 5-O1uGim8 z_M!>gSJs*T 7d&uN8-WGuTL$^LQcL8 zKHv1vE>^nfcIK0ca_r}y>x?Vag#CoY8K?PEr+&zIsW^IEE1KCiRGq4G5$ SVx$(W9-O1nekB}-H#ioON1VE6_9t&DQdq5Ia)6uJ$I)x;9RTOw z6vb^C*Fv(&1@IF?k~vV!yOLf$c3=0<72W++@u?Xd^+!w<=Nql!dQ4NZfBC-GInW6B z04caBq_~64i_78rQ55c287%mLR>0BK9_1TL_09JXFyJ6QE*f1BZlFD`lP I9CXK7&!@!GImv?{dY!{oLz=_xjzRAo+`i-mXfB@T~Q$ook9S&x4T zE YiY1G*N(SL$CZ!dJ9IPsB(aM__DV>~uCdlvS^dVimfmL+AboAtJL{F y*m(hWW&-3|j eFJ-0XBDbN;wnF=}9x?^HAJE>~nbJh|PyYwCT_g7Z diff --git a/static/tabbar/icon-select-person.png b/static/tabbar/icon-select-person.png index 8300a667b32bd30e8bbbcd516354dcc456af7c50..37799a0fc2e5daa4139902223470284acd390448 100644 GIT binary patch literal 635 zcmeAS@N?(olHy`uVBq!ia0vp^sz9v4!3-q*?j3#)q
`6{UE& ztKM(Toyx$#nD6Q07-Dg{b#mmSCI 4EyqwtFT@Txl;g zy?j(~ve~ijjQjQL_A8|4vQGN6xlmX4fI!XmS+f|8lYI}ITy*u9mCajQpWe+v z{Gqo!)=lJ^Ys;}oN!EViyAsV!O(*+r3H ?jo0W57-eQ_ zonEV|Vh$ZDb!yh}s+zt|ZG*Cmu4Y{vN7Zrc?X~;5p6j~r=ee)X_qo6S+#5=AWUfA> z0sufFU^f8(uydTi5J3p_Jdqg}V-p@37s0X-#qf6D0f6Kx;)OG#SpqPEb(s_EjGk|M zga$d0&S<(l6-VW{v)CNZBt9!3$tRGR6wM?=qFr6oNFw4cAciFf2SqX5*m$DI8T~hx zxSQ`?W6==!caI?28BN|(1VgAa&^?aN0_|-aFihK%c+inxW9xt;;7^_a@i<#YEY1;Y zYlp$v5^)YhI|BG2&@O5qi6421=uh$Zptf5%quBxhkBG$zg+d#lolPA7GS-$rAYgHL zEFO>HM?#k{@rkj5a1kap-fWNYe+Y#Y&*XD>0!~~kxCaf7h`S E2A)Jt{Jw4C&&~n?B^a{O7{2~xLXE;Hl^zA8AvheBCAV~qhc@m zZ?TxSNy|SHDk|qEhq3~;y@qE9Gwm~59W677&ukY*6PI$0B+3#K3G$|fHsW7$b)Nc~ z#u{vG+51p;*jR%@bPmn}l3K|v7~DczyI&fC3=`UR0FAt1FFb>EEnuUN12+mj| z?!wP}4^?f(sFcDYZuvw$(_$kV=&&V(3F3-Wo1wu|rD=`;`6%I^msvSMQdAk=yv!iQ zQD^5+SBXe%O?lCH_Brz3N vThAy7$txH%d@&d|}+JL9u{#qi@HQG3}| RH#uTVp$-`^oF$5?LRLh>P` Ag0!+J&SCtLO%Hn%XS?cR&-O9Dw&i>5# zDi@0$dTcN4;{I Y z{K^RY%llD;hRRxOsPFpvD_WbcYPF;B{KdkB86p=$6>?^l(ui3h%>r+z_j kGL)}9@@cHCALhD Fhcb0^FPzU?a$A;uH5mM} zVR~&}c*~tT-@qGZ`Kj-a9yQ{_`QuJbbKalMW}}l3Wh#=&6zcvS#YiytLYP<;5Be{y z&O5&gQ}4El4A7++2{}JNU3yzD>E(zEci>(X{ntj>{-0lwcdS>JoCzNG8$D?pwms~w zp#PyF$P2Abi=2B(H!7NOib54&PM7p5Vos)x0p<@*Pr?)Q`rj;xrlk&`;$=P=#i%Jh z8^*7-f7qd+Qw !E{Jo1irsrf9#?0#m^R* zM~=1x)F=mot2KDeK{h|Jy}vcV`u2BT=I{I)i+S1HQw5lVViMVm2l#Oej$3XVL5efl zn)X$h3}*#XShx1&Qb*y(86DE#mVogb%XDj0o7Gmvb6QQ`bbk{tn!3*!==;t*!1Id{ z@h$7nFCwe*YXZl#lW*&Lj-1;4A%CZB%BEj+(;}=$UqU8s(Gi}5$KRXSBZ7t=S_!@U sBFZ0hsgbf|TOpsWhycHOD!g?EmKt&W&A0EP)%UiP*BKv5of{+dFRxDkwEzGB diff --git a/uni.scss b/uni.scss index f0f426c..a05adb4 100644 --- a/uni.scss +++ b/uni.scss @@ -39,38 +39,38 @@ $uni-border-color:#c8c7cc; /* 尺寸变量 */ /* 文字尺寸 */ -$uni-font-size-sm:24upx; -$uni-font-size-base:28upx; -$uni-font-size-lg:32upx; +$uni-font-size-sm:12px; +$uni-font-size-base:14px; +$uni-font-size-lg:16; /* 图片尺寸 */ -$uni-img-size-sm:40upx; -$uni-img-size-base:52upx; -$uni-img-size-lg:80upx; +$uni-img-size-sm:20px; +$uni-img-size-base:26px; +$uni-img-size-lg:40px; /* Border Radius */ -$uni-border-radius-sm: 4upx; -$uni-border-radius-base: 6upx; -$uni-border-radius-lg: 12upx; +$uni-border-radius-sm: 2px; +$uni-border-radius-base: 3px; +$uni-border-radius-lg: 6px; $uni-border-radius-circle: 50%; /* 水平间距 */ -$uni-spacing-row-sm: 10px; -$uni-spacing-row-base: 20upx; -$uni-spacing-row-lg: 30upx; +$uni-spacing-row-sm: 5px; +$uni-spacing-row-base: 10px; +$uni-spacing-row-lg: 15px; /* 垂直间距 */ -$uni-spacing-col-sm: 8upx; -$uni-spacing-col-base: 16upx; -$uni-spacing-col-lg: 24upx; +$uni-spacing-col-sm: 4px; +$uni-spacing-col-base: 8px; +$uni-spacing-col-lg: 12px; /* 透明度 */ $uni-opacity-disabled: 0.3; // 组件禁用态的透明度 /* 文章场景相关 */ $uni-color-title: #2C405A; // 文章标题颜色 -$uni-font-size-title:40upx; +$uni-font-size-title:20px; $uni-color-subtitle: #555555; // 二级标题颜色 -$uni-font-size-subtitle:36upx; +$uni-font-size-subtitle:26px; $uni-color-paragraph: #3F536E; // 文章段落颜色 -$uni-font-size-paragraph:30upx; \ No newline at end of file +$uni-font-size-paragraph:15px; diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js index 6dae5fa..1b8b5db 100644 --- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js +++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js @@ -20,179 +20,200 @@ const color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc']; //事件转换函数,主要用作格式化x轴为时间轴,根据需求自行修改 -const formatDateTime = (timeStamp, returnType)=>{ - var date = new Date(); - date.setTime(timeStamp * 1000); - var y = date.getFullYear(); - var m = date.getMonth() + 1; - m = m < 10 ? ('0' + m) : m; - var d = date.getDate(); - d = d < 10 ? ('0' + d) : d; - var h = date.getHours(); - h = h < 10 ? ('0' + h) : h; - var minute = date.getMinutes(); - var second = date.getSeconds(); - minute = minute < 10 ? ('0' + minute) : minute; - second = second < 10 ? ('0' + second) : second; - if(returnType == 'full'){return y + '-' + m + '-' + d + ' '+ h +':' + minute + ':' + second;} - if(returnType == 'y-m-d'){return y + '-' + m + '-' + d;} - if(returnType == 'h:m'){return h +':' + minute;} - if(returnType == 'h:m:s'){return h +':' + minute +':' + second;} - return [y, m, d, h, minute, second]; +const formatDateTime = (timeStamp, returnType) => { + var date = new Date(); + date.setTime(timeStamp * 1000); + var y = date.getFullYear(); + var m = date.getMonth() + 1; + m = m < 10 ? ('0' + m) : m; + var d = date.getDate(); + d = d < 10 ? ('0' + d) : d; + var h = date.getHours(); + h = h < 10 ? ('0' + h) : h; + var minute = date.getMinutes(); + var second = date.getSeconds(); + minute = minute < 10 ? ('0' + minute) : minute; + second = second < 10 ? ('0' + second) : second; + if (returnType == 'full') { + return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second; + } + if (returnType == 'y-m-d') { + return y + '-' + m + '-' + d; + } + if (returnType == 'h:m') { + return h + ':' + minute; + } + if (returnType == 'h:m:s') { + return h + ':' + minute + ':' + second; + } + return [y, m, d, h, minute, second]; } const cfu = { - //demotype为自定义图表类型,一般不需要自定义图表类型,只需要改根节点上对应的类型即可 - "type":["pie","ring","rose","word","funnel","map","arcbar","line","column","bar","area","radar","gauge","candle","mix","tline","tarea","scatter","bubble","demotype"], - "range":["饼状图","圆环图","玫瑰图","词云图","漏斗图","地图","圆弧进度条","折线图","柱状图","条状图","区域图","雷达图","仪表盘","K线图","混合图","时间轴折线","时间轴区域","散点图","气泡图","自定义类型"], - //增加自定义图表类型,如果需要categories,请在这里加入您的图表类型,例如最后的"demotype" - //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴(矢量x轴)类图表,没有categories,不需要加入categories - "categories":["line","column","bar","area","radar","gauge","candle","mix","demotype"], - //instance为实例变量承载属性,不要删除 - "instance":{}, - //option为opts及eopts承载属性,不要删除 - "option":{}, - //下面是自定义format配置,因除H5端外的其他端无法通过props传递函数,只能通过此属性对应下标的方式来替换 - "formatter":{ - "yAxisDemo1":function(val){return val+'元'}, - "yAxisDemo2":function(val){return val.toFixed(2)}, - "xAxisDemo1":function(val){return val+'年'}, - "xAxisDemo2":function(val){return formatDateTime(val,'h:m')}, - "seriesDemo1":function(val){return val+'元'}, - "tooltipDemo1":function(item, category, index, opts){ - - if(index==0){ - return '随便用'+item.data+'年' - }else{ - return item.name+item.data+'天' - } - }, - "pieDemo":function(val, index, series){ - if(index !== undefined){ - return series[index].name+"\n"+series[index].data+'元' - } - }, - }, - //这里演示了自定义您的图表类型的option,可以随意命名,之后在组件上 type="demotype" 后,组件会调用这个花括号里的option,如果组件上还存在opts参数,会将demotype与opts中option合并后渲染图表。 - "demotype":{ - //我这里把曲线图当做了自定义图表类型,您可以根据需要随意指定类型或配置 - "type": "line", - "color": color, - "padding": [15,10,0,15], - "xAxis": { - "disableGrid": true, - }, - "yAxis": { - "gridType": "dash", - "dashLength": 2, - }, - "legend": { - }, - "extra": { - "line": { - "type": "curve", - "width": 1 - }, - } - }, - //下面是自定义配置,请添加项目所需的通用配置 - "pie":{ - "type": "pie", - "canvasId": "", - "canvas2d": false, - "background": "none", - "animation": true, - "timing": "easeOut", - "duration": 1000, - "color": [ - "#1890FF", - "#91CB74", - "#FAC858", - "#EE6666", - "#73C0DE", - "#3CA272", - "#FC8452", - "#9A60B4", - "#ea7ccc" - ], - "padding": [ - 5, - 5, - 5, - 5 - ], - "rotate": false, - "errorReload": true, - "fontSize": 13, - "fontColor": "#666666", - "enableScroll": false, - "touchMoveLimit": 60, - "enableMarkLine": false, - "dataLabel": true, - "dataPointShape": true, - "dataPointShapeType": "solid", - "tapLegend": true, - "legend": { - "show": false, - "position": "top", - "float": "center", - "padding": 5, - "margin": 5, - "backgroundColor": "rgba(0,0,0,0)", - "borderColor": "rgba(0,0,0,0)", - "borderWidth": 0, - "fontSize": 13, - "fontColor": "#000", - "lineHeight": 11, - "hiddenColor": "#CECECE", - "itemGap": 10 - }, - "extra": { - "pie": { - "activeOpacity": 0.5, - "activeRadius": 10, - "offsetAngle": 0, - "customRadius": 0, - "labelWidth": 15, - "border": true, - "borderWidth": 3, - "borderColor": "#FFFFFF", - "linearType": "none" - }, - "tooltip": { - "showBox": true, - "showArrow": true, - "showCategory": false, - "borderWidth": 0, - "borderRadius": 0, - "borderColor": "#000000", - "borderOpacity": 0.7, - "bgColor": "#000000", - "bgOpacity": 0.7, - "gridType": "solid", - "dashLength": 4, - "gridColor": "#CCCCCC", - "fontColor": "#FFFFFF", - "splitLine": true, - "horizentalLine": false, - "xAxisLabel": false, - "yAxisLabel": false, - "labelBgColor": "#FFFFFF", - "labelBgOpacity": 0.7, - "labelFontColor": "#666666" - } - } + //demotype为自定义图表类型,一般不需要自定义图表类型,只需要改根节点上对应的类型即可 + "type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "bar", "area", "radar", + "gauge", "candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype" + ], + "range": ["饼状图", "圆环图", "玫瑰图", "词云图", "漏斗图", "地图", "圆弧进度条", "折线图", "柱状图", "条状图", "区域图", "雷达图", "仪表盘", "K线图", + "混合图", "时间轴折线", "时间轴区域", "散点图", "气泡图", "自定义类型" + ], + //增加自定义图表类型,如果需要categories,请在这里加入您的图表类型,例如最后的"demotype" + //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴(矢量x轴)类图表,没有categories,不需要加入categories + "categories": ["line", "column", "bar", "area", "radar", "gauge", "candle", "mix", "demotype"], + //instance为实例变量承载属性,不要删除 + "instance": {}, + //option为opts及eopts承载属性,不要删除 + "option": {}, + //下面是自定义format配置,因除H5端外的其他端无法通过props传递函数,只能通过此属性对应下标的方式来替换 + "formatter": { + "yAxisDemo1": function(val) { + return val + '元' + }, + "yAxisDemo2": function(val) { + return val.toFixed(2) + }, + "xAxisDemo1": function(val) { + return val + '年' + }, + "xAxisDemo2": function(val) { + return formatDateTime(val, 'h:m') + }, + "seriesDemo1": function(val) { + return val + '元' + }, + "tooltipDemo1": function(item, category, index, opts) { + + if (index == 0) { + return '随便用' + item.data + '年' + } else { + return item.name + item.data + '%' + } + }, + "pieDemo": function(val, index, series) { + if (index !== undefined) { + return series[index].name + "\n" + series[index].data + '元' + } + }, }, - "ring":{ + //这里演示了自定义您的图表类型的option,可以随意命名,之后在组件上 type="demotype" 后,组件会调用这个花括号里的option,如果组件上还存在opts参数,会将demotype与opts中option合并后渲染图表。 + "demotype": { + //我这里把曲线图当做了自定义图表类型,您可以根据需要随意指定类型或配置 + "type": "line", + "color": color, + "padding": [15, 10, 0, 15], + "xAxis": { + "disableGrid": true, + }, + "yAxis": { + "gridType": "dash", + "dashLength": 2, + }, + "legend": {}, + "extra": { + "line": { + "type": "curve", + "width": 1 + }, + } + }, + //下面是自定义配置,请添加项目所需的通用配置 + "pie": { + "type": "pie", + "canvasId": "", + "canvas2d": false, + "background": "none", + "animation": true, + "timing": "easeOut", + "duration": 1000, + "color": [ + "#1890FF", + "#91CB74", + "#FAC858", + "#EE6666", + "#73C0DE", + "#3CA272", + "#FC8452", + "#9A60B4", + "#ea7ccc" + ], + "padding": [ + 5, + 5, + 5, + 5 + ], + "rotate": false, + "errorReload": true, + "fontSize": 13, + "fontColor": "#666666", + "enableScroll": false, + "touchMoveLimit": 60, + "enableMarkLine": false, + "dataLabel": true, + "dataPointShape": true, + "dataPointShapeType": "solid", + "tapLegend": true, + "legend": { + "show": false, + "position": "top", + "float": "center", + "padding": 5, + "margin": 5, + "backgroundColor": "rgba(0,0,0,0)", + "borderColor": "rgba(0,0,0,0)", + "borderWidth": 0, + "fontSize": 13, + "fontColor": "#000", + "lineHeight": 11, + "hiddenColor": "#CECECE", + "itemGap": 10 + }, + "extra": { + "pie": { + "activeOpacity": 0.5, + "activeRadius": 10, + "offsetAngle": 0, + "customRadius": 0, + "labelWidth": 15, + "border": true, + "borderWidth": 3, + "borderColor": "#FFFFFF", + "linearType": "none" + }, + "tooltip": { + "showBox": true, + "showArrow": true, + "showCategory": false, + "borderWidth": 0, + "borderRadius": 0, + "borderColor": "#000000", + "borderOpacity": 0.7, + "bgColor": "#000000", + "bgOpacity": 0.7, + "gridType": "solid", + "dashLength": 4, + "gridColor": "#CCCCCC", + "fontColor": "#FFFFFF", + "splitLine": true, + "horizentalLine": false, + "xAxisLabel": false, + "yAxisLabel": false, + "labelBgColor": "#FFFFFF", + "labelBgOpacity": 0.7, + "labelFontColor": "#666666" + } + } + }, + "ring": { "type": "ring", - "color": color, - "padding": [5,5,5,5], + "color": color, + "padding": [5, 5, 5, 5], "rotate": false, "dataLabel": true, "legend": { "show": false, "position": "right", - "lineHeight": 25, + "lineHeight": 25, }, // "title": { // "name": "收益率", @@ -206,7 +227,7 @@ const cfu = { // }, "extra": { "ring": { - "ringWidth":30, + "ringWidth": 30, "activeOpacity": 0.5, "activeRadius": 10, "offsetAngle": 0, @@ -217,14 +238,14 @@ const cfu = { }, }, }, - "rose":{ + "rose": { "type": "rose", - "color": color, - "padding": [5,5,5,5], + "color": color, + "padding": [5, 5, 5, 5], "legend": { "show": true, "position": "left", - "lineHeight": 25, + "lineHeight": 25, }, "extra": { "rose": { @@ -240,9 +261,9 @@ const cfu = { }, } }, - "word":{ + "word": { "type": "word", - "color": color, + "color": color, "extra": { "word": { "type": "normal", @@ -250,10 +271,10 @@ const cfu = { } } }, - "funnel":{ + "funnel": { "type": "funnel", - "color": color, - "padding": [15,15,0,15], + "color": color, + "padding": [15, 15, 0, 15], "extra": { "funnel": { "activeOpacity": 0.3, @@ -266,11 +287,11 @@ const cfu = { }, } }, - "map":{ + "map": { "type": "map", - "color": color, - "padding": [0,0,0,0], - "dataLabel": true, + "color": color, + "padding": [0, 0, 0, 0], + "dataLabel": true, "extra": { "map": { "border": true, @@ -283,9 +304,9 @@ const cfu = { }, } }, - "arcbar":{ + "arcbar": { "type": "arcbar", - "color": color, + "color": color, "title": { "name": "百分比", "fontSize": 25, @@ -307,19 +328,18 @@ const cfu = { } } }, - "line":{ + "line": { "type": "line", - "color": color, - "padding": [15,10,0,15], + "color": color, + "padding": [15, 10, 0, 15], "xAxis": { - "disableGrid": true, + "disableGrid": true, }, "yAxis": { - "gridType": "dash", - "dashLength": 2, - }, - "legend": { + "gridType": "dash", + "dashLength": 2, }, + "legend": {}, "extra": { "line": { "type": "straight", @@ -327,75 +347,70 @@ const cfu = { }, } }, - "tline":{ - "type": "line", - "color": color, - "padding": [15,10,0,15], - "xAxis": { - "disableGrid": false, - "boundaryGap":"justify", - }, - "yAxis": { - "gridType": "dash", - "dashLength": 2, - "data":[ - { - "min":0, - "max":80 - } - ] - }, - "legend": { - }, - "extra": { - "line": { - "type": "curve", - "width": 2 - }, - } - }, - "tarea":{ - "type": "area", - "color": color, - "padding": [15,10,0,15], - "xAxis": { - "disableGrid": true, - "boundaryGap":"justify", - }, - "yAxis": { - "gridType": "dash", - "dashLength": 2, - "data":[ - { - "min":0, - "max":80 - } - ] - }, - "legend": { - }, - "extra": { - "area": { - "type": "curve", - "opacity": 0.2, - "addLine": true, - "width": 2, - "gradient": true - }, - } - }, - "column":{ - "type": "column", - "color": color, - "padding": [15,15,0,5], + "tline": { + "type": "line", + "color": color, + "padding": [15, 10, 0, 15], "xAxis": { - "disableGrid": true, + "disableGrid": false, + "boundaryGap": "justify", }, "yAxis": { - "data":[{"min":0}] + "gridType": "dash", + "dashLength": 2, + "data": [{ + "min": 0, + "max": 80 + }] }, - "legend": { + "legend": {}, + "extra": { + "line": { + "type": "curve", + "width": 2 + }, + } + }, + "tarea": { + "type": "area", + "color": color, + "padding": [15, 10, 0, 15], + "xAxis": { + "disableGrid": true, + "boundaryGap": "justify", }, + "yAxis": { + "gridType": "dash", + "dashLength": 2, + "data": [{ + "min": 0, + "max": 80 + }] + }, + "legend": {}, + "extra": { + "area": { + "type": "curve", + "opacity": 0.2, + "addLine": true, + "width": 2, + "gradient": true + }, + } + }, + "column": { + "type": "column", + "color": color, + "padding": [15, 15, 0, 5], + "xAxis": { + "disableGrid": true, + }, + "yAxis": { + "data": [{ + "min": 0 + }] + }, + "legend": {}, "extra": { "column": { "type": "group", @@ -405,44 +420,41 @@ const cfu = { }, } }, - "bar":{ - "type": "bar", - "color": color, - "padding": [15,30,0,5], - "xAxis": { - "boundaryGap":"justify", - "disableGrid":false, - "min":0, - "axisLine":false - }, - "yAxis": { - }, - "legend": { - }, - "extra": { - "bar": { - "type": "group", - "width": 30, - "meterBorde": 1, - "meterFillColor": "#FFFFFF", - "activeBgColor": "#000000", - "activeBgOpacity": 0.08 - }, - } - }, - "area":{ + "bar": { + "type": "bar", + "color": color, + "padding": [15, 30, 0, 5], + "xAxis": { + "boundaryGap": "justify", + "disableGrid": false, + "min": 0, + "axisLine": false + }, + "yAxis": {}, + "legend": {}, + "extra": { + "bar": { + "type": "group", + "width": 30, + "meterBorde": 1, + "meterFillColor": "#FFFFFF", + "activeBgColor": "#000000", + "activeBgOpacity": 0.08 + }, + } + }, + "area": { "type": "area", "color": color, - "padding": [15,15,0,15], + "padding": [15, 15, 0, 15], "xAxis": { - "disableGrid": true, + "disableGrid": true, }, "yAxis": { - "gridType": "dash", - "dashLength": 2, - }, - "legend": { + "gridType": "dash", + "dashLength": 2, }, + "legend": {}, "extra": { "area": { "type": "straight", @@ -453,15 +465,15 @@ const cfu = { }, } }, - "radar":{ + "radar": { "type": "radar", "color": color, - "padding": [5,5,5,5], - "dataLabel": false, + "padding": [5, 5, 5, 5], + "dataLabel": false, "legend": { "show": true, "position": "right", - "lineHeight": 25, + "lineHeight": 25, }, "extra": { "radar": { @@ -473,7 +485,7 @@ const cfu = { }, } }, - "gauge":{ + "gauge": { "type": "gauge", "color": color, "title": { @@ -513,10 +525,10 @@ const cfu = { } } }, - "candle":{ + "candle": { "type": "candle", "color": color, - "padding": [15,15,0,15], + "padding": [15, 15, 0, 15], "enableScroll": true, "enableMarkLine": true, "dataLabel": false, @@ -532,10 +544,8 @@ const cfu = { "scrollColor": "#A6A6A6", "scrollBackgroundColor": "#EFEBEF" }, - "yAxis": { - }, - "legend": { - }, + "yAxis": {}, + "legend": {}, "extra": { "candle": { "color": { @@ -546,16 +556,15 @@ const cfu = { }, "average": { "show": true, - "name": ["MA5","MA10","MA30"], - "day": [5,10,20], - "color": ["#1890ff","#2fc25b","#facc14"] + "name": ["MA5", "MA10", "MA30"], + "day": [5, 10, 20], + "color": ["#1890ff", "#2fc25b", "#facc14"] } }, "markLine": { "type": "dash", "dashLength": 5, - "data": [ - { + "data": [{ "value": 2150, "lineColor": "#f04864", "showLabel": true @@ -569,198 +578,194 @@ const cfu = { } } }, - "mix":{ - "type": "mix", - "canvasId": "", - "canvas2d": false, - "background": "none", - "animation": true, - "timing": "easeOut", - "duration": 1000, - "color": [ - "#1890FF", - "#91CB74", - "#FAC858", - "#EE6666", - "#73C0DE", - "#3CA272", - "#FC8452", - "#9A60B4", - "#ea7ccc" - ], - "padding": [ - 15, - 15, - 0, - 15 - ], - "rotate": false, - "errorReload": true, - "fontSize": 13, - "fontColor": "#666666", - "enableScroll": false, - "touchMoveLimit": 60, - "enableMarkLine": false, - "dataLabel": true, - "dataPointShape": true, - "dataPointShapeType": "solid", - "tapLegend": true, - "xAxis": { - "disabled": false, - "axisLine": true, - "axisLineColor": "#CCCCCC", - "calibration": false, - "fontColor": "#666666", - "fontSize": 13, - "rotateLabel": false, - "itemCount": 5, - "boundaryGap": "center", - "disableGrid": true, - "gridColor": "#CCCCCC", - "gridType": "solid", - "dashLength": 4, - "gridEval": 1, - "scrollShow": false, - "scrollAlign": "left", - "scrollColor": "#A6A6A6", - "scrollBackgroundColor": "#EFEBEF", - "format": "" - }, - "yAxis": { - "disabled": false, - "disableGrid": false, - "splitNumber": 5, - "gridType": "dash", - "dashLength": 4, - "gridColor": "#CCCCCC", - "padding": 10, - "showTitle": true, - "data": [ - { - "position": "top", - "title": "折线", - }, - { - "position": "top", - "title": "", - "textAlign": "left" - }, - { - "position": "left", - - "title": "", - "textAlign": "left" - }, - - ] - }, - "legend": { - "show": false, - "position": "bottom", - "float": "center", - "padding": 5, - "margin": 5, - "backgroundColor": "rgba(0,0,0,0)", - "borderColor": "rgba(0,0,0,0)", - "borderWidth": 0, - "fontSize": 13, - "fontColor": "#666666", - "lineHeight": 11, - "hiddenColor": "#CECECE", - "itemGap": 10 - }, - "extra": { - "mix": { - "column": { - "width": 20, - "seriesGap": 2, - "barBorderCircle": false, - "linearType": "none", - "linearOpacity": 1, - "colorStop": 0 - } - }, - "tooltip": { - "showBox": true, - "showArrow": true, - "showCategory": false, - "borderWidth": 0, - "borderRadius": 0, - "borderColor": "#000000", - "borderOpacity": 0.7, - "bgColor": "#000000", - "bgOpacity": 0.7, - "gridType": "solid", - "dashLength": 4, - "gridColor": "#CCCCCC", - "fontColor": "#FFFFFF", - "splitLine": true, - "horizentalLine": false, - "xAxisLabel": false, - "yAxisLabel": false, - "labelBgColor": "#FFFFFF", - "labelBgOpacity": 0.7, - "labelFontColor": "#666666" - }, - "markLine": { - "type": "solid", - "dashLength": 4, - "data": [] - } - } + "mix": { + "type": "mix", + "canvasId": "", + "canvas2d": false, + "background": "none", + "animation": true, + "timing": "easeOut", + "duration": 1000, + "color": [ + "#1890FF", + "#91CB74", + "#FAC858", + "#EE6666", + "#73C0DE", + "#3CA272", + "#FC8452", + "#9A60B4", + "#ea7ccc" + ], + "padding": [ + 15, + 15, + 0, + 15 + ], + "rotate": false, + "errorReload": true, + "fontSize": 13, + "fontColor": "#666666",//数字颜色 + "enableScroll": false, + "touchMoveLimit": 60, + "enableMarkLine": false, + "dataLabel": true, + "dataPointShape": true, + "dataPointShapeType": "solid", + "tapLegend": true, + "xAxis": {//x轴 + "disabled": false, + "axisLine": true, + "axisLineColor": "#CCCCCC", + "calibration": false, + "fontColor": "#666666", + "fontSize": 13, + "rotateLabel": false, + "itemCount": 5, + "boundaryGap": "center", + "disableGrid": true, + "gridColor": "#CCCCCC", + "gridType": "solid", + "dashLength": 4, + "gridEval": 1, + "scrollShow": false, + "scrollAlign": "left", + "scrollColor": "#A6A6A6", + "scrollBackgroundColor": "#EFEBEF", + "format": "" + }, + "yAxis": {//y轴 + "disabled": false, + "disableGrid": false, + "splitNumber": 5, + "gridType": "solid",//dash:虚线 solid:实线 + "dashLength": 4, + "gridColor": "#CCCCCC", + "padding": 10, + "showTitle": true, + "data": [{ + "position": "top", + "title": "折线" + }, + { + "position": "top", + "title": "", + "textAlign": "left" + }, + { + "position": "left", + + "title": "", + "textAlign": "left" + }, + + ] + }, + "legend": { + "show": false, + "position": "bottom", + "float": "center", + "padding": 5, + "margin": 5, + "backgroundColor": "rgba(0,0,0,0)", + "borderColor": "rgba(0,0,0,0)", + "borderWidth": 0, + "fontSize": 13, + "fontColor": "#666666", + "lineHeight": 11, + "hiddenColor": "#CECECE", + "itemGap": 10 + }, + "extra": { + "mix": { + "column": { + "width": 20, + "seriesGap": 2, + "barBorderCircle": false, + "linearType": "none", + "linearOpacity": 1, + "colorStop": 0 + } + }, + "tooltip": { + "showBox": false,//点击时不显示描述信息 + "showArrow": true, + "showCategory": false, + "borderWidth": 0, + "borderRadius": 0, + "borderColor": "#000000", + "borderOpacity": 0.7, + "bgColor": "#000000", + "bgOpacity": 0.7, + "gridType": "solid", + "dashLength": 4, + "gridColor": "#CCCCCC", + "fontColor": "#FFFFFF", + "splitLine": false,//点击时不显示选中竖线 + "horizentalLine": false, + "xAxisLabel": false, + "yAxisLabel": false, + "labelBgColor": "#FFFFFF", + "labelBgOpacity": 0.7, + "labelFontColor": "#666666" + }, + "markLine": { + "type": "solid", + "dashLength": 4, + "data": [] + } + } }, - "scatter":{ + "scatter": { "type": "scatter", - "color":color, - "padding":[15,15,0,15], - "dataLabel":false, - "xAxis": { - "disableGrid": false, - "gridType":"dash", - "splitNumber":5, - "boundaryGap":"justify", - "min":0 - }, - "yAxis": { - "disableGrid": false, - "gridType":"dash", - }, - "legend": { - }, - "extra": { - "scatter": { - }, - } + "color": color, + "padding": [15, 15, 0, 15], + "dataLabel": false, + "xAxis": { + "disableGrid": false, + "gridType": "dash", + "splitNumber": 5, + "boundaryGap": "justify", + "min": 0 + }, + "yAxis": { + "disableGrid": false, + "gridType": "dash", + }, + "legend": {}, + "extra": { + "scatter": {}, + } }, - "bubble":{ + "bubble": { "type": "bubble", - "color":color, - "padding":[15,15,0,15], - "xAxis": { - "disableGrid": false, - "gridType":"dash", - "splitNumber":5, - "boundaryGap":"justify", - "min":0, - "max":250 - }, - "yAxis": { - "disableGrid": false, - "gridType":"dash", - "data":[{ - "min":0, - "max":150 - }] - }, - "legend": { - }, - "extra": { - "bubble": { - "border":2, - "opacity": 0.5, - }, - } + "color": color, + "padding": [15, 15, 0, 15], + "xAxis": { + "disableGrid": false, + "gridType": "dash", + "splitNumber": 5, + "boundaryGap": "justify", + "min": 0, + "max": 250 + }, + "yAxis": { + "disableGrid": false, + "gridType": "dash", + "data": [{ + "min": 0, + "max": 150 + }] + }, + "legend": {}, + "extra": { + "bubble": { + "border": 2, + "opacity": 0.5, + }, + } } } -export default cfu; \ No newline at end of file +export default cfu;