zhou.xiaoning 4 anni fa
parent
commit
5006df013b

+ 9 - 8
Muchinfo.MTPClient/Fx4.0/Main/03.UI/Modules/Muchinfo.TASClient.Trade/ViewModels/ERMCP/HedgingEntrustViewModel.cs

@@ -52,22 +52,23 @@ namespace Muchinfo.MTPClient.Trade.ViewModels.ERMCP
                 //_canUseSell = true;
                 //RaisePropertyChanged(() => CanUseSell);
 
-                SellBackGroundBrush = new SolidColorBrush(Color.FromRgb(100, 100, 100));
-                CanUseSell = false;
+                SellBackGroundBrush = Brushes.Green;
+                CanUseSell = true;
 
-                BuyBackGroundBrush = Brushes.Red;
-                CanUseBuy = true;
+                BuyBackGroundBrush = new SolidColorBrush(Color.FromRgb(100, 100, 100));
+                CanUseBuy = false;
             }
             else
             {
                 //_canUseBuy = true;
                 //RaisePropertyChanged(() => CanUseBuy);
 
-                SellBackGroundBrush = Brushes.Green;
-                CanUseSell = true;
+                SellBackGroundBrush = new SolidColorBrush(Color.FromRgb(100, 100, 100));
+                CanUseSell = false;
 
-                BuyBackGroundBrush = new SolidColorBrush(Color.FromRgb(100, 100, 100));
-                CanUseBuy = false;
+                
+                BuyBackGroundBrush = Brushes.Red;
+                CanUseBuy = true;
             }
 
             _spotcontractID = spotcontractID;

+ 4 - 4
Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient/Config/Config.xml

@@ -11,11 +11,11 @@
     <!--<ErmcpAddress>http://103.40.249.123:8280/cfg?key=mtp_20</ErmcpAddress>
     <ErmcpWebUrl>http://103.40.249.123:8090/#/platinum_pick_query/tab</ErmcpWebUrl>-->
     <!-- 风管云平台服务地址 - 平安 -->
-    <ErmcpAddress>http://103.40.249.124:38280/cfg?key=mtp_20</ErmcpAddress>
-    <ErmcpWebUrl>http://103.40.249.124:39100/#/custom_info/custom_info_normal</ErmcpWebUrl>
+    <!--<ErmcpAddress>http://103.40.249.124:38280/cfg?key=mtp_20</ErmcpAddress>
+    <ErmcpWebUrl>http://103.40.249.124:39100/#/custom_info/custom_info_normal</ErmcpWebUrl>-->
     <!-- 风管云平台服务地址 - 测试 -->
-    <!--<ErmcpAddress>http://192.168.31.93:8080/cfg?key=test_93</ErmcpAddress>
-    <ErmcpWebUrl>http://192.168.31.93:5019/webpc/#/custom_info/custom_info_normal</ErmcpWebUrl>-->
+    <ErmcpAddress>http://192.168.31.93:8080/cfg?key=test_93</ErmcpAddress>
+    <ErmcpWebUrl>http://192.168.31.93:5035/webpc/#/custom_info/custom_info_normal</ErmcpWebUrl>
     
 
     <!--应用程序升级地址-->

+ 2 - 2
Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient/Properties/AssemblyInfo.cs

@@ -50,6 +50,6 @@ using System.Windows;
 // 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("10.0.0.20")]
-[assembly: AssemblyFileVersion("10.0.0.20")]
+[assembly: AssemblyVersion("10.0.0.21")]
+[assembly: AssemblyFileVersion("10.0.0.21")]