处理冲突

BBWY.Client/APIServices/BaseApiService.cs

@@ -35,7 +35,7 @@ namespace BBWY.Client.APIServices
                 if (!headers.ContainsKey("ClientCode"))
                     headers.Add("ClientCode", "BBWY");
                 if (!headers.ContainsKey("ClientVersion"))
-                    headers.Add("ClientVersion", "1.0.0.0");
+                    headers.Add("ClientVersion", globalContext.ClientVersion);
                 if (!headers.ContainsKey("Authorization") && !string.IsNullOrEmpty(globalContext.UserToken))
                     headers.Add("Authorization", $"Bearer {globalContext.UserToken}");
                 if (!headers.ContainsKey("qy"))

BBWY.Client/GlobalContext.cs

@@ -9,6 +9,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
+            ClientVersion = "10112";
         }
 
         private User user;
@@ -23,6 +24,8 @@ namespace BBWY.Client
 
         public IList<string> ShopServiceGroupLowerList { get; set; }
 
+        public string ClientVersion { get; set; }
+
         /// <summary>
         /// JD客户端
         /// </summary>

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="v10111" Margin="5,0,0,0"/>
+                <TextBlock Text="{Binding GlobalContext.ClientVersion}" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">