diff --git a/PackagingMallShipper/ViewModels/OrderListViewModel.cs b/PackagingMallShipper/ViewModels/OrderListViewModel.cs index 9a3da29..8c1e606 100644 --- a/PackagingMallShipper/ViewModels/OrderListViewModel.cs +++ b/PackagingMallShipper/ViewModels/OrderListViewModel.cs @@ -250,7 +250,7 @@ namespace PackagingMallShipper.ViewModels } [RelayCommand] - private async Task BatchShipSelectedAsync() + private void BatchShipSelected() { var selectedOrders = Orders.Where(o => o.IsSelected && o.Status == 1).ToList(); if (!selectedOrders.Any()) diff --git a/PackagingMallShipper/Views/LoginWindow.xaml b/PackagingMallShipper/Views/LoginWindow.xaml index 97084bd..750c6c2 100644 --- a/PackagingMallShipper/Views/LoginWindow.xaml +++ b/PackagingMallShipper/Views/LoginWindow.xaml @@ -5,9 +5,11 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" Title="包装商城发货助手 - 登录" - Height="480" Width="350" + Height="500" Width="350" + MinHeight="400" MinWidth="300" + MaxHeight="600" MaxWidth="500" WindowStartupLocation="CenterScreen" - ResizeMode="NoResize" + ResizeMode="CanResizeWithGrip" Background="#F5F5F5">