From 4e35086fa8e2a25b55e9a0cc75d440e65a400572 Mon Sep 17 00:00:00 2001 From: lyw <刘耀文@DESKTOP-E1TI268> Date: Tue, 2 Jul 2024 11:05:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BPASmartClient.CustomResource.csproj | 2 + .../Image/删除.png | Bin 2249 -> 2203 bytes .../Image/时间_1.png | Bin 0 -> 4530 bytes .../Image/购物车.png | Bin 5022 -> 5794 bytes .../Pages/Model/MessageNotify.cs | 2 +- .../Pages/View/PromptView.xaml | 14 ++-- BPASmartClient.ViewModel/NoodOrderCtrl.cs | 54 +++++++++++-- BPASmartClient/App.xaml | 49 +++++++++--- BPASmartClient/Control/DeviceCtrlView.xaml | 54 ++++++------- BPASmartClient/Control/EditRecipeView.xaml | 49 ++++++------ BPASmartClient/Control/OrderStatusView.xaml | 73 +++++++++--------- BPASmartClient/Control/TimeUi.xaml | 32 ++++---- BPASmartClient/LoginOrderView.xaml | 10 +-- BPASmartClient/LoginOrderView.xaml.cs | 2 +- 14 files changed, 209 insertions(+), 132 deletions(-) create mode 100644 BPASmartClient.CustomResource/Image/时间_1.png diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj index 1baa5fc8..cab53966 100644 --- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj +++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj @@ -173,6 +173,7 @@ + @@ -422,6 +423,7 @@ + diff --git a/BPASmartClient.CustomResource/Image/删除.png b/BPASmartClient.CustomResource/Image/删除.png index 1f331b5d9f1ea3e833fb4c45ddcb849f5da1d64d..4c0c1d2742577e09bc949b170a8ec24b1d9285fe 100644 GIT binary patch literal 2203 zcmeHJ>r)d45KqpegrwFW2venUk|WY*m$p0AZ}aP zFg2mt6cx09KQNvZ!DNzyY^e29ZaZ_$GE^$uyLT0n89{w?fQMZcm8lHg=;XB3twgJs z7PW*$S2+riuw4=DDU(BJziQ)KPm!733%!ril68)O^rN zesz&J&710EW~Sl7bZ=^dnMvykGrXxRb6k^u{mJt4Qou9nBmoL5MD1wFw+B{hmL;f$ zvbv|O^h=q}RVRAL-RS; z@I^N1knOn-dVw<;nelQVg{>tc&U2kQhhPv;@ebHl27o~DO<8zHq0wBxdVBypYF9b6vRor;jQC;QDlRBAQ7gaB_u;m%$Kts*mOO*dL1=vr%5( zMj~(&diDJ+>p)@VE}C07lEt61cvdc|8FRoS1zyIzvoNXql0udkpI#UqNj3eJYT(%r zIcZMlgc~uhsLhvU$;l73;68---4rqy6%hbJ2?)mD`wD=qCE?PS->@N&!$7G0RUX8j z1h985tic0mb_DX~O>4d2Pz4$yA|JRPpxfZB>550L& z;yMY#z46);75eR>Zo}$_taJO}CC~eM-TR7V40!g{wbb_4Oejo@hTkK96h$I$P<59Z zx51!?T)wPk;^4v=b__@N=NG?U!Xk`RSxP_-_wh{h*<2PosX z2jNl&$la^fh_AknZrAcYbydf00tIkKclb^D+3qsgFg&YxezUVD0+QTEb5M0+VR{`0 zVHc?XLg!P@U2!R8EK(}^lJ!%K*Q|PIB|r-d>yN+Nz@`A@>al!zW?hgr^$FnRV3?VU z&aXle`;T`;nQex0V=Zpl;MVnG&o359i!UHI$6s=)v2v5n@Pem z4j&89(SpYQm?Jrj+HN$vK;8DCp>w1+98g|*#Kx9N+n<~;{a)7WrmRpJ37tmPSK~?d z*zZNBWnKJGTD1OGeJ>o})T-;KI@_f=vu-jR=JI9?&zQVb6CUpiA!Cwp8ji1PJ*$7A zG*+=I?B?#GZ~ZQ5i^eMqxg~)-F~CvZ92+bHfWfyKgL>n04xX$4as);78F{> z++hq532D)qzj1in#+p4dgitIJd;Fm279Uzuc5x-L9wbY|P1ZJKInKS65{t*xK92t- i#e6^p)+FL2vVPAoxU;f(USs|?Fh09|>5^TCQvLyf6n!TE literal 2249 zcmeHJ{ZrBh7>94rzGCKEYQtrO=1W?hR%1(f$wDW0dPVQMc{Hl<5#Vi<|;2DYZ( zTBi6~o3qyvLhe>+=B5q)Va|K>w5S$^r`( zW}+<37LnW%rM3hT0`%o$GM2v1fA-STjm{YwDUk2$fad^UGTa)BK%=zJ4k9^=Ycg_s z0CwdI<->HB6bi0t`gnM84**PdHVLuq6_nMY-?H@#G^&eE$k_=YIcti(8<43m;E^7N z_yi09@9Sb&{5~%?X~>;K#cK++nLM1ZKl-&@X6qXE{LIvh>Ut#z`$(Ko#x!z?!Iw_= zK)BFdg=Mo7A_F>JQfKV9J@t`V=+o%(SD*BpI_0(-N z!V#r4?>@!TfdPP()^OJmVIfo()qP~8b*%)*F1oym-(jfZG0TR1Fn*EQob>I*Y|{N@ zusv+xWdFAn6dNkj)Np~tqo5*RDkR$bXgusyJKD-a}H%;4caH2XpoS}9! zr{}6rU4rBkyj?hRYRTJ8Dn_5RcQ}`<8p;V~7(c$bjMhA9BqFULcw6Vvlc=eMQ}vPN zg`a6A^-rFVYiT}fHrVZLYm!121a9bN&~POz&iLL03o2&T2Rv}Q#6hs%5%2VPHxB=s zZD{K-7nVk@^j!M8$}^>G-76;;%vNU#T>JPo$a1H0Kr% zAVr(->>6H^>%O6#tDOF&hw73oJr5E;ugOA z4RcNfWWwbuatT8dYjNfYMjXS=W8?O!@t5eDgn72#pz<;aU= zu}XnVf@)p~<$lGVoJbdq9ME)BWQoS}8};g5^+xy7F!E#JzyrV1AAxhRL$wd&=|uaN z<#TBa59x#tIZ+|v_2yamt{;zEaK0z=bNnWV_`OL~K}>Gt-@YyXyZ`_I diff --git a/BPASmartClient.CustomResource/Image/时间_1.png b/BPASmartClient.CustomResource/Image/时间_1.png new file mode 100644 index 0000000000000000000000000000000000000000..7e7cf13bb86fea2d166634adbf48eaf061f4d92c GIT binary patch literal 4530 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 literal 0 HcmV?d00001 diff --git a/BPASmartClient.CustomResource/Image/购物车.png b/BPASmartClient.CustomResource/Image/购物车.png index 38817f4137c2e6bb80024d2c25c04c7a55b665cb..9b9c07f9a07a0763ac17921aa36c2cb0009e6fa6 100644 GIT binary patch literal 5794 zcmX9?c|26#8@|jmk)fGvW2*&=)PJt|9u zBx^&+HiSgzH+_D8+v zbw1@nV^ zj>kaJMd~P26cv&Pzi3anbHt!r5~zYA8s6kItRrApkn7XOOL#Xp5o5XZQsO19nTxg(jj1{ablV?*-jwpdDMDrXUAfErkq|XYzECEhpPr^ z9XA9TpCutb5)4dN&5_HD#(yGV1D{-G(xy-pvowJ^;Amg zjyp?Zv}xc|BIXiGT1K_C`k^v9R9Lm(g6JirRs;{fn@h=rEU=iubRtltrNK;G4T`}U z6eA3%!s&qH<{v*{z(gp*n+=%#{^v|_Ttl8-U(oL|V4dwS8^!dNNbPNN=!w{U0DMun z86hj(NDbT%;9OnzX*pS7J4&{y&tJ`ZKfLf34DXG-D@C}KC-2urAP^J~-gww@;@uR) zF7?9UmAd{b8*^SZhi=5cpy)&v9B&RSR?trc;LPG~;mJDdSduFc&v-9xzLMd$El@H_ z6)r5|RV9HA(gdqF@`*%Q3(U5bSo_4x%%8U{zN@Ap2jafXX@<^J-2qYo%SjAOYP`~f zTe))HC(o?zw=^8j|223*6WT27jQBXo@+Tw9jq;Okht2RS7{|UAR&8CdqobqE-_P#{ zGjGm&AMEV-VMqt*YRPE$MyoSOGGSp%aeF!e{WLWts}xtrFUr@l!Y*|O0aaz+IBqgB z*wYt0Fad`8jHH{<<+S~Nb2o^Az6=@zhUl+K=R^6n3k}zWft}NS`Yfqr9STm$x7Hxx zeX=^X%caEL;A>!h00k|lFVKfS#h$R%Cv~{|c;`v%&~o)e?&H(H_bL7pLfd8tzmN?u zeR5YGzy=Zj<3ogOe)7(B-dmKAQsIF1oCWPnHYDN7Q>hkV0~sfcb&j~|B9IOV>aym_(YYH`_Rv%*ITc~$#SCv8FKTCF*pV37Tm(-ILs`?u2nN_ zIpJ}F2jAC`(^l7f!Jxilzm4Q`bS&*z?d2`MnAPX+}7^3@E(~pXKl9mD` zdO*09qw&bY^iaIAA`NxONV3WIxg6#LY{;ETMb7E0-i4}fLGu}zN544tqXbzCer#{& zcX)m4l`aKz7v1?Npl7wA8&R~I{StAVDc@VScZq?T4$!Z3Cwl^M_!#@&R#w)tx4;rZ zSGqy(P&iOfKhOgUZCAz4SZ+J&YzvkoLc$fS?peocj0O1ljo7va?rz9D-pgl+Bh$bTx~-Hq^%JD*@BX`S^ZVU3ge zOdLA)rghd+O6*8-{nO?65Fs<6^l6=EA{P1SR~+Z=)zM3B1dxjMtADS@HomO)c>ryb zy<}k9Idi>OSFj{WZlh?_P{R&DLVyqYDH-)(S^2}-b=E7M3(-ZvKV6q&`-k@;z~5>d zomxircDG>JmxeN39F1?|er$0Uc(7_VPyMxcw4hJQ7h~L})lfxgnNXt4)~L(#Jv4;l zVQ_HM4>I}6H7Y(-Z?_h_ScqbDy{YLqxc>kaZRv{8fBu*-@~;n0@HE)To%Q~~ljHsM z>Er_Kf(sCB$>a*m{zyV(WMpM!MvjLQ8pJC09G>cZt+^W^)8i6BFg{m!`csj76`%k0 zaZ-_qE_yYJdkXpn4U+*$(E@Szx~S}UkOzai;(i2ylKu0wMN4x0evb)IwhwpK$Z>@( zwy0?On#K_|u+)ffb?84#01f1#X|suq)F-2>euUT64-shPS?+$F%p-?I7PP##QHBw# zR!FngO563lNl%i8C0t_9PZhB?E7zFPifQ<`ZeS>i;IY#Cgx1@9zyu-Bc05bRoGG1; zsgu8l)q0g9`6`9ThyMkou;4Z9N$Z0+2|Gzh4Dw@AU2wz@i{}%~=+~z2dA&>!P-i?k zId_@osrRR8`0&+29x0?&NZ}a^aBFQ-IeASKzbJ{8m(U?7(gWind|K8UcCgH&I*?}c zy&-sv$L0kZQlPmY#K0=@pF=z!qGh13Rg#;*qZdH`I_e}l^CiDc<=3w;7Lu>8X0q>= zhY`z46NaH^M!$_WkL8S=?Z)X;>sW}lCY;PI2LY)97AQgQe993cmT&zteNtk8i*7(b zv%;hIk4p6sS!Dqyb`4L%H)7Ws><6zgQ+j!DUg08-i=cxiE)a&W9ZTnnOrRjCM%Mky z&aN)w6Z|o>oQ?uzN}rnOzoLgeCY8d!fd7E@GaH0{7sa~NKk1iZr2xHT2lFU=|L=i-Wv?l%|B80zh~Q) znr?#fDt}(czck{tbwdRv5`S^L-J<~M$;`p`h+*t@UU{Z3Vb0leMO74J2u6Y3mVdyodcWD>l^z^ArLKTZv$kh!K;5U)EDwZ*?x0{Uc4p=zkIP+~H(HgQ6=fP6ndL1O} zlf$AZI$J7RG6(7-2;^q4NI7Vt>{cQvlj3Eiek#g;&CUpKcLS-*{=QUNKiRN+Sw2zS z@rFnkD-15_C5_CJWO*h{T|TBR1T4mXZ#c0*NpyF^(d<%7bsp3fG=LEtDvs#wc7cm< z7aDTLxib#s0bbUegC&U)A7Bu(OCP7bzs~R>I_Au;JWoNxdEWq1`WGV>oxS1aS1F@i zpYzV;Uy>7}gbNGXPHdU@eXGiUmTMxu7OUPf)JM5Iqr!J8(nRFNVCUm& zDlH}Z=WH;ov)6+pD=o_GfdSQfUKr@ZDmG?<~H z#jihcuEbOW;lBU>lt(h0DE_;%%S?FFTo7@C;}gydmt%l>U6$>;Lo!9x8G`w%Tcg7| zmb6-5X&_|$^T{dU1jiE0I^)6LbK#;TZBYb&l*{VDJAcBEU-4Ev+*M&1^S;KciEddQ zkTW^9K)J+F4SKixw9NiAxbJqS)_N*0k|^7(p4hMz2)m3fRG+c$v7}7wSJ`~(frCPi z_DrJlq8z%ljfA^_A9EOrfFBytmieC9wA&}lbJ0LBVgKMDL?o`zM5Bo1RiR`uQSQ3-XS!l# zgA5(cIGN&+fz(VnA0Eo8xKeZZQI>0>k*W{?`CB4Ig)k_b27Gq^@o5e*P?bvFL`|Zv zJHgMp>N;c!byb`?D~ecz=h4j;=oyQr>fi_nlCJ%P!#+ySS{=~N!@rxcrYUZ2K2)b9 zOp*#j%HZSph`W&zX(+yoF8h)EKz zq6VBmGiu4Bn_S4hlZU4~aWjpVvS?vGR}m!>C4g6cY&VtNIpo$o8Xda}?=aO+(mw%k z5?#!+@>JuJ3kt6M9!(B&Q~`bm5^trj=iQ2IaTHUoAM z|IN$A5#yDf!jE_*SR|7*2`GgkF<}dq1gwtD+ak>V+24BjZcxC1<2UcBm`{+u=h6Y>9@IAbhQeLAIm=qL4wICGWTH zPstyy)rt)bdGf)r?PG_hj@ho`dUMtnu;(d4$!Pe*Yzr#x;rqV(2%Cm;D4D&0-G29O zYf*+2=%+tl+euz>Dq!&Rg93Bi6skPe;ltC&)P`C? z|8LO3$jXI+64`n#7_jsSZM4Zd+KnFc#uo=+Ta&5TwoB*d=WPZPI08^o8~qB$P*MT^ ze3S!73tNG7i$WlfBoV77caKXjc6$~}kj!9Nz*BB4)P^=sUwmX|Slz@?fEL0E46(|=SF4Ta6B1d8qakZ@ zqhiF@bimr)IpM4z6Q-M$l)Sgls8jog9ZX)2!riXioZZ9c*A{?RBLb&28BAAH`(Fs9 zzw@<6b$;$~EU{n1mAeAZQ#nqfRv3}eFOD^9lz&)B#Dv{$u_4U>!YcX*T<|2Wub&HsTEU#0^rYsw}NMHw}q*;6rki%>Xj+g3k zG~b_VrOP@Jj{fD+5lfsh7E1SwvX{G^Ms-Ct(cT^;#ZHQ@D)f6yJ+}>Gx*71;{&$~@ z_a!%57s9RV>*dZ*M4Mi70SwniK&h_oVNL%}Zf2BR#MXexRXIR*cs134iHkM*n23ZRd$yGe?6U>C^6P^uT_ zxdv$m&GX{4^*8U;Byq^vOrOe8XoLvSu%&>wD5uQ4X2e+kz#3r#C%N zO@eZ#_A)for>8>ohBSn=B!b&i_2dku?olv2fRvq|pU>qU7ji$Jhb?wI&1Agn;W28480d3J8d7k!(Bqw8^P3nE|OvITtCJvpf11xfQ zv+4ggpN@Utf5AUKr)=Ru5t+5VP-3qaq)~pFE)|8)IuIuBP1dx3o~nQx1};>mOVGahOI0f$yH2c^H9yu5Z!buz@}>~iin9u=jvG6Q<3O51l~DxKLP ztJP^9pNGHO{@WZh`fpk!%Vv+1}kv0wR79m{ud8+OvE~>v6?7~=t7E(*CYSkPJ zmcCtpXehV7g=Ka6c6<9Ay2czIlVG^Mu>Jx%Lfstm%LLt8szm&3xoQi_yJry2`Y50|DjWFo9-m$*y2*6neanBji( zd~u|yw#h8G^fBIF)zae*Weog)Xl!j|{TgO7C=#OnMWoh3}o zmPu{l8$E~aUZ)sp-y@b!GG{=ofA7&kSJkvX-v+A&n9Vfh*A+=z&E_p*6Tx?iP>K~0 zt?ehPL4Tz7!tOHDpke7ary2>kEdIOtfBB$%CPkfvy*4aggXYW6SytQ(C>t$k4%{V8 z8A<0puZ{1D%~iu@k%h!27>kuz-`>3`{9bfg+m#a09&?kE2knWXf*kZ-T{_s+Vs~Gx zZxo{z3tF&HE?QIPH2U3lL59z(M3*k6t%Q3O$rJ&h$%ihqR=Q_boQ^9w&p@n3MmFvE_}D+baLqtzQYxmE&5%+&O%ZaS3v7 ze_vZU`asdB4I3?M1wcv~2K9Cd>{ zjP{GiM7tW{4%YV=h9AkH^%7KHbYiy7*3Wkb$;`=L?jvI>*IvXf$sMmeGnKkEmpaKX zhbR7!Be>)APB+>{E#z{IJgtBaM|<~f9B>X=}6lV3^N#!eakixvM-TrHO3obAA{^`h+g|nk@rPN zS+Xx_(v+oA$r6g6_xH!W=eg%OpL_0eKleHJoReU7%>Z^<@H7AbFoGe@;zSPpH=wL1 zbFE!n(TQNXZDF7b)Qt+Q0|2)j0f)7^>-^Oza_X@q&%GiWX&xzE)uxwlMW|$Oef5i5 zFaGet9_ShcOIr3b{5xg#hQ)?uGkxT;sE&CRd2(o&u4E@~S5-^o-t7L5*Qx|aaGX*tLRUH}`IMG$ThSMG z@YOG&T<-0^l#Osb9K?q%wR#Ip5($X%7<29nBZNB8D*{`{R3;=NVW|b7J7LHeh;LsDdx#duLZY@1Krw5B zO%iY>V8a>kWLAq|yo1bBeVb8DIwVnu8udKklPHBE!$}tcESX7~*E7OSl#Gw*bKKnm zsI73ofJI43nwE?n!UJub(9K&W$1J^Z=vADDZOA9e&^;hEwYS07a0`OPF}Q(iX~5Ei z@h<_=9yLna;*gv#hB^e)#5+Xf1*t5AI4BCm4s<;JwdtaPA{pd0@eOmM+T?S*P)({N zw^)Jk=kFPWH=>kf`qcUI9QO+(Wy6is>;ydwZWj_5)lWj3&@N!bnLD&ysgafI{sN&VgQT8##unS$d`ALmO8}5iS*AW`rJ)IF$kN@{pL?IH z3@>h2y{bs1d|{$9z(0i46Wm%~?oV!}C|*Kwy9Ia9;ju>|rDs4*O!CpH>aIADK{!%n z5sm;SJhOF-{vozzFd`D>Hl~dc^RQko=d3vMO7uRQ5WR4&bsM^61Dw(KTmSt+)_80F zuP^84tPt}&y~9&+eh%*=tEzp;3h_U`J?a*T1xZ+IB|T_$?c zwI@Ke0Qnd)7Yz?^sCmjfeA~fS-p&%$q)1XcxuU2(Bbo`}sCB>cN&BS&v9w(S+r0;Aq^`J{`&Mo_ks1Idma4G9}?(pC2 zXjSGp8pEyU?7_Gq4Ox8KTs~^e-@;%<(;n3n8+m6O9d~)7XF8pcZkK$HK(z%rjN0k0 zmmAW~o2EM|1)uZDl|U&1QIBjsUXl7Um(F<4zZ5>4q>HdO`f!2CPLh>*u;GRz?LKAc zh0&*kpYA&Yn+M z_CW~R@sHA1A^ea>BI7DpCH_KMf3`6)yjb47auCj+fLR15#-xke19#rPhRxK*VJx97 zCh(M{Ul_#Fm+2y*g@p3Bi^`WlL2QXNx#|?E3`@7!VVH2M%U{X$@J8v<1%ST$W3;Jr z{U3~=~>6)B6uO%J+K2Kf!E+73SVkP#Kr?}ntvPPqwOc-yA;sK8ie(?yGK zk;9dJ$N$VLyJtG7jH{chti{+R4IHz%JU_dIhk*pbE}J1Ms+INtnOE%evnBt8OL)fv zM%N={A$DxfX?lhTwNVAe6nzJ~)se$iCXp@SU@HJ&f{*`J7}>k}2rGaDVo?ljw77{E2%=NAA)_sTy`SQnbG{y zdPEs;Q(V1~1J{UPoC7>EFE731hcF`pWrm|irqWW75pV5;%}yS(3F=ZV1LiJBNkL{X zIl8dka3z}lJA#RLLp!i`92 z=(e-=ta&DKi51eESfG}r^VUslXpbqXw`&ppozk0!UbUL$lg6g9Hn{xXZv0e?I(oJy z_F4_t*e((pF}bm=N2jA!=`|YP`;Dj{nUW75;yV%R0!Kf-{s*IPd* z2LhgEroRe7p5NXd4Q+nh zhPw)H&)D$+q^EXArS1sCd?0LUT?9@%BWV#jm;b9Y`&;Th$UXyru&wHObNRZpqOJ5&47n2Ds3$j*L zCi6)`62v|{<%>5V$bvKhG)e*1Yu)-xsQV2_OZi5=+cIm#f;rjXmvfb=gjawGgrh4n z&o~b0UwR|~1Z;!fW6)=I%15SdCStt7AK_(3vNQ+xh5AnqB|r<&q4)TUCAmdW&$Ag# zMIpI)#t6d{<~$={?&7#i^GZTXnk*kL~!Ep`0(z(KcB5M1jb1?Rf_9@7HG=Y z?*}>}`jNwUHSzB=7rQNRt=Sv-VjmqW5R7s%DM-VwFEDPznFyHF+nI=X# zeD&sh)lNR^@U}q$M!GcLLSjg6fbdJe{7$jJv=U@5!?AK*|3oRx^c&I}Y{Kk*@IkL6 zW!!|o-5>4YW#;45kRQU%l#hM6-A=hhK3|BB(khdhtjS_aBh_MG?#56GP80WXl^8>vfN$BQ;{zm{yGb=^7LC=ZcXgZ1`>3pf$-I_Bdh7b@#T{ zOwXS2plj1r;N$!rmJ3m+LNRQFmKaL#x)q@;AuLlV;MOC)TG%(}5+~jGwIyLI=-a}e zS&lMR|3DUXkjnT9I8TcY&Dh9-MPNz3oGEPzSA;FM1lh<9%6UozD5-h34|6LMGXo50xTq}F#Fw6wc3nhjmPY$#MjE8`l#&XH_!pCwQG#(A32!E?(+bDrjxjb`r$#19$ z{mt)Dse<2412`hw?Z^60pY{w3R%T)M3#<(&LUa->>m+k$THCaA*m4ZI95mb}FSdJI z&VU^C&hLHObZPgUlTW~YF-2v*h*AT?{O~;tUJXmc2<4|wna-8ac(6EJMx-}w%&bX% z*iBD)^QjY}leO3CUBuN5&CK$+kkeB0@cswKojjzXd@vG6eds#%Qg=!NcU zQO0M+U4PxH(|m%vdAP#zDLnLZWSwd{<84vsLz`@N?6%x^N=3JS58aA3T2ZrBs?7YxcD0X;LN>#@G$QO%L@DErY)5#N_F$Zuc?(|~J+bz(-S$p|%* zGE@h%9x>0~%TqM9Z_x}Ay8oT*Vw~h^-YY?C6bh$)^q6pLR2n1GEbc^` z;^>;qqm@#&(v{#}&DxFEe3kXq@ZNNWPuBDaG3{nLuwMTx#CMk)D#PW9n~4-{+M7X( zQhc#Oz2L@Aqr$NSBzMwmfS}XOQd0LpO(cVxu}n36j%T>?$xb|8c+%xTyVB$>R{XJ9 zgp!X>1sa~4lB6~?Xyy6Wc=};g$s$abJ*n-uDjmGHEnoJtDmdu zo>*S4U&c4XX#WK8c;exzNq;R&oW3LWR8oakHFD>+^;nL$^0dBi_aJqt{-cV4pPVKc zL=o;V)>3%+N`sw~Vyz#o)i1h6x~XJ|VTA}X+f|Rv#Zel>fZcL`8Rao*lnMLSOn;OE zS&e4*edCSZjW1+W6B>Z6RgSUeQS%LZ>e&Wj*IwlzQ_&BPh*X3^O`Su=t(M=iTGd~w z6Lw+ucR_(&SwFUrD=FTH`3bF&TAG??%Zz*oTY~@3n|Wc%g(5?j%4+D#n!crvTg2eg zfH$Al+Hp=nT;4Nd6x>rv{+_ diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs index d46a4777..e363e99d 100644 --- a/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs +++ b/BPASmartClient.CustomResource/Pages/Model/MessageNotify.cs @@ -168,7 +168,7 @@ namespace BPASmartClient.CustomResource.Pages.Model break; case DialogType.Information: PV.TextBlockIcon = ""; - PV.TextBlockForeground = Brushes.White; + PV.TextBlockForeground = Brushes.Black; PV.infoType.Text = "提示:"; //PV.Cancel.Visibility = Visibility.Visible; break; diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml index 603b1c3a..405031ff 100644 --- a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml +++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ Width="30" Height="20" Content="关闭" - Foreground="White" + Foreground="Black" HorizontalAlignment="Right" VerticalAlignment="Top" Background="Transparent" @@ -68,7 +68,7 @@ Click="Button_Click" /> VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" - Foreground="White" + Foreground="White" FontWeight="Black" Text="警告:" TextWrapping="Wrap" /> @@ -78,11 +78,11 @@ Click="Button_Click" /> Margin="0,0,10,0" HorizontalAlignment="Right" Orientation="Horizontal"> - -