合并

BBWY.Client/BBWYAppSettings.json

@@ -4,6 +4,6 @@
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  "QKApiHost": "http://localhost:8080"
-  //"QKApiHost": "http://qiku.qiyue666.com"
+  //"QKApiHost": "http://localhost:8080"
+  "QKApiHost": "http://qiku.qiyue666.com"
 }

BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs

@@ -77,7 +77,8 @@ namespace BBWY.Client.ViewModels.PackTask
         public PackTaskTotalViewModel(PackTaskService packTaskService)
         {
             this.packTaskService = packTaskService;
-
+            EndDate = DateTime.Now;
+            StartDate = DateTime.Now.Date;
 
             SearchTaskTotalCommand = new RelayCommand(SearchTaskTotal);
 
@@ -112,6 +113,8 @@ namespace BBWY.Client.ViewModels.PackTask
             BatchSettleCommand = new RelayCommand(BatchSettle);
             SettleCommand = new RelayCommand<long>(SettleTask);
             ExportCommand = new RelayCommand(Export);
+
+            SearchTaskTotal();
         }
 
         private void Export()

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.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10095" Margin="5,0,0,0"/>
+                <TextBlock Text="v10096" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Client/Views/PackTask/PackTaskTotal.xaml

@@ -238,7 +238,13 @@
                                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                                         </Grid>
                                         <Grid Grid.Column="7" Margin="0 0 1 0">
-                                            <TextBlock  Text="{Binding SkuName}" Style="{StaticResource middleTextBlock}"/>
+                                            <TextBlock  Text="{Binding SkuName}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis">
+                                                <TextBlock.ToolTip>
+                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                        <TextBlock Text="{Binding SkuName}"/>
+                                                    </ToolTip>
+                                                </TextBlock.ToolTip>
+                                                </TextBlock>
                                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                                         </Grid>
                                         <Grid Grid.Column="8" Margin="0 0 1 0">
@@ -270,7 +276,13 @@
                                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                                         </Grid>
                                         <Grid Grid.Column="15" Margin="0 0 1 0">
-                                            <TextBlock  Text="{Binding MarkMessage}" Style="{StaticResource middleTextBlock}"/>
+                                            <TextBlock  Text="{Binding MarkMessage}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis">
+                                                <TextBlock.ToolTip>
+                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                        <TextBlock Text="{Binding MarkMessage}"/>
+                                                    </ToolTip>
+                                                </TextBlock.ToolTip>
+                                                </TextBlock>
                                             <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                                         </Grid>