From da9c633e3dae3d9bf25d80edbeca01d65345dfec Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Thu, 2 Nov 2023 14:43:17 +0800 Subject: [PATCH] =?UTF-8?q?10195.=E6=96=B0=E5=A2=9E=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E8=87=AA=E6=89=93=E5=8C=85=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 2 +- BBWY.Client/GlobalContext.cs | 2 +- .../ViewModels/PackTask/WareHouseListViewModel.cs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 990851d2..459b5020 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -72,7 +72,7 @@ namespace BBWY.Client //齐越琳琳 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U"; + //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY4NDI2OTQyNTY0NTM2MzIwIiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNzE4NTQxMDYzMzk3ODM4ODQ4LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MzAyODcxNjh9.6vXadZWQfhnxbR3320RloKv3LqqbNdZ7wDDfO3tY_5U"; #else //var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty; //if (string.IsNullOrEmpty(uid)) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index 6ea5dee6..fee5720c 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10194"; + ClientVersion = "10195"; } diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs index 1c10ffc3..f7cfd837 100644 --- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs @@ -963,11 +963,11 @@ namespace BBWY.Client.ViewModels.PackTask { var model = (PackTaskModel)obj; - if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.AllFees == 0) - { - System.Windows.MessageBox.Show("请先设置打包费用!"); - return; - } + //if (model == null || model.FeesItemResponse == null || model.FeesItemResponse.AllFees == 0) + //{ + // System.Windows.MessageBox.Show("请先设置打包费用!"); + // return; + //} //if (System.Windows.MessageBox.Show("是否完成打包?", "提示", // MessageBoxButton.YesNo, // MessageBoxImage.Warning) != MessageBoxResult.Yes)