diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 30900361..c1d660c5 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -31,8 +31,10 @@ namespace BBWY.Client var gl = new GlobalContext(); string userToken = string.Empty; #if DEBUG + //齐越小戴 + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNjg0MDk4MTYyNjg4IiwidGVhbUlkIjoiMTQzOTg5ODY0MDU0OTE1NDgxNiIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQ0OTQ1MDZ9.LxA_vc_YyXxgQjSQi4XVg2B-fdvAz3mIT0Bgg3Uuul8"; //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDE1OTMxMjU4NjEzMDEwNDMyIiwidGVhbUlkIjoiMTQxNDkzNTcwNDQ2MjQzMDIwOCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQxMDY1MjV9.XeMruS0YkwI7B6nODGe-vbdUqA_PSAt4EacfRAHIjV0"; //齐越文魁 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTY4NjQ4MjU0M30.emnQNDcbqnuO2jH0Kgfk2Ui7crrwzRb986Sa511iS-U"; //齐越小一 + //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTY4NjQ4MjU0M30.emnQNDcbqnuO2jH0Kgfk2Ui7crrwzRb986Sa511iS-U"; //齐越小一 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA1OTcyOTk3ODUzMTg0IiwidGVhbUlkIjoiMTQzOTkwNDA1MDc3NzY5MDExMiIsImV4cCI6MTY4NjQxODcyOH0.K7-MXjt_zfNK5v_08VjmCDnhAGF6SI7sEQr5sgDn7Jk"; //齐越珍珍 diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index fdf2d5cc..3c276cee 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -185,33 +185,8 @@ namespace BBWY.Client.ViewModels ChooseShop(departmentList[0].ShopList[0], true); return; } - //var shopListResponse = mdsApiService.GetShopsByUserTeam(GlobalContext.User.Id); - //if (!shopListResponse.Success) - // throw new Exception(shopListResponse.Msg); - //if (shopListResponse.Data == null || shopListResponse.Data.Count == 0) - // throw new Exception("未绑定店铺"); - //var shopList = shopListResponse.Data.Map>(); - //if (shopList.Count == 1) - //{ - // ShowShopChoosePanel = false; - // ChooseShop(shopList[0], true); - // return; - //} - //else - //{ - // ShowShopChoosePanel = true; - // departmentList = new List(); - // foreach (var shop in shopList) - // { - // var department = departmentList.FirstOrDefault(d => d.Id == shop.TeamId); - // if (department == null) - // { - // department = new Department() { Id = shop.TeamId, Name = shop.TeamName }; - // departmentList.Add(department); - // } - // department.ShopList.Add(shop); - // } - //} + else + ShowShopChoosePanel = true; } else { diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml index 02e81d7d..ed9f50b6 100644 --- a/BBWY.Client/Views/MainWindow.xaml +++ b/BBWY.Client/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - +