10007

BBWYB.Client/Views/MainWindow.xaml

@@ -24,7 +24,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10006" Margin="5,0,0,0"/>
+                <TextBlock Text="v10007" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWYB.Client/Views/Order/OrderList.xaml

@@ -671,7 +671,8 @@
                                     </Grid>
 
                                     <StackPanel Orientation="Vertical" Grid.Column="5" Margin="5,5,5,0">
-                                        <StackPanel x:Name="sp_buyerRemark">
+                                        <StackPanel x:Name="sp_buyerRemark"
+                                                    Visibility="{Binding BuyerRemark,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}">
                                             <StackPanel Orientation="Horizontal">
                                                 <TextBlock Text="买家备注"/>
                                                 <c:BButton Content="复制" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
@@ -681,7 +682,7 @@
                                             <TextBlock Text="{Binding BuyerRemark}" TextWrapping="Wrap"/>
                                         </StackPanel>
 
-                                        <StackPanel x:Name="sp_venderRemark" Margin="0,5,0,0">
+                                        <!--<StackPanel x:Name="sp_venderRemark" Margin="0,5,0,0">
                                             <StackPanel Orientation="Horizontal">
                                                 <TextBlock Text="商家备注"/>
                                                 <c:BButton x:Name="btn_copyVenderRemark" Content="复制" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
@@ -691,18 +692,12 @@
                                                        Command="{Binding DataContext.EditVenderRemarkCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
                                                        CommandParameter="{Binding }"/>
                                             </StackPanel>
-                                        </StackPanel>
+                                        </StackPanel>-->
                                     </StackPanel>
                                 </Grid>
                                 <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
                             </Grid>
                             <DataTemplate.Triggers>
-                                <DataTrigger Binding="{Binding BuyerRemark}" Value="">
-                                    <Setter TargetName="sp_buyerRemark" Property="Visibility" Value="Collapsed"/>
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding VenderRemark}" Value="">
-                                    <Setter TargetName="btn_copyVenderRemark" Property="Visibility" Value="Collapsed"/>
-                                </DataTrigger>
                                 <DataTrigger Binding="{Binding OrderState}" Value="已取消">
                                     <Setter TargetName="btn_orderState" Property="Background" Value="#EC808D"/>
                                 </DataTrigger>