From fa4ce4fc8c373b4926e3486b06fe7655b20e699b Mon Sep 17 00:00:00 2001 From: DCloud_LXH <283700113@qq.com> Date: Wed, 16 Jun 2021 18:15:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20uni.showToast=EF=BC=8Cicon=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/common/__uniapperror.png | Bin 0 -> 5842 bytes .../template/common/__uniapperror.png | Bin 0 -> 5842 bytes src/core/helpers/protocol/ui/popup.js | 4 ++-- src/core/view/index.css | 4 ++++ src/platforms/app-plus/service/api/ui/popup.js | 6 +++--- src/platforms/app-plus/view/index.css | 4 ++++ src/platforms/h5/components/app/popup/toast.vue | 10 +++++++++- src/platforms/h5/view/index.css | 4 ++++ 8 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 packages/uni-app-plus/template/common/__uniapperror.png create mode 100644 packages/uni-cli-shared/template/common/__uniapperror.png diff --git a/packages/uni-app-plus/template/common/__uniapperror.png b/packages/uni-app-plus/template/common/__uniapperror.png new file mode 100644 index 0000000000000000000000000000000000000000..4743b25e1284270fee6ba8fefdb5265f6c451a93 GIT binary patch literal 5842 zcmX9?cRW@9|3CM-bnO|Hb#aWWs3fy%--{?^UMqX=O>!%tjO!T5{Dd^PcH~;OGDB9f zrR;Kzt4Kz_+xPd!Ip^^>=kb2NUeDJ)ucT`x2CPhHm;eA^#bR{LXwRO17m|T?Ct6h& z0s!w5tghD02zyEa^I_~me?s;@f;rE@tf6>(C z!@8|ReKNh-b~I|u7nmFW70DhqZqAZ7btn#uhu?N19NzZg*elA4V+OzCMArQ8a#+Bs z&jSZLo7~zL*Zz2L^j`(sCK48PuCh7u{0YMI*y>@0861mJrIt^BWB%KW%H{`b^{I0r zg+^jJ;rO3qSx<9-KYoy!Vw<$A7TKvgvQLQlZ(pRo-GC4CMjy&%y*t4{_M)_hSQ~hp zJ3;ECVm`0x2>4Xci+ZM4W;wNrw56&f9QPYLMXI}R-Fl=H22Xbho@0t5@`Uj#jaS>% zGjw}bJyw(Hvj)c;zYtfwd=R3ZVSpMiAw+J*Y2A6l5Xc;N1IRZXv6o4UPiaBFE4Sv3 zzpeiZ-`sod2T@DvIU%N@H}%Bucn^~+VC!;~R3Gw94S0&rXB*exh*9Ye$U)&E(E_iy# zHI8l^&L}E|VK*Rxa3zALO#Ks0|2zacY>T}lKvCa^Z5)1?uy}`Ur{#eK3fg7)R?T|f zj{u80aF?#}9aD()j=W;t<@wC@43Delm+5VmL-P?B1G)wF$ zIgEhh8XXWj%y3Hcfd%IqXpwYJXc%qDfen*C{HCR|b&NBbR|YKw7FQW0IIwDTmtzST zdu<7K$dT@Y0AjY;Da^WC~Ij8tbdpIiic6con4A z;`;-+j-^gW=#OQh{aBXha&t2F6on8Cl967sH;8s9NdBi?Q>a5%O-lReUgq!lw~4fn z$S+!Xu|tjY0e++(2HJsM+=<|Hz@?ijX+Q3+2YQP;dYWDZUxW8w=%Jtn#1N_V=(W8B zyCw#1Q5}+@Y9isrhmkVexdA+4hjR8b!Vs~#=MNY^sUoNp!u8whl?2m>dBm>h6D3Yv z3;cZ+aD`1EgWb`V(W)U+DY%U11C5nG!m-i9f@O4ok>z1rR^uGXaz%xn>JNnVDJi5a zAf!1a(p<8YUsxkV*TewX?({rv4?37pFv%j-vOSBImVUq$y6PbQp5LeP(I~=Fj~^Re zfX&gNUDo8kc!aFC^Rp4=EQDw;)3}vaw6f%oKHQ?HW6mo}{@V>3lt_5xtPOEa|GcJz zBnQ&gD2P~l@fEV;J6y=B!P$QWaRv-fz#gqB-p{3zqt zpm;9{nx#Fm;r-D1DqQ0;Cv@kQDOV!cXXG*{w3DK=?3K|zFn5@Kc*F1%)*lui2;kn% ze&DRGP~DYvN~kE7HAgw@-RUfTvl}dZq^}3Ht5hTlV{zX~XvSEpj+*$))ksC8g4SLu zcyKyyJa_8!5+_UjQo*g0k(buMqvt zC#{bvJS6_ya0p${Kp7;pXx9WVwY9Cl2i!tR%aMJfJ+Iv@=oixi@2;VY+(oB{6 zi%)h4IfZ%c2_*Q1glE{+_P-FHb>*x7$4CxO!4wwC60VKDm+vWNQ-!uy~Wjc4(tuE2z+ZetX3;=q3H2-6XW=zRThF+1vxK^SUsA`rm=!8wCE>qkev5jCEN4ufYqlih!7>dc zhE|6RO6oQV##3@~y=bCn;7I-D9HJ90Yvkyp<7t3u>nxS+3Zg(p+(sl` z@|h*lj)geV2TiR_MIW+Y81J6UHJ)4O>LP?_#O-zcX?Adh;~@3tVjR(GPX5@LT#*2o z-tcE3;=SQ2r9k<{K_ny@il7bxsTD$_V!B*!9=nV@;m2Ay3OKN$d1Uj2}Sd_<*4lZgRJ8Hh0bxGGdm zAio2J<$p$nK7Wscsq-xS(40ihV5qHvc&or)W_otDtnPfExuhpqV4rI2_2jAp7cqtF(p6#{eIBh54MRdw56H`4$wMCOlmNL&QR|=l1C0C} zXQFW908P1TU#RbAuY>2vbgyDr1pqB(DsCPu2qKX z_vv0GRrtP0T$%;T>cA*+{VH`eM*@=78@jI8wvmxS?gX!laQ1`)F{(HZb{?I18IY2r z^%PqR2A|+lCFz*J-Juzh7-0ce&%HqEmIebZ_nza8Y9);=1^@?Lze%Q-;N2OAcZG94 zbX`yx>WI9TV*wqun6SKP(M(96X&2*Y?;c=QmYC`ViKYK=%^0WuANL?#y;zJO2*jwl zhoqTf=4GMloo3?JH3f3aV*li-rK{J75e9(#$N!V75Qus{^kdAOLuP!p=6^?Cn^Oehgb_*+bnXxhyTMy`%j(p<( zLn;e9H&ZZsbQY)@oV?fl-Dq9{D(_H$etHAhS0;(4;pYhXqonV=Jxai5ud+Lv^kfS7 zI7LKcEetT~rm^OQUy)R)aSCT%L;?pcjGJ0c$Qe^Ah30hH2y6Avry>g0unHWi2;g{q zq}s=!-m?JmCBH?jDFXfvw?m6$5tqaw-}cM&m;n+@d?Y39`E%e(${Kd02-eR{i&<-= ztRc1iIkMweXXGys;hZh6j^V^xVr*Qi+9Z0Z+cqDHCLhKeZPsz*KvpqSUK!+K5O95S zxsIjto>iOOwELJZ)8K>M=aUJr81i)`{dsi=7ZR0cjk1`DZSQ*UO;82D%b6n;tx$mW zX-}gZ1O~$w3?1d5uyn;Rv1IT;e;qPDeVG26l-r?e^>TQ*lwF&K6Zbm zI~6_n;eFkVQ~Y$rCS9Ux|Anwqx8Ic*&U=IH7k3uRxO?1zeAQQ=jruvYjGgmwFYMan z3cD59i0%zXYX~R)g>@%!b0Rqbt|17E_v|_~NSIIaG^h^b3NW zB8PVuzqd+!zJdBGTEIAeqXbi;7d%zy@+He=qz2ga7|t;WlyU$)o4VaT%AF> zzR_}sLhn7Nu5Z2N&Qj)7>(oWxm+%_mMEF74gDkS?`0q*3M0!*D`iFL$vz~r# z9M}hmQRDTW_jqMy+#;9vTE>^Gpy+JIHEc!SwI9>Vqu}5RX+jn-vudDOXP3{9X{$26 zh;0O{YW__{%rIxq-mj{X%F&|Iwp#C`o$~m6xl3?DaOU)SXZm3YPfmb42{BX4v3d|N zwZ7Y(kKO%ml{V{TIu|H@1t|!}sYW?P#Tj=fPLQd7Y~h)x#C14hc_Lrn+2SX= zd(0Uzm&=k$X%+Z<*ZA$?e* zxLavRq>b%*bIK8_AI1oh?c;R<60G2+biXfS53*u-GhED{tvisKoajgnBKTH}(2doT z0%r8Jx>kD2k0|7$Vx%pCeC(Px{CajaY$y9qEBLB=JA@=zA+*bWBU79atPr&iRAM5k zy(W-#XWwQ9W^pFEo^DjOVJ;0>Y%_5rBQ{P{GxbWEb*0PFG!S5N%w9-3E7)Ac?U6%< zffT?7$~xKe?yGgjj=T8RuoW0*_4wLub3#@+rq+zcz6TE!vmJsdJp~2mSomaFTf5IhoI{Y4h=T05mr6-krCv={JCCjx&8spC|V;-x@0KO(yWG8Wju^qEHhW@5hsKv;N%8N%zr(M zI1oS_I}Ub%#F#MgK2aKh^)tJy=4S}XVer$)bu=}TC9sTl=;fJfBay(R@-yAjYIvsq zHQM;y8@X;cS|HTAycx5R8V58|xiP4%gRRdWUcudKD*lO!a~&ZrH*%F7lO8Upa-JmX(i2-u|l6ps!h2ut@IE1OXSJ%PkoEW_&5#1^x%mU z>jfIu$PdhKFNUQUJS%zOGTJ1m#_>-QEJ{Y1vW$3$G{(g@ytp;iE}Zkvvo!;*=8|72 z2D#+VAQ9Y0`}{`(*k-bzYx=1(yp{{zQSC`*vqfovw4v3LfNI&a;H>7xmuIwu50%jN z5O*=_hg*9LtQ`l!mtjWU-rpi_&5OaPg;Eu&B3N(uo0(ChxwuL_#mEw<^zI^BYpHT) zx_JIIt-F~XdUa}{0Yb~IsJ!}E9|~t|#AP4s-2|Rp_-0POK;aj!KG!S8Pf@I`vtR-f zJ6=f_%u8~MRV@aPj`-rvWvDk3-}@8MB)_KhI;SqKU2mz&HIkW4WZ$uAd7$2_ z75&c3Y0~Vt^9GaB&a)RykEib{)Jj;s@b1?UAykfaK%-Btso!(9`;r*7FqQVM!RxSQ z&X1}mERDZE)-jSlCHHs*{&7#^h1$r~U3PwK-&ggUmqOrcHdkfKTZj_&QBP+bRQeA6 z%eyX6gxofVS&9GT{lXf9_8re}e`za9FfVau{k_W?j-VfTojdVlZxFVXn{@B*@}#Ep zw55CF&B>jcN*b+C?X^g^u(iT`SA;d~i%Dz#T#idwruFQ-K23pnMO~kS4D?ZUSf3MQhS)?)@E`W7fV zZEKRZ-VZwXP03_s-lp#&J?-35^ZoOqRttV4y9>HUC8;xWoasp?5xc2@hiQv>7ekfMu+CI@V)r58vJ=+@;I!SrV*r{34 zlC`w`L{~9$S}Q2&sigoPMwkTgvWhCco#33mjtL28k8=nm^6aWTn7)XxMKL*?!qvs6WbG(R_suqxTM?^?Cm;Rbg&|#^^;~2}E?COVJkw z#lx3tTFEwdbPn^9^xzUGiq2!{C?V9QT){fhkE*EN1tCWmg*L6tfu49>b e;1B2TD?R;eV*XO^8ELy}0IO%BTdD1M_x}KKt-Z|v literal 0 HcmV?d00001 diff --git a/packages/uni-cli-shared/template/common/__uniapperror.png b/packages/uni-cli-shared/template/common/__uniapperror.png new file mode 100644 index 0000000000000000000000000000000000000000..4743b25e1284270fee6ba8fefdb5265f6c451a93 GIT binary patch literal 5842 zcmX9?cRW@9|3CM-bnO|Hb#aWWs3fy%--{?^UMqX=O>!%tjO!T5{Dd^PcH~;OGDB9f zrR;Kzt4Kz_+xPd!Ip^^>=kb2NUeDJ)ucT`x2CPhHm;eA^#bR{LXwRO17m|T?Ct6h& z0s!w5tghD02zyEa^I_~me?s;@f;rE@tf6>(C z!@8|ReKNh-b~I|u7nmFW70DhqZqAZ7btn#uhu?N19NzZg*elA4V+OzCMArQ8a#+Bs z&jSZLo7~zL*Zz2L^j`(sCK48PuCh7u{0YMI*y>@0861mJrIt^BWB%KW%H{`b^{I0r zg+^jJ;rO3qSx<9-KYoy!Vw<$A7TKvgvQLQlZ(pRo-GC4CMjy&%y*t4{_M)_hSQ~hp zJ3;ECVm`0x2>4Xci+ZM4W;wNrw56&f9QPYLMXI}R-Fl=H22Xbho@0t5@`Uj#jaS>% zGjw}bJyw(Hvj)c;zYtfwd=R3ZVSpMiAw+J*Y2A6l5Xc;N1IRZXv6o4UPiaBFE4Sv3 zzpeiZ-`sod2T@DvIU%N@H}%Bucn^~+VC!;~R3Gw94S0&rXB*exh*9Ye$U)&E(E_iy# zHI8l^&L}E|VK*Rxa3zALO#Ks0|2zacY>T}lKvCa^Z5)1?uy}`Ur{#eK3fg7)R?T|f zj{u80aF?#}9aD()j=W;t<@wC@43Delm+5VmL-P?B1G)wF$ zIgEhh8XXWj%y3Hcfd%IqXpwYJXc%qDfen*C{HCR|b&NBbR|YKw7FQW0IIwDTmtzST zdu<7K$dT@Y0AjY;Da^WC~Ij8tbdpIiic6con4A z;`;-+j-^gW=#OQh{aBXha&t2F6on8Cl967sH;8s9NdBi?Q>a5%O-lReUgq!lw~4fn z$S+!Xu|tjY0e++(2HJsM+=<|Hz@?ijX+Q3+2YQP;dYWDZUxW8w=%Jtn#1N_V=(W8B zyCw#1Q5}+@Y9isrhmkVexdA+4hjR8b!Vs~#=MNY^sUoNp!u8whl?2m>dBm>h6D3Yv z3;cZ+aD`1EgWb`V(W)U+DY%U11C5nG!m-i9f@O4ok>z1rR^uGXaz%xn>JNnVDJi5a zAf!1a(p<8YUsxkV*TewX?({rv4?37pFv%j-vOSBImVUq$y6PbQp5LeP(I~=Fj~^Re zfX&gNUDo8kc!aFC^Rp4=EQDw;)3}vaw6f%oKHQ?HW6mo}{@V>3lt_5xtPOEa|GcJz zBnQ&gD2P~l@fEV;J6y=B!P$QWaRv-fz#gqB-p{3zqt zpm;9{nx#Fm;r-D1DqQ0;Cv@kQDOV!cXXG*{w3DK=?3K|zFn5@Kc*F1%)*lui2;kn% ze&DRGP~DYvN~kE7HAgw@-RUfTvl}dZq^}3Ht5hTlV{zX~XvSEpj+*$))ksC8g4SLu zcyKyyJa_8!5+_UjQo*g0k(buMqvt zC#{bvJS6_ya0p${Kp7;pXx9WVwY9Cl2i!tR%aMJfJ+Iv@=oixi@2;VY+(oB{6 zi%)h4IfZ%c2_*Q1glE{+_P-FHb>*x7$4CxO!4wwC60VKDm+vWNQ-!uy~Wjc4(tuE2z+ZetX3;=q3H2-6XW=zRThF+1vxK^SUsA`rm=!8wCE>qkev5jCEN4ufYqlih!7>dc zhE|6RO6oQV##3@~y=bCn;7I-D9HJ90Yvkyp<7t3u>nxS+3Zg(p+(sl` z@|h*lj)geV2TiR_MIW+Y81J6UHJ)4O>LP?_#O-zcX?Adh;~@3tVjR(GPX5@LT#*2o z-tcE3;=SQ2r9k<{K_ny@il7bxsTD$_V!B*!9=nV@;m2Ay3OKN$d1Uj2}Sd_<*4lZgRJ8Hh0bxGGdm zAio2J<$p$nK7Wscsq-xS(40ihV5qHvc&or)W_otDtnPfExuhpqV4rI2_2jAp7cqtF(p6#{eIBh54MRdw56H`4$wMCOlmNL&QR|=l1C0C} zXQFW908P1TU#RbAuY>2vbgyDr1pqB(DsCPu2qKX z_vv0GRrtP0T$%;T>cA*+{VH`eM*@=78@jI8wvmxS?gX!laQ1`)F{(HZb{?I18IY2r z^%PqR2A|+lCFz*J-Juzh7-0ce&%HqEmIebZ_nza8Y9);=1^@?Lze%Q-;N2OAcZG94 zbX`yx>WI9TV*wqun6SKP(M(96X&2*Y?;c=QmYC`ViKYK=%^0WuANL?#y;zJO2*jwl zhoqTf=4GMloo3?JH3f3aV*li-rK{J75e9(#$N!V75Qus{^kdAOLuP!p=6^?Cn^Oehgb_*+bnXxhyTMy`%j(p<( zLn;e9H&ZZsbQY)@oV?fl-Dq9{D(_H$etHAhS0;(4;pYhXqonV=Jxai5ud+Lv^kfS7 zI7LKcEetT~rm^OQUy)R)aSCT%L;?pcjGJ0c$Qe^Ah30hH2y6Avry>g0unHWi2;g{q zq}s=!-m?JmCBH?jDFXfvw?m6$5tqaw-}cM&m;n+@d?Y39`E%e(${Kd02-eR{i&<-= ztRc1iIkMweXXGys;hZh6j^V^xVr*Qi+9Z0Z+cqDHCLhKeZPsz*KvpqSUK!+K5O95S zxsIjto>iOOwELJZ)8K>M=aUJr81i)`{dsi=7ZR0cjk1`DZSQ*UO;82D%b6n;tx$mW zX-}gZ1O~$w3?1d5uyn;Rv1IT;e;qPDeVG26l-r?e^>TQ*lwF&K6Zbm zI~6_n;eFkVQ~Y$rCS9Ux|Anwqx8Ic*&U=IH7k3uRxO?1zeAQQ=jruvYjGgmwFYMan z3cD59i0%zXYX~R)g>@%!b0Rqbt|17E_v|_~NSIIaG^h^b3NW zB8PVuzqd+!zJdBGTEIAeqXbi;7d%zy@+He=qz2ga7|t;WlyU$)o4VaT%AF> zzR_}sLhn7Nu5Z2N&Qj)7>(oWxm+%_mMEF74gDkS?`0q*3M0!*D`iFL$vz~r# z9M}hmQRDTW_jqMy+#;9vTE>^Gpy+JIHEc!SwI9>Vqu}5RX+jn-vudDOXP3{9X{$26 zh;0O{YW__{%rIxq-mj{X%F&|Iwp#C`o$~m6xl3?DaOU)SXZm3YPfmb42{BX4v3d|N zwZ7Y(kKO%ml{V{TIu|H@1t|!}sYW?P#Tj=fPLQd7Y~h)x#C14hc_Lrn+2SX= zd(0Uzm&=k$X%+Z<*ZA$?e* zxLavRq>b%*bIK8_AI1oh?c;R<60G2+biXfS53*u-GhED{tvisKoajgnBKTH}(2doT z0%r8Jx>kD2k0|7$Vx%pCeC(Px{CajaY$y9qEBLB=JA@=zA+*bWBU79atPr&iRAM5k zy(W-#XWwQ9W^pFEo^DjOVJ;0>Y%_5rBQ{P{GxbWEb*0PFG!S5N%w9-3E7)Ac?U6%< zffT?7$~xKe?yGgjj=T8RuoW0*_4wLub3#@+rq+zcz6TE!vmJsdJp~2mSomaFTf5IhoI{Y4h=T05mr6-krCv={JCCjx&8spC|V;-x@0KO(yWG8Wju^qEHhW@5hsKv;N%8N%zr(M zI1oS_I}Ub%#F#MgK2aKh^)tJy=4S}XVer$)bu=}TC9sTl=;fJfBay(R@-yAjYIvsq zHQM;y8@X;cS|HTAycx5R8V58|xiP4%gRRdWUcudKD*lO!a~&ZrH*%F7lO8Upa-JmX(i2-u|l6ps!h2ut@IE1OXSJ%PkoEW_&5#1^x%mU z>jfIu$PdhKFNUQUJS%zOGTJ1m#_>-QEJ{Y1vW$3$G{(g@ytp;iE}Zkvvo!;*=8|72 z2D#+VAQ9Y0`}{`(*k-bzYx=1(yp{{zQSC`*vqfovw4v3LfNI&a;H>7xmuIwu50%jN z5O*=_hg*9LtQ`l!mtjWU-rpi_&5OaPg;Eu&B3N(uo0(ChxwuL_#mEw<^zI^BYpHT) zx_JIIt-F~XdUa}{0Yb~IsJ!}E9|~t|#AP4s-2|Rp_-0POK;aj!KG!S8Pf@I`vtR-f zJ6=f_%u8~MRV@aPj`-rvWvDk3-}@8MB)_KhI;SqKU2mz&HIkW4WZ$uAd7$2_ z75&c3Y0~Vt^9GaB&a)RykEib{)Jj;s@b1?UAykfaK%-Btso!(9`;r*7FqQVM!RxSQ z&X1}mERDZE)-jSlCHHs*{&7#^h1$r~U3PwK-&ggUmqOrcHdkfKTZj_&QBP+bRQeA6 z%eyX6gxofVS&9GT{lXf9_8re}e`za9FfVau{k_W?j-VfTojdVlZxFVXn{@B*@}#Ep zw55CF&B>jcN*b+C?X^g^u(iT`SA;d~i%Dz#T#idwruFQ-K23pnMO~kS4D?ZUSf3MQhS)?)@E`W7fV zZEKRZ-VZwXP03_s-lp#&J?-35^ZoOqRttV4y9>HUC8;xWoasp?5xc2@hiQv>7ekfMu+CI@V)r58vJ=+@;I!SrV*r{34 zlC`w`L{~9$S}Q2&sigoPMwkTgvWhCco#33mjtL28k8=nm^6aWTn7)XxMKL*?!qvs6WbG(R_suqxTM?^?Cm;Rbg&|#^^;~2}E?COVJkw z#lx3tTFEwdbPn^9^xzUGiq2!{C?V9QT){fhkE*EN1tCWmg*L6tfu49>b e;1B2TD?R;eV*XO^8ELy}0IO%BTdD1M_x}KKt-Z|v literal 0 HcmV?d00001 diff --git a/src/core/helpers/protocol/ui/popup.js b/src/core/helpers/protocol/ui/popup.js index 0396fc3e8..18728ef98 100644 --- a/src/core/helpers/protocol/ui/popup.js +++ b/src/core/helpers/protocol/ui/popup.js @@ -51,7 +51,7 @@ export const showToast = { icon: { default: 'success', validator (icon, params) { - if (['success', 'loading', 'none'].indexOf(icon) === -1) { + if (['success', 'loading', 'error', 'none'].indexOf(icon) === -1) { params.icon = 'success' } } @@ -122,4 +122,4 @@ export const showActionSheet = { popover: { type: Object } -} +} diff --git a/src/core/view/index.css b/src/core/view/index.css index 479d42cd8..becbdb443 100644 --- a/src/core/view/index.css +++ b/src/core/view/index.css @@ -64,6 +64,10 @@ body { content: "\EA08"; } +.uni-icon-error:before { + content: "\EA0B"; +} + .uni-loading, uni-button[loading]:before { background: transparent url("data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=") no-repeat; diff --git a/src/platforms/app-plus/service/api/ui/popup.js b/src/platforms/app-plus/service/api/ui/popup.js index 9e2cd1972..cbb873ae3 100644 --- a/src/platforms/app-plus/service/api/ui/popup.js +++ b/src/platforms/app-plus/service/api/ui/popup.js @@ -43,7 +43,7 @@ export function showToast ({ }) toast = true } else { - if (icon && !~['success', 'loading', 'none'].indexOf(icon)) { + if (icon && !~['success', 'loading', 'error', 'none'].indexOf(icon)) { icon = 'success' } const waitingOptions = { @@ -70,11 +70,11 @@ export function showToast ({ interval: duration } } else { - if (icon === 'success') { + if (icon !== 'loading') { waitingOptions.loading = { display: 'block', height: '55px', - icon: '__uniappsuccess.png', + icon: icon === 'success' ? '__uniappsuccess.png' : '__uniapperror.png', interval: duration } } diff --git a/src/platforms/app-plus/view/index.css b/src/platforms/app-plus/view/index.css index ecfce5c14..f95010120 100644 --- a/src/platforms/app-plus/view/index.css +++ b/src/platforms/app-plus/view/index.css @@ -72,6 +72,10 @@ body { content: "\EA08"; } +.uni-icon-error:before { + content: "\EA0B"; +} + .uni-loading, uni-button[loading]:before { background: transparent url("data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=") no-repeat; diff --git a/src/platforms/h5/components/app/popup/toast.vue b/src/platforms/h5/components/app/popup/toast.vue index 0ae7e407c..47b124411 100644 --- a/src/platforms/h5/components/app/popup/toast.vue +++ b/src/platforms/h5/components/app/popup/toast.vue @@ -52,7 +52,7 @@ export default { icon: { default: 'success', validator (value) { - return ['success', 'loading', 'none'].indexOf(value) !== -1 + return ['success', 'loading', 'error', 'none'].indexOf(value) !== -1 } }, image: { @@ -80,6 +80,9 @@ export default { if (this.icon === 'loading') { return 'uni-loading' } + if (this.icon === 'error') { + return 'uni-icon-error' + } return '' } }, @@ -168,6 +171,11 @@ uni-toast .uni-icon_toast.uni-icon-success-no-circle:before { font-size: 55px; } +uni-toast .uni-icon_toast.uni-icon-error:before { + color: #ffffff; + font-size: 50px; +} + uni-toast .uni-icon_toast.uni-loading { margin: 20px 0 0; width: 38px; diff --git a/src/platforms/h5/view/index.css b/src/platforms/h5/view/index.css index 8b3d2f17c..daa705e49 100644 --- a/src/platforms/h5/view/index.css +++ b/src/platforms/h5/view/index.css @@ -64,6 +64,10 @@ body { content: "\EA08"; } +.uni-icon-error:before { + content: "\EA0B"; +} + .uni-loading, uni-button[loading]:before { background: transparent url("data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=") no-repeat; -- GitLab