From 32e5051720012effb7d02d44739f96a71147d6c1 Mon Sep 17 00:00:00 2001
From: fyf <11621@LAPTOP-04QQU0AO>
Date: Thu, 21 Apr 2022 14:44:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.CustomResource.csproj      |   8 +++
 .../Image/顶部切图/窗体背景2.png      | Bin 0 -> 19463 bytes
 .../Image/顶部切图/返回按钮1.png      | Bin 0 -> 274 bytes
 .../Image/顶部切图/返回按钮2.png      | Bin 0 -> 265 bytes
 .../Image/顶部切图/返回按钮图标.png | Bin 0 -> 404 bytes
 .../Themes/MyStyle.xaml                       |  63 ++++++++++++++++++
 BPASmartClient/MainWindow.xaml                |   6 +-
 7 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 BPASmartClient.CustomResource/Image/顶部切图/窗体背景2.png
 create mode 100644 BPASmartClient.CustomResource/Image/顶部切图/返回按钮1.png
 create mode 100644 BPASmartClient.CustomResource/Image/顶部切图/返回按钮2.png
 create mode 100644 BPASmartClient.CustomResource/Image/顶部切图/返回按钮图标.png

diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index 9d57cae6..166f8c39 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -136,6 +136,10 @@
     <None Remove="Image\顶部切图\Button_Select.png" />
     <None Remove="Image\顶部切图\Top_L.png" />
     <None Remove="Image\顶部切图\窗体背景.png" />
+    <None Remove="Image\顶部切图\窗体背景2.png" />
+    <None Remove="Image\顶部切图\返回按钮1.png" />
+    <None Remove="Image\顶部切图\返回按钮2.png" />
+    <None Remove="Image\顶部切图\返回按钮图标.png" />
     <None Remove="Image\顶部切图\顶部矩形.png" />
     <None Remove="Image\顶部切图\黑菠萝智慧餐饮管理系统.png" />
     <None Remove="Image\顶部矩形.png" />
@@ -151,6 +155,10 @@
     <Resource Include="Image\顶部切图\Button_Select.png" />
     <Resource Include="Image\顶部切图\Top_L.png" />
     <Resource Include="Image\顶部切图\窗体背景.png" />
+    <Resource Include="Image\顶部切图\窗体背景2.png" />
+    <Resource Include="Image\顶部切图\返回按钮1.png" />
+    <Resource Include="Image\顶部切图\返回按钮2.png" />
+    <Resource Include="Image\顶部切图\返回按钮图标.png" />
     <Resource Include="Image\顶部切图\顶部矩形.png" />
     <Resource Include="Image\顶部切图\黑菠萝智慧餐饮管理系统.png" />
   </ItemGroup>
diff --git a/BPASmartClient.CustomResource/Image/顶部切图/窗体背景2.png b/BPASmartClient.CustomResource/Image/顶部切图/窗体背景2.png
new file mode 100644
index 0000000000000000000000000000000000000000..27234844163cbb7e1d1c67d5b223e3e170fc2212
GIT binary patch
literal 19463
zcmeHv`&*J}*EW?o?Mo-kJtg+cm}8EaxtBHyPTQ#_Em54Z#3DsQaRW+wa|gprX_lMH
zajH=;GekwCo#LcIRDy~kiiw4QiUKOacia1Yf5G#^`+m>c^@E3p9B{97UTdA}T<f|p
z`{#r3)hldPfIy(tKZOJx0fD}`2m+aSFEa)HGW!0-9uR0F=%=7vzoZtA^`9j>{gcr>
zI9l5CF{jWeJnM{nvB|3+^*#Et`p08orux?FYpn}hcRl!N>rdH^DX7ML)2A1cyh+3$
zSm?17=-Ripm2cW^R5ceA4+IJJEC&55W~Xf}NgpOg-{N+H(VbxXxwqCw{Q~_4I*RF1
z3J)`E10x0JcO+7cu7S1OF?zoo+sLSH_hkR8mNu_Wh^s)m7<RM2b)hMGd6*a$IzrlJ
zQ!d0(c@ty4+F4KQNZD9fR&PyP<IHWb5ATu|B1OsUN~%4#`fA#QDkD@oFk5*5bn$m`
zpbH4Jk0sODvg%^>ESN5GnsHs_`D6378yT1=GTLxJ!-9*2RxC8hv{FD1mLc6aH+s{l
z^hqo&F_JIOj%fF!8QXlzc_>Y>bzw3rkO!wdoNhX&h6_45Q{1$+)&g;L=YY+(B_53<
zSgDj>LsjER#VbMMv}MmhAbH<518k%n%!cXXIurACcsIYyfnM4>JRwkPeuCGeJi##d
zib_3=KDV<;9_o(Qy(elHX{yjUrre^@bn?V@C~CL~?O#Um481C8_h)t6SOd?>|0_-6
zN@YW3p=R~LCZ?eJC5wLqJy+ykZ~vWg9AWEWP9#^Qw2#k;%T)p23=}0RH_eKVj+e~C
zLA-CcA0zm@iT#qemU6K$^$fv!b*0B9+(<Z#CPkhaACrwBrJDW4P;(13_U7*MPJy!M
z^j%(H+x(}LpIN?($*}G&Gb_-=HH)l3zvkcCG~9Mj(4+I)ra=y=Vuu4}J@4f6D_OEp
z{MwpnhX?AhzFMd)#(4@>+Kygj?r~qUY0e`Z8OJ(S#^5*bR=lirPfgN$;!MdjtSS-j
z)X1e-^e?qt{i2q6i45yO1WRhKRHv>2z1;*_0_qd+AJuO$6zqOZ9a4?ShV#bfETacb
z$VxnoRKQQd+6XB&VJ$_A+^zPcNy7&pOh<&O^sJcm&A4@e9ydxYo}lG<TxhzOermjj
z!lGB!X>_CU5(HdAp`%7}GfS>UfG&Q!uxT9XsyGPq*QkB^{J<=6cUy9Phi4-<rv?@I
zszX;UD`{xOlbcaAVr5%;XEHBB-VsSdQ9aXFyFgSY60tj;i1DjRt)b^M=xtbW5$}xC
zeqO6e&``mF$cHDM?Z_mKRV^bpjdNiVF+G1Bc@fCQ<X6zexf<Wu2oHmRG~j3`wa?_`
z?GyGk%=DJ45G$Hd)C{Vm@l**S_>*;Ib#lxGWt*J`?A3V4dWY3*W{{H?l7Dk3QHf8D
zQ#@hipHJ}4jL6x(CcH6I2iE2!hpTwuh5TiG=?5!Y7lVHM31kZL9_ffI<Ts#RelkoT
zI0IUTOrG8$yoP%M-8VZMHc#k()rca-p^TIl>Idk`;8*w+9J<_^HIG3nDUWO-iLX!G
z*A^VcCEv6wQjMkhN5|wBJxU+JW=HToud~aj@;sEZL9u^WVNVW{h?D76Yua46OF*gW
z1vllnuiMKfw%Z)5wkN_%QKvgc{rL^#JU{e2M0TTDitWdb2dL4Fv-k^|ZhkW6q$Xto
z>9)RW<W5g8VT4*mzAi>A9rO@JvP4>k=<zX6`|KLHEMPKitffm3O_x&9&BsiX0c3GF
zU5yG11A$hpySNAxuj<f=aw@cTM2vl=%K2$_vpU}Fm?}V5Izzu3kX6HrRM11hO0bw0
z)1fDEXHHvOk;;nG_Nlv=m-oqn!0oc^KJ!^iGjH?MFxamkkfj;$nKZQ1<q_DckCYqf
zF?vM+xlJ}ozZS($>FmCxj`W)q<HuPXRf8F$z7%mSw-;;Qzg!=lA}O_qQN?w>(`naT
z;SttQ+VHq#f$953YaJ7&YC@jbFK0dg68WbuK>7HYcLs?(WZB5DBx;)-KaJeMIM<IR
zmrd9_sFvWx>B5}9wU&RBhel}MyyZ8RhKJ<jl`QAFx?CAAs+o1bSh$*2yH6%NtbW0|
z*L&BiQL5R-`Fj}wwqF^*hC~A;;0rR}J$+A4I{&X&v7><-$ZqR3V=QAoP~EAi9BGV+
z$e;?7MzkLSf5<CMp|E$1ppP_a_#!Vj@~+1zr!|GGrPfg@&t-6_^i7DfX|*lbV);`D
zx}a6)kPDOa&Q?kl{5IQcVMX+1H_-FtU!3wbcXOOb+3pbKVIW=arX&CX)D{63GFx=D
zWv>F@1NaC`izhX&y^>u<G7!K;#?l7~Nm+5jclHg&I!Q?37NO;X^{9U>E6ZSx-V$!F
z{mY7Qo)CoL9^0g=LhO!mS*)c6q-T=9Uj<6|4FvpX4l%jCoLS*sTQh7q;Wg=V+}gI<
z{+nu_%nwCE_UGO(81EPwphjS;v_+mO=OKs0;j}#E3NG)2eHL0hE$~OfmDZPL>HS+~
zZQQ-LWwxU8U$~^0FmOw>Be^DB$IR++ogUb!k(}2F04+*D04+*pV^UrRzdHX(M+qV1
z>X=)+X{3Fq>p%0gvwVP@<gBYQ4?()iCGCC|?{E?$?(F&PA7E3bPM)SBOa>Xa%F)_W
z;~l!g!kiZ_w1C-w?f6IvDBQPh+hVw&X!$?<1iwii5a`!0-qDVoR9ESk+cuI(*@V6e
z)Nwp+%-7?$>}IJt0#fI|x{eN#-HHxPJK&yn=C#%G*OVXa@;M$tPa8tmH-iY(8p|tE
zShS*u=h>+FysmG~8=B&@_~Fjy`By)+MSD={Ve3sn$AbXAsHet$ANQ$cu&uaqNY!Rj
zo2a)L)OIBJdKfwyf(Jz32y2DxEE)TPA@nU1<`hpY%qpQY#LxwwBY7QhB?yw~K>4oJ
z;4zCUWHQ*@L%TmIGEw2OXS^d`g6!_(WyI#iUF&+6R*ro}L*v$fK&A^MEc5Y5C6(H)
zZlXrB<Tp%dJ+fNI0v@gARMRM)HBBNwsf{EAOo(V5fnYmn85-z{?7q*bNi6iWA>;@9
zfJ~=0v12POf~c`^l;@EUbn$3+(F7!>`ePmtbPu<OCFLKPI#43HQ-(mGw=X6;<ocJ1
zv9bBNriq~cB4lh;j+Y1Dlgt2UgA99tZh2YD;d*-vHMfj19an&Tj8!3Nxt?%YLm}~d
zcl5Mpz}gP$<t;Ap{e1|R3+H3{DcyulD?4koAbNaM=MkNNF(8mBt_NWc&Nxd7hT<^&
zNJ6B=rE+<m9ohWSB9Q5Fz-gh`>N5VLaKGj)29m#JeyzuZwrU(7dV76F^|#^W>f#Jn
zxS%Xj8~P%pMRoyfCay(xbYA%>E<&Ylp49wP%Yg~(mN&x%W1aT)wZ5j{hJvE$P?aXY
zW8qh^?p74%7W0yNU=d#wz!*^k)HyEJmPT#Ay|Nk5h6|6EmsoqnyowL}E9D29Y}9TI
zD+?erZjKdm=nk)mBs3@R^gaz;GNUI<3Ss^Nq0}?t&vu+IR&=t4>iF=H2#fn@84_X&
zmu16REYO`K_CqWGZH7^qCS)0xb2Bi|{1U`$NBR$q+;a;w_a#{fd{FPo%JRd1(c_1^
zU58ZGyX1Knx6HPV;8*e)$p&jV(ocs}H`o_dTEdk-oeqmvj#Bfqj?C*}@Imy_LB0g<
zG;E*G0<xuYcfx5ZM5=N(Ez9VH?-?I;y&o1N8LbgS^Cu`WzRfqFofiR0cp}J&y>Ob;
zrmR7{9_W!}<d5Um^0i|(TxMwq{4|!WrE_y+a87?Th&xSlPxl+^v41u*!%y{NjubKS
zfKawT2aiN16Izn1)>HwH<<G!_s?Utv3Coi3`=1L*&*?MpSE{y&V^|QV3IC<q_W!Lj
zTV4x^-Ya*=W>clL_v4c#cS^KXZ<9unixWE^s2V-tY#FLdI12sycmsE|xO&s5rf<ln
z<MsPzD}CrbVL`n&ul?0a@K}W1al;|ILKR>NAMy8aAm>~cjbi<0S=c16@l1l#58(Xg
z6m>azsuYncS@~b3{x~Xlw0QLn6sZBH4{*s7``#<fSp7iNOOHZKvCjMwh^CrpZK4p4
z!aimkR^C0@OFhm!RT45~aYY!(u}(}r&8?LtemH*<NxxF>rHcJNA0`%02pTInc@a_a
ziP1#R#T2)N&}ol=oQ4gZi`$PLv!2k}45r{pAW~R~ePZwc9bLWZws6@~2o&zZW^h-r
zwBsH>HfmyTSXo17_33_ixWJ|%d5R+PCI<%A!c^%k61v>p9;&93t%|(TS>^6er|{)k
zrW3Ro5TI9w#OZW*>O=s=a}lWR3sc;9-7ApJOoZg6t)9?Y-q(-TAFg(tEwx63(IB%(
zsIJr^oy^6zk0RdXd{3R&?7>7rV&dig<}u{fUi1PB3ah?7p|X^QMQN?07(MF<hs^4y
znLo_pYjA|^Tb6)+Td4Qk4Kum3{2y(W*TcCim_DO=P%C)hwM~X5H`l65?K4!H-;}0x
zvaq3<oho+|_%qxmjUy-a*@0Wrz_SQ3>qs3Lax4F*p%}3Rr#jglF39ch@ykqJmB+Qs
zenv?PmqJd`r!z6<GYM1Rn!HjGvrcRS0_|TY(xkhq@778k`HUSSZ4Fdu`3qEwY*g?<
z+krlw(J7pb=rlxU9TWceEj(-~_t;?{UoHRV^w4{yX$0K7Md;G&6k^_c1a{;O>}4F9
zM6vQRkAp*^F(e3<!Tl6q?9tV4Gv!s4@!sba!iA4J8!n`be@=+J!|+U*!dH000|Ogv
zQ;9zi+0y}lp%rrP^myKw_a!UPy<H1RGR*0>XS+N0|7@GhhD<c##32!Q1yCF41L&y$
zh_19|<OE-vmsV{}fYXw@w5i*j$gO`_a2u~-Kacg=uTH6$;By?YrF6e~1~%o)DiST=
zY3OiY8`j$fim^CBek~FBpsvaZN{HVTa);US>Nzb05F*A{6Ou`H=+3RwekKwGy1XDQ
zqGOhz_Blo52Z?)=>8(NJP7`SXgs&_BV5&hysDKuMg02spvd@2l3K~F|4vebmj@?h0
z*0#S|4qfY#;-(=91FOp!sFFxk>^fS$pG_PpI^ncZOz&{WrTO6TBaC%d%GKNm^l9-8
zzH0u~rqu0=3%S`2l>wIdulVSa&C8a6OcpXhmTmF}<=3uUwi#t7VY`7FG|}^@&iBt!
z3j(UOx>!3#y!~WIH`Z6}IqOh@9Ra5myAJ>j*_-Nt9+JP1VwEIN6z_|EAP>4c{<;5!
zOLT&Kf<HsH%cThswL7$LtorUmC$B0kN^zPjwZ95yTS7K@8`C~1eh;v@gj$StTg)>V
z>%C0@^quO?0^4zOx|3r1@*S!prLp>q)q~nL*-X_;SZ7+2!s6tKsYox`n~i{Ku=mkc
zsVIo!X7SqSed_7m?{6IOwqBk&6AhQ1L^o?KuRvrZyRs9|r>%b{#|XFPgXhy>JfEjH
zMe6V!wL2xGcO~nr)?>%hyD4X!XpwVm5g^d^FS&W#-Y*6cKh-3-L)D_y9oJvnI$4cM
z4he99MPf7fTAkh{GZ4o0bI~FF_QE+dokPGWrw<>da5yEHeEs*);u#-SBL7J@{`_`_
zf(Kz3+PmUY<9DXj>T-Dpt?Mp!dbaZNsVVt(+sk<7rE)-xaSc-bvOYhzE#~!$K+C>J
z+;WSbVj#-Vw2GPvGG11FgI#%LhSCt)`u7R#`V8Khc&$|inVWH%D~>>QVnahn+^+O0
z%Pk1X_z!f?a=)?gP^Ge@sB(QA3Zm@rpNW9Kyddx0EB_!+HE4nQ?qS;%!~UzXqiVp0
z=^FuWHkA9FMDyu8Qd}0pAB=xq)|c~YF(7|WEp+HM6~Ep=Sl5P*UXy;XdT)d9Fei|F
zU51*oB+LsP9eNj|`*ZY-W{NuWbx#)-DQ%d}G)|2ipH|yspQp;gb2e5qpbtOVu{EmF
z;!tSoM?vvS6ALJ?hfXU?+lr~vh;W`f6cDK~!Mdhnr%Q@bG~sx4U7o&!k-7FJNtmhG
zSCj12R_bbg4?$kp3If?Ln3M>Aby$AfVP`rgtVC$@-bQ5WHQRlo*7377Uwh|;moM-9
zX+(_yu*!u^=H1}1d|+%-_?3yjWvSL1`aj-{+H*Q<bZqOp-WfXLiDpEp*pj(5kJ@=`
zWdL2qZ)|;*8$^|Ers(`^-BGV50V8VyJh1l5|D<5UOr*zz+qNm&X5pF5<POo@=-_36
z9*bq<>cDDkv11UB(WVPC25Ql7T`Q^OGW+~i7P|4_I35<lIx`;GV92?L7YJiC-E9Py
z2a`p7##DEQ@ci~h@lan|@`uII!&*Stmk-D&x9?`%3AsvAZlPWK<A|Nj@<tEgA7tY9
zP2iGhjels1WHf^BgObH{4uqGdh$)`sXmBJkrqtu|cn;Aj;dF#b57|^d<#Bx0p%G`I
z%q|w@_JTl33!yFa{I=|Y`;H4-U>vc(DZ2xo)JH)#aHh%EyUK+Z<f90@-Zgjt0!2{D
z=E`NAurYzEq^*gHeZb7pPGV!4#T4(J+*jp?>*?*<kagU$J=@n5j(qM+A-j7YYmRY=
z9;ZY@&;l;h14c%+cXT6Y#9`lZHuyo!v+YV7vwFHX<e5e4qW@|}Nj^4R5ANgsbq{Fc
zU^MKRG20S#UN^pdnw*K`u4-mUE1TDbn!NHTS9SP9DB3&;6WV-=)YjmVdHr0O94X0G
zX1WHqhdz(%<mcXkY+`I6?!^wPrveZ0e~ZXzfS*c8BE9p6kh`Wv#;9Gjj;7=)uM37E
zIb-BpXG;FYrc?7rp64U?$-(x|Mp!Tt2bQLsnbiVp;gSVrPUe#0X8ifjMSca)W=Dg=
zYW8JSAHn0&g^!*Q5FOXwp(Og)lxqM^1r#{t=nRF7SCca%NtsH7X3&ZJEq~o{(XP8$
zMem9$rYAkommcC+6+YoY{BRTBs@SG1x7Uu929urZv@Y`6mZB;a6Fer;hV_(bRQ1W2
zW?&!ROp^)VsomrJWf9EM(Axp#SoqY4^E}N2v=IV~mF(0#GR)&bb{oD=9JpQ_7>@y)
zZiuu1SKB9%OR=p{d9=I^7n&-z&$i)up^A0rmO7?6ihHA(v8EZmXF7)%^mFcgdQC0!
zJM}&5)tBhHBP(7}$KS7LgkMRR!lrgw_02{IM!xU#m^|JYvMN3xu(q|WhB6J~LT&Qk
zou)m6^HXzlPmD_Y6S}WMdpz#Dc!f5^F!$Ip5e+VE9Ru5DvshS1Z15>B5NIioupsSl
zTJC2z%)kzs{G?V>&oT}Umuz%1ie~&oqO7?7^%2;qMy>;U(l^vpa04Q@Zz!18hNHO*
zn+#qcqYmesnpdo@{~jb0Ciq~E`O~fqzQa}r--~^le|!0v>NM2&h7#k*%_-bQuD;oN
z1{vY0yutU3seYV-{4{4s)8b|ZEO<RaS0l^tWDYZTX6(IYLaKB%28=(Om)>hHD`RNg
zh)D4yn%S`$5QPi%un9KDe$CQs9cxz(7ydeqaIUDX)523WKm2EB0&FbOx+V-cz_0hm
zyOx{Hcm@r0y+}#^UaT^aw{Qis6>`G&L9M->!VfrV<V~EqE|3<v$Kf*iaQ$>dx*q{i
zHt=pv>u^QgfWn!=Nx`M>KbO$>$@`+qr6j9)yAI@0!!$v>RB(t1W%pd`et4dMQNB~<
z3DS6%+(DoOj|DvQ8uTrb?eR5Haf4c>a|QT3^9tCdHve^-hoh>kPngH56g0xd6fL~A
z239mRE%d6WtpR=o<D?M?TstR@XBV>4wAcb%@2#P8XZO1mk8sW%ewyTO{@32a^%hs*
z<?+KPc^h}AN2DaRN_u_xR(-ie)EoV_@57lWr>8JZsaZ7w3m1$=zJG6-N@TGzYDLHJ
zPOn$g1Hk>XV4t1(sd}^!vC5FS_fwX0h1-TK!Qsj!$~SU<n+xQK_E`T8aCPv5UOTOM
z1}}$E$#c#i?PXpr7p5F;OitN%mVu#JSniX3Xf4<s@1%5C{gVDjl+(8v&=qKux`QU}
zv5L4`opgZjPET|xPl)3}gkg8Ff>E17)r&&OT=L#e;Qk%fAkZlwkwM3$n@x;_l`q&V
z#j-#-5krQ(MRP_GFfl~UtFp~+f(VoHM{NU8PC7xUaa1?Ysj#0e-(-AxrQWhN{6&?;
z#eI7Zd#<I;%sJ=&LHF59G8ydky!Ajrj~>5a;jX(sG5>R|<C-$F$ZBBrf+cUEPMG6~
zlq0jBRwI>*Kp><iP!B+Y^ajtVLv{B1*i6xC!uG8+8|Jnt%?J~gT6)6Rc83yced0Uw
zeF&LdPlgEL2HjzvKz=Rue>t5Q{~&5$Ul2EC4RWM9Sm3`58JKx)%qdRsW9OBGz!awy
zg^Mwnoz#uR)rWJQS6uA#`;N%g_?(TzZ$HSr`o4#Fk$=a-H!6<Q<4tgSR%(`o;s{#<
zRLFCK8${eF##vL)#a#=#Ri&LQ>>{!irkQCO5>>^`=Dp4t?(3Fe87rFjKD--LmysxY
zJbZBix|#p8T|R?S1K~5gc3g<0x>KXmOtxO*Bd5esKwvQ9KNfSk2n4h+&Uy4>&9n7q
z_Z{{&de~gWyVoZnw?3`)gt9Fy!(K~DN0kx}K`gcBZl%R<cy)0NHg(EoQhp;s-M(gE
z;JmS4A2Y}KWxzxLAh=>-6TNxwEiW5Sik9pBL~;}2_f@Iw&uxpe9dB)lWL48}+-=xm
z6q;ngXW*2vQ~9tS!36TEeZyb+`F2{r_@IOjDuzGKI*&@owCDAB4l{n=s+jB)rp3R0
zJMUZ3hRFSsZWWo+l$M}q8GdJj;z$YvK9sk}#t}kuueO^$G;RnddCTkGL4;m5e?#M{
z6?5&1LyU9)zNKG`8&KEPe&UGApuM;y!eX<uu%#mwLfq+mh#Y?Eq&(FHm;^JAP37m2
zO@?BpG9Kl9YMJa!9*dgO`poGz<?gSr3U4I&i;)h*u^@r$W!#?#KO!1k;5drKDJVM;
zy_<@o)S0AkNhhzTvR^YJaQB8*Z}20xzHOVS9ZWrAN1}Os+XoLWQ>!&cmPcWXAzRqN
zb9{7yC>8_~e~CYu?Ce~-ve5n@o2^)Zj63~sn34z|@%7urtMYsL$1~6P?K**&?4Ly$
z_4BK<AmC+xzKN!%p=;*NFF4dDLKv4bJ5I%BHd#W{-Qm6uEiabgR9f!Y7O_5jGLedQ
zTPpPTefYBeT^dkxT|#BDV6JP)d%tRno!~8HvVvP|7pze1V@G#f1C3+g3@sYXr@g{8
zfY#3ev_43vZFgO4+_m?U-wSqAlyyQ_%jNP-+TQyq+d*)SLv}L-i--<`4TyEI8@W=&
zo*i}C2n{h%`QUIfGENxnycikJL^k$gF<R9trOo67U58llC-v=JsKB<c`f%?wVrAXh
zTb}7sNc7P&gipo#d6ot93Y_aQ|LU5!k2RC7wwsyv`t}q=_`%le!Lv&Jd(8m5`cP&@
z6qC3Jl&W3W-}?NhikpTQAoy5gmW<8t#UHDLmZ{`Yq2I#|+wd}t*sa8Nbqjw~WV>N?
zEguU0ZlnW@?^8(Pf+Ygk8Sw9F>|Vbs;1zzU`|j_s5FfhcgHKE$R@EJh6Ji`9)a#0g
zf#H5v)IKq%5-=qnbm3hu7ka1)dO15RJkj0UA#6TVdBURV{pHyCXRKz`p*o{x`7@vp
zY+GQKc$pV-nO?+<%-M{BUFo`?+|pYs=OK@trX2yrmwcPgsFn32rl>6w{=Ef`n82-2
zA~*q@60P0zc#8b}q)*J^acO*ixV|6${^6U6n<aNSk|WD#in08>13glfRYY!`hkHH!
zpdszi(*E$i{OkRpL0lgG2Y+5~V=X&6)U>A@wq%SVpJ`Ie&O^Ub%`OFja9<#!7P9S(
zB3D!6AByBlVe=o2{EK*;L}6dH`hDfd-%BOEx7+3_u=ojvr}6WspT}04EO2cDY$UU<
z#8}L7NN^r47%}|3?D=E!R}L#MkJtID6ZAK!kt>*#5*8i%09#lZ<-AeFq2;`o>3*mC
z<+dMN`EL573eI)yJnZWQM&QRf`YVAW8biE8+SXd0_9XM8n#a(|>6wc_lAJFVvI^P1
z8hdcL9RvHEGuSn@-jf@Q!evajz(+kBen~UxOONeIXV)QJUKen)gNAxW@8WpW>0;O^
zjLRsDGeQoCVJ0B_GSwW1y0XWzF#&gNk9;vyC1}G0lx!JvUweP<=g1Y$SR0#&#>WW+
z;yktC93_RQ&$EgMcd=*{0x5FT&y5H*`WIxvCZ)U{?TJA6)=9q#4S9toJUX54X?_N7
zK=AR+5HsDRhem$$-62Ll`_Lsd2z2q<7Z1R0#FGZ0NO6yN^T_PEA7e>*+1@tiP)o+&
z_@D%T2fx<usDYr#uZKeF<MI{Mt`)R7PWi5x`xg$nj4GvZhP0CW=R9V^WaNvpE1$0w
z(dIIy+M_>34{CV8fMP9kl+G?d7P|%y>QfE+Nvjgo8l__6!CN&Hs|Z^JfO`YoDuVe}
z?d1ft;vH|V3xNw8LR)9oxm0V<JX8r0`s8*LkUC}yL8@#&T4$@vVkXdE=3KPvS>$!@
zUlJ0{(>Khyt^ik3&>H2U`wQ0eh65KozSh^94C6pUxy}J%gv&q?b8W-p8V{X2^H$Ou
zu87BA-@-PpWULQ_wrx%J2mRl>0AV;opu#}}uFTMX@J6m+(`P1YD(L94E8(le<Z9|M
z8-&f#S-TP8wr{VheGtMzBjl1;bul!gba@MZ0AA~N4HB&(nJNm^?EZMI{wQ-HNb0^o
ze8`P?$rvNrH9gt;Jj$f{!VWRONM^!iKu6?wDP?LRd}lt*c6l>(g5?<&G@wt71Nw2+
zs3_;33NmyICks41L0_+SNRef5x$S$pHiM!ZvCbfsu!l2{G2YMPudLxQ(K%!5Gh;hW
zh~f}7Wl!a8LLO(N?4kc~9qyZlFK-{QieEZNpx!JgyDTdt1((Yoh1@8~ub!z9CzHok
zY<*l}d^TTR0md*0fsFvAemOq^Y2|9ohR<${5BgU(-xc0+39!MCujiv__!x;I-$k)L
zuT?ZZ2gpH;m;%KEO=#0T#!FIAU+7rBsw1NVn7Z&dk<U9Z^ARgvk`bWH-e6JI54|Id
zLPKBoB7#rpHv%!D*+utw-5xaaGTx84PgrC0f7U9Kp4*jTlo{qK81KE#L{Hum-C;9A
zU7wEZ@;SqMI2BM5g*f2q%b+oLpqz$bBsfvVMeaG<(M~MOY@TO)_9~fP1iI+5FtwC4
z2VfZQ3Cj-<e@Tm!uzGIe6BUpA)DfWp#v@ke^3yslpGKeGZce`12a%#{7?u~bDq*YY
z)j79Wfdlb8A%Yn&6}UbM*9t|M>F$pkURhpzZ%K8)ElL9?Yx(Lun;$7tz|hl_9X997
zo+1v&5_LYzf;Pk(!J}(~;U78&z^j=v%3g6=1En5+*hb{bu)L-gA`V_l<VSC&`k;A_
zcgSLY<Z|)=>q#<20T0>}Kd1Nk@jC$i%?om>X$^GXL08$IH=F%ZTRb);$3!HFk^TV}
zRzng~r_@JQ+~;f2(sc5z)<6?kPO)$$n;K2MjR<F~C!o!AHSU36{EU&#V?LjY=w7O?
z#|J15F?}?C31FNIiCZDWwPlJ0V)%fbm$Cj}4~KkBTA@C=BTVHA9+*uv8umz!8~RX}
z6V66_s_9LG9InU3D{Lmq@(V%<_RCvYvCM5&S{jv}8OTv<)arIuy<yLfJC}e!VNO6>
z`CL9Rxj{iJIx?%i`3{(e*PPxyr0l%<?wHWsS4ipZzpJWAtnBXff!t>#RcU0I1lJER
z<5-KB5HaP-K9=O78zDnuFjP<IdB02Q$R=k|SK9LD;JT7rXVIc!Vt(KToEq6m=xrI8
zj~5d*jAy1yyjLpr;Phz>TV2DtEMO{VLGxNFu2#$*cmc&<qFelimfhsG5AZl$Vq%+v
zTckYe%^FFsFMdW}A@wX@wBy40*C9_1GKI7AOa*vz&-6+VC}l4&;k_vQ_|enSh}iq7
z?BUJKl(~T^mm!Sv&oJCQ>I$Aq^aa(#y!vy1aGo<4@(YlJJxvv9=Qs~)yv+$(PI)3D
z327*>Iq5}|D~39+sP@$DV_05RPlIch>7T4*&WUzMjp*uanQNcVRV&UEMmzipW~4Te
z*=4qV7vC$T^YKIT^$+{$1@Yki#)_mjftla?hx&bYY~&x_0GY>gEh#kapXMI8hMm+N
z)!3D}$O?wyw-gs<jm|6j_fZ;>0$fP+Q#gh8xMFtF$Fc0a!1JRlqn2fNNeGnJi(xyz
zxF_4Zf1Y>qozS@gy5D*Jo|>&d4V_cy&X1QAp{JWzxBKo^GM0GTWFQVRlA5%rxQ<x8
zYl}GCL>WAwuL)npC4W>!1sa~L9H-yYw<u*Bjg0}Sk(v6HPw60i+J^IGI5pu75Y;#H
z@o$DyvX``hjCGmkUQ1<>R-~Z8U#vwdT3NU6l6l}mw>arU4cCn|ki!JR8auqmTbM&*
zZA92a;eRkM#Ycy;vmAv_p}6JjC=3H{=u*l6O<y1VB~K3WM6TXZ@hj)QajqcVIWjxB
zQ*Rf5YO!;9HPulJxqlkG2`_^!!Kj*g%VuiA^;BTaQ%^~?%VyK<n=2xl)7FW}?NGyS
zC2Zo{1+5VaUYQurKB{}a6(r-SkJi<C5f4Zn#&sMWboE@UGE8vBCiL@1Rw;ueA>)c`
zlF+97zycfWht?o5MiEouQ@2*eLhOW->;sIWjpbPSsY$hFppY##ARzk1pyw`*U-Cm^
ze%}y-k8Fh=aL({rY5nQXx9NhWaxCnna;$MCdJa?!u3kDABFQJAmjXvlq22b&Us4#M
zI@b*SrgfK~r@_PyE|b7x>t{;Ne>bk)T8CUb{tD+JI|8umQi-hJt`M=CC~g_>pA1Bu
z)TJ@*>b7b2oMa??;=P;jH^3YdT*hJL37`7bdk5NNLd+VHGpFVWeH?{6H2k5ayNE-o
zN=xccYicJhFl9#8JOj{Usb>}{S?WB}@X~-1MfDp0QPMB%3x$h{Zi{>~6(Ii$nXVxC
zo_JO26pwIzyQZL(Y$`d@2S|o~u@Cuq+J{bZMu(WUXZ&MR^$O^cLfOnm9G4;D%thW?
zi&&<|<yIDAoBLb(Fe&a@?4~JY%B<j2qCt?;OttbizgWJ@+q1PZXb>ng>O2Q>@!h9o
zirOXPRNOi^cfP4#IkQ=Bcu9)_3}k&V)6WoCF%@-mFR_WWV>~Rs<gusA;`8$EqDx-T
zI$slF&C=iXsTeH=!%!M(kQ+%R{o-zl1YslWr6O#@R<h|LKN&Mq%YnwIh&8N_!f6Ck
zDDNjaY?ZqCrMunNKK0Pv?HA6R+;9bYYzWi*O8Y+kn~8`0+5--GYQ*ls%NUns;QSZP
z<H!Hj_lTxNB0ex6pr)nEU;~Gks>kor8qj0wnl&V8VKlo(`LBsEX8&6d5F48pVnZ}(
z{>Z?wykh*JV(Qgc!Q0B+@=+hkkAA)w440y_FEZvvS`}q8D>&&j^&66agVkLr#P;D>
z9ndDsm!;La=ATu7xO-Hb^IY-?K#)twO!;g*@S1!FR29F3MSfI>o-I}w=AYr`cHrYA
zJSG{c;?CDSQG2a@&a!_&W%w_aElM@|zE11Nc=O<_)2fHuIXV=MGm=aP1q2pnFPK;(
zGD89v?a=U)86<i`;-?y(2tD6?b%0HmZvcA5h1oSoTw2H;HcnVxGM?G{N&D2OAfEn4
z5!+PKA7`6!epp&AM=nkP?t$q~+;y`d;Q3yY0wxvfYRUj65qR0VxKaf3qV~Qv`eXM7
z5w(Qf$7)pt!U_rB`)gY2u!bS?aJ6pEd7gb(clUhO_`}`0PHCbWNJ|pp44S~w{?&cG
z3P1D9Xfn^x<LfnPP%GyiB^~@EEhkgGiBnDQZa-A8EsSS!p984dF5ItsE}AAgR~T;}
znSForT@+AqqZ+Oye)hMtW^R#?xPBK1Ni=<TSdaWAEM*aSY!*0Z0|wM)UQ45djAu*g
zlM$l?U?^ZK6DUfx(QanC_WrrKWyNfmdc|BMXTu?&wd&Mp;_47OtOnJ5v_8r96F>6B
z%t1+!XqPI*Bnp=as9t^Qr{nS({qeZ-iY5wFT{F-#A3xUep{Lu|JOxF&Kb@L6_E9!0
z1duj-#~=W;i2+}raE4;@IsHc*nzt}5`a@AyKNA<o>%Qb?iy;T~kJc2?CqczL_osVO
zjNP$sJE4K*M0~YKlwOr|SJo!V+P#W9u$3%(;SCO(oh^w2Ut`x^qrc-yLf6x-NqW~v
z!mToCuO*@DX#I}q!>&sqiE?RgP48`eYG##J9nL=vDk`f@d^|Z3G8SoeA*}TyC+?xj
z*o)jELA|gCPFbG2EKHf7&y82cd5!N|1#}rC$-WLk>9U9AoCk{llSX~`^1P0yJMy^~
z_4w_>0*A7+O2ud#>pCW`5aVhn5bv%2bXTS6XGis#5z?wGKdW9Cu)o)BEPlFi?w1?Q
zGt_&4b}X;9*Eax~9AwvUV2ZM{X)P5Vm6Gb@q!qi_6DRt|z%4;b;tdmgH3>Md)I3rA
zLTu<#6UE9kgJ1f%)!!~?#rf2kl}2Fa4Uv04RUg@F+)^>c!&PU@L}bU+9`>?HP<x_f
z46dyY5oZ9$Fb_g@?XYkhGxW8gl^Wo*JDyVvMT+S7Y-)wb9exUf2^%*^_3BB1ze)U0
z{W%r%i+9<$1dJ>JqfKxikz1ujLU87rz;9-1-pRI@Q}BmVjooYOR2=`D0<N1qIzZq@
z?9%DyIdPmBpft^>5PG_FA+?r&Nv*Pn3d?(L81^4u1XdX^RfxrBbY&e}rM&j;7zc8R
zu|ByR8%&N8XQD)dJ))m%`%n0pqskd4wzhQZYXtt3dy%tuevCh+k6+preo?{tE5YSo
zP_G9U(6sR5w1CiA5AzcEkou#7!6^IVi1)!;oFme1zWPD5h8)>kh>Q;~{Gpi6h<d3a
zAKlA#Cdxq|5a!mx3`QjagoN=4i`BGdM1|R;173&rzHBoXy@GIE1&ha{QDd>dIO89|
zT!nN-IzvZ_GwXvZMiqa!sQ_7Kn?~&eUO_k)#?w1Qp|d>=v5K9f@Wjf`$RFbsKa*fX
z6wV}>&A9d+2_m%)7KKEJHb>YPpWqLCQD==y2MUGhMrNGQ4Fnn|Ell5^w^TC_d)Q6$
zbBY=_hN#?-AX+pxubAG(W-OIf*SSZHA#0~|BU976TMB;3u5(^_i+XXcINxQdgg`r1
zqr0ncP2V?S;YUQhOjOl%g0~2dt{iTPr;EUaFVDJs;0E;_X>(oLKe|RDcKr*5*){LX
zw8yzj{?%I3yS2ZU*8dD)G{490XU(VM=ejhq0SpE@5HB;5MGXLAU)NUz{(nJWeBlV<
zfBpK3!a@jqMd2$7|Bnj3#=_TF_|J+3V_|^z#s!zwO&XJd@ACbdYwT;?1c9D>^KYW~
zpYZnQ4*v;W{JTEj|J@JxPk8@VQUG@GD=7dVd?kg2eEuIp3co8wvmnsQx`qD>uwdAK
z*ZN8j0P<f60s!GFK`i9p{}_T;Fy_B&eI*3|`LCn^fbf+R7IN^vlN5F;UMvE>;j!w~
zy_v8K`$PX@n*2840@nZfwQ=qLdI*54y}+f`|3&L!N}YYnwn=Wbigjzj?Vo}V2GMr^
HdinnV$PRYA

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/顶部切图/返回按钮1.png b/BPASmartClient.CustomResource/Image/顶部切图/返回按钮1.png
new file mode 100644
index 0000000000000000000000000000000000000000..090324dd3cc4cc8ec9b33018572373b2120c3960
GIT binary patch
literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^1wgFD!3HF=zuvzEq;7h;IEGZrd3(o^*U3=C<)S&S
zoCA|lM8eb6jO-kWjl4k-j}|TYtCd%Eo{4ep9{cr~PJP?2?`<jdSXwvz^<j=mzxm&<
zh1s)g3z4>8G>fro%~I>e5M^uog&8Z;YGRbF)dkM_YsADPorp>L@JuMVA!H--%Qp@t
z)&l4GTsAX*gfJN%J`;L8Tkq<LbyH<eT;1!optAQsG1J9woLiW8zHu-ED&_<#2I>Pb
z86MW~yL`44IKN%RW_y6a_JBQ=6XX91+?eCAY2M%Zq;u!rZ~GOg5c-NgBT8zw;r)m`
QKu<Dwy85}Sb4q9e0Q41bZ2$lO

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/顶部切图/返回按钮2.png b/BPASmartClient.CustomResource/Image/顶部切图/返回按钮2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9d430e8f9bded8e41750542f23584b49f0219a6
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^1wgFD!3HF=zuvzEq%L^6IEGZrd3)y|?;!^sm%x5k
zZoxSg!5nv6y9ACdnDZhjaFW)(Z~KL=ed;rxHtF@Rx~UuVR$j@kj&fXZ`){!AZ^a9x
zp=tKa8*Vg~%uQqudb{;Am#g>Ir;odwdFF;|#K<I_kV*Q`r+ADh=qS$;W9Exz9BhmQ
z&hi|AFu6I(c?{o`to(MXbY^4B;dGW+=Q(Vw1>U}KFrILlC&ifg;~NJP;|b@$OdW+e
zza31zH&(ox^kI(E!8uMJ_c(q0BjjvW^iTcS#+r0{u4P_-84p`aY`K+?+6wd=gQu&X
J%Q~loCIAska7O?D

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Image/顶部切图/返回按钮图标.png b/BPASmartClient.CustomResource/Image/顶部切图/返回按钮图标.png
new file mode 100644
index 0000000000000000000000000000000000000000..587dfd95ea36ee03bfc0197afc0a6e1e8e73b9cb
GIT binary patch
literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq000>P000yS1^@s6cz2e)00047Nkl<ZIE}T`
zy-J)x6vpx2nh=p7q)2O{vCxQC@dB*;Y?4b*QAlO5T){#M3794X1L_qB7K)YV4G0!d
z!A>hd+XO<;tPIS`th~OuyY2%6!_1uXpLyoY6oxmhJfdDKVd$}i52-0<t_^EA#9*y}
zpqCkAZ!n85XsIW87UUHsF^{*;k-V&6R{@`JjPE&sQcnAe6D*@U3-T2kcvr_}o6&_C
z{K86VbyM{JBTnmpqzXBwupO`9uDUkSgU`5pAh?jzS}_n4mo*UWt0>`X{6Gg5@u!O2
z|HeMXFqe!^<9*gU2?0fPVm-pE(E_&O`WKkUdyE$tM;~^o1bs{TgL#m$LTQdv2{}mm
z?N5Q!qEZs`uThW>N&mc2keQ^v+XzT8mU7SyR<nNLTJ#$I@dRT@{7)R+hm`7LRcNnl
yTO;iHA5SnEDk}^;mtEltIt!N^?jTrnH-lRk4L+qxxMA)90000<MNUMnLSTY7V6Maf

literal 0
HcmV?d00001

diff --git a/BPASmartClient.CustomResource/Themes/MyStyle.xaml b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
index 7cd4147c..159a7710 100644
--- a/BPASmartClient.CustomResource/Themes/MyStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
@@ -436,6 +436,16 @@
         </Style.Setters>
     </Style>
 
+    <Style x:Key="border界面背景" TargetType="Border">
+        <Style.Setters>
+            <Setter Property="Background">
+                <Setter.Value>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/窗体背景2.png"/>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
     <Style x:Key="border顶部标题背景" TargetType="Border">
         <Style.Setters>
             <Setter Property="Background">
@@ -747,6 +757,59 @@
             </Setter>
         </Style.Setters>
     </Style>
+    
+    <Style x:Key="CommonBtn_返回" TargetType="Button">
+        <Style.Setters>
+            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+            <Setter Property="Cursor" Value="Hand"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource foreground}"></Setter>
+            <Setter Property="Width" Value="68"></Setter>
+            <Setter Property="Height" Value="25"></Setter>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="BD" Cursor="Hand">
+                            <StackPanel Orientation="Horizontal"  HorizontalAlignment="Right" Margin="5,0,10,0">
+                                <Border Width="16" Margin="5">
+                                    <Border.Background>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮图标.png"/>
+                                    </Border.Background>
+                                </Border>
+                                <TextBlock x:Name="textBlock" VerticalAlignment="Center" FontSize="14" Text="{TemplateBinding Content}" Foreground="#4fade8" />
+                                <!--Text="{TemplateBinding Content}"-->
+                            </StackPanel>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png"/>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="False">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png"/>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="BD" Property="Background">
+                                    <Setter.Value>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png"/>
+                                    </Setter.Value>
+                                </Setter>
+                                <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
 
     <Style TargetType="Button">
         <Style.Setters>
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index c1e7ebce..ecdc5e46 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -67,7 +67,7 @@
                             <Separator/>
                             <MenuItem Header="系统设置" FontSize="12" Command="{Binding NavChangedCommand}"  CommandParameter="SystemParameterControl" />
                             <Separator/>
-                            <MenuItem Header="退出程序" FontSize="12" Visibility="Collapsed" Command="{Binding NavChangedCommand}"  CommandParameter="RealTimevideoControl"/>
+                            <MenuItem Header="退出程序" FontSize="12"  Command="{Binding NavChangedCommand}"  CommandParameter="RealTimevideoControl"/>
                         </MenuItem>
                         <MenuItem Header="系统帮助">
                             <MenuItem Header="版本更新历史" FontSize="12" Command="{Binding NavChangedCommand}"  CommandParameter="OnOffControl"/>
@@ -108,7 +108,9 @@
 
             <!--底部窗体-->
             <Grid Grid.Row="1" Margin="10">
-                <Button Grid.Row="2" Content="测试" HorizontalAlignment="Left"  Margin="153,123,0,0" VerticalAlignment="Top" Click="Button_Click"/>
+                <Button Grid.Row="2" Content="返回" Style="{DynamicResource CommonBtn_返回}" HorizontalAlignment="Left"   VerticalAlignment="Top" Click="Button_Click"/>
+
+                <Button Grid.Row="2" Visibility="Collapsed" Content="测试" HorizontalAlignment="Left"  Margin="153,123,0,0" VerticalAlignment="Top" Click="Button_Click"/>
             </Grid>