From 1a6d905ed3cc0ac5052ba0c4832b20cbdf7e09d2 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sat, 11 Jun 2022 13:09:59 +0800
Subject: [PATCH] 1

---
 BBWY.Client/App.xaml.cs                                   | 4 +++-
 BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs | 2 +-
 BBWY.Client/Views/MainWindow.xaml                         | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index 40d6a32b..3e443232 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -30,9 +30,11 @@ namespace BBWY.Client
             var gl = new GlobalContext();
             string userToken = string.Empty;
 #if DEBUG
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY4MjU3NzUzNn0.76Ll9syp3R21VD01NxpHmcs7TyBKzqeob3i5avpLv-E";  //齐越小一
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA3NDY1MDMzNDIwODAwIiwidGVhbUlkIjoiMTQzNjI4ODUwMDIzNTI0MzUyMCIsImV4cCI6MTY4MjU3NzUzNn0.76Ll9syp3R21VD01NxpHmcs7TyBKzqeob3i5avpLv-E";  //齐越小一
 
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA1OTcyOTk3ODUzMTg0IiwidGVhbUlkIjoiMTQzOTkwNDA1MDc3NzY5MDExMiIsImV4cCI6MTY4NjQxODcyOH0.K7-MXjt_zfNK5v_08VjmCDnhAGF6SI7sEQr5sgDn7Jk"; //齐越珍珍
+
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTE0NjczMzA5NzQ5MjQ4IiwidGVhbUlkIjoiMTQ0ODY4MTU0NDE4ODE3MDI0MCIsImV4cCI6MTY4NjQ1OTY0Mn0.4yCbZxOtogD0N868-YgySR5A-16VNnrp8fC13VCRs20"; //齐越耐克
             
 #else
             var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;
diff --git a/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs b/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs
index 3786154c..2e230f95 100644
--- a/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs
@@ -8,7 +8,7 @@ namespace BBWY.Client.Models
 
         public Platform PlatformId { get; set; }
 
-        public long ShopId { get; set; }
+        public long? ShopId { get; set; }
 
         public string ShopName { get; set; }
 
diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 4fffc59f..b7bddebe 100644
--- a/BBWY.Client/Views/MainWindow.xaml
+++ b/BBWY.Client/Views/MainWindow.xaml
@@ -9,7 +9,7 @@
            DataContext="{Binding Main,Source={StaticResource Locator}}"
            mc:Ignorable="d"
            Style="{StaticResource bwstyle}"
-           Title="{Binding GlobalContext.User.Shop.Name,StringFormat=步步为盈 \{0\}}" Height="450" Width="800">
+           Title="{Binding GlobalContext.User.Shop.ShopName,StringFormat=步步为盈 \{0\}}" Height="450" Width="800">
     <b:Interaction.Triggers>
         <b:EventTrigger EventName="Closing">
             <b:InvokeCommandAction Command="{Binding ClosingCommand}" PassEventArgsToCommand="True"/>
@@ -25,7 +25,7 @@
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <!--<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.Name}"  Margin="5,0,0,0"/>
+                <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
                 <TextBlock Text="v10019" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>