From de17f169867495d939a9a7c5509f147a1789013d Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 7 Aug 2022 04:28:18 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Resources/Images/bbwylogo.ico | Bin 4286 -> 915 bytes
 BBWY.Client/Views/Order/OrderList.xaml    |   2 --
 2 files changed, 2 deletions(-)

diff --git a/BBWY.Client/Resources/Images/bbwylogo.ico b/BBWY.Client/Resources/Images/bbwylogo.ico
index 747f9684bf3440056c15f53e5cc0efe03b78e9d7..5fb3f35cc9aaa93fe187a5c0211fbfa597d607f4 100644
GIT binary patch
literal 915
zcmV;E18n>N0096203aX$0096P0DS`h02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|AOHXW
zAP5Ek0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E000SaNLh0L01m?d
z01m?e$8V@)0009LNkl<ZSVzT{O=uHA6vs=n2!aTnym%2$da}7_QPZ8bdhr7<^&~~b
z4}=y31smIRx7O08?M<-6Pf(j~a??XSm3k;5QV;cD^=R=@skQi#G}+mSZ<=oMx|t+Z
zwrSu8vv2<Iz5mSYN9ynw*kF{wTCzGY6${pj1ZzcJ<&yB)4@3gSv0f}=u?BBHq<F!T
z?3_sG^SPv+TMtB1PfH_<4-V`gee;8bSa3Tw|D{S?2ii*vaEloVq3_^vI7@NuREYuH
znm4Khzu}|WRnnXqfcL5dKXEL0NE+AH0M`FD6K&i^8rRMM*8ceY@!?&hDJ4IsW<Xf*
zjK|qod{QP<^Odki*h$hbkQq9%pIlcqfDHw=v^G~~81jkH&ZB--rKg}KgHPAB=H|Lh
zGIy+P&lX|Au;_q{TMsF3KqSGjEq0oS3&^6F^TL}$!JF<L&EehJjoeMF+o5MkJU{Rn
zz?Iu_r9@c5lo8yDE4+xgpJ=YcN$Bt9o`iO~T6++haODeYGJwsqsi#^a5mjUsU#*xw
zS<HtovCF}Fcm8MZp}isuLN>2zK)$beTsuPqB{-&b*B%Tt(U?3Eo`4HjXT~0d6K;GW
z6xxg{pLCn&4S?DJlFG!jePl9_iLwUK%O25~EFcRxJ?u7(s}Of!nl>+Qz=9S#4#&wv
zfE&;v!n$y}-~)}zEnF_vjwZU`t=*#?qw@uwiQgAbbBXc@yx2qRsA$)h&rL-1X*%cb
zK!GqCiL(1tBX>^5SLs$z?f`{%v({V~iV4*WtiVlny`br5&s7>pMFV_5za+PoCX_t_
z4?F^$1x=KVs5FwYM}RBn@HUs!#6WHkOjYycgtZ<)L@OA;d!m8?)l<*~e^g@0{}`ye
z1OI5CCPyF)_FE;E_`U<T6kkJpt9@39CBE-KM4u=1@`G%D)0J{Jq2C6u-b+%C6prZQ
zWfFWfkQ#u4q+YS`Vjt`lo!YR7z?|rW6rS~x#4%xv>VyGb-8l+3i+{O!KZHq*G>(5@
p-SKpv#%L{M)x}1j4AzLcz+ZMandohh>k$9|002ovPDHLkV1o7)o7eyV

literal 4286
zcmeI0J!lj`6vrnT)Ix|w5Rsr)h=_$)+r+}c!XkxOT3A?V8@<`n%ppO&nG+Kc34Vbf
zet?Bq1hKIV*j%AvL?Q-}2yzA`mylha|95wr+g;}N_H>stH^<wXn|bqoZ{EzinL8o+
z@XF-`KgHv1LTnd8?1P|59ENavy`ZmGdJ*U*0#qpN@ud0SIfeqVNUF5MW`_zo2fcRz
zT^{$F&RyAM)9=*gIr>b*R>KdeA9_+3qvA^Q+@?=?bG#GF)(`vVZT7ltbEQ6Evme(6
z_9*7R+AYhfk9d(%8{&9=AN01kj<&|pYCF6)g8L*?$J$KO*~v{lr`<dBUjGj#cC6Ho
z+HtwvE$CCR;}gy`&W7ullQtiCeUNM4<Hn}cSEbWa{ZSvt(IY9@53Re+Ch~E_=aVvn
zlrJB{+&|iMGij6hiO)x#RWo74@0AMkIUm-6&FfQLSH3iqgkQP;lE&s%srY$?W^X<1
zxUUk&5_wkVE7jj_Ol|CXo$bsMv5e0y5pp*bA7E#O`CM?u9)%A$%fkErN9j(T>+_wj
zL`!NS6}~6S7aR1}lh0`Quo8?%>HXrG54UILQ(_xJzVB_3TQ#sR2l;=BH|XtyX{y|N
zLABK8Ztk{-;Tox%TM>ikeJ7oHH}=jq%1;i4so_uLT-ymB7J_j|ss0n+yZqB2w($86
z{#;7TX6*C=*!yF_%}(4QkEF@Qed1X+_fK-lhyIz*`6JCIFkit&fi9E}CYf_o2V=)!
zr?%z?pHb3G(CF2nsBTuD`D}v!2a?_!v+|>7H@gT>v|L&qCM6mo#BNuJfn^~!v-}cb
fBg+^3rJyYGrrFOrtj}X1Y-89JedG>AVMKocAF~)o

diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index db9382e8..5161349b 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -279,8 +279,6 @@
                     <TextBlock Text="利润信息" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock x:Name="txtwuliu" Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"
                                Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}"/>
-                    <TextBlock x:Name="txtshouhou" Text="售后信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"
-                               Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"/>
                     <TextBlock Text="订单状态" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="备注信息" Grid.Column="7"  Style="{StaticResource middleTextBlock}"/>