Browse Source

10036

qianyi
shanji 3 years ago
parent
commit
d1228598d4
  1. 2
      BBWY.Client/Views/MainWindow.xaml
  2. 2
      BBWY.Client/Views/Order/OrderList.xaml

2
BBWY.Client/Views/MainWindow.xaml

@ -26,7 +26,7 @@
<!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/> <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>--> <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/> <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10035" Margin="5,0,0,0"/> <TextBlock Text="v10036" Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

2
BBWY.Client/Views/Order/OrderList.xaml

@ -166,7 +166,7 @@
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchContactName}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/> <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchContactName}" WaterRemark="精确匹配" Visibility="{Binding Visibility,ElementName=listbox_order}"/>
<c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000" <c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"
Visibility="{Binding Visibility,ElementName=listbox_order}"> Visibility="Collapsed">
<c:BButton.ToolTip> <c:BButton.ToolTip>
<StackPanel> <StackPanel>
<TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/> <TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/>

Loading…
Cancel
Save