调整显示问题

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -178,8 +178,8 @@ namespace MySystem.Areas.Admin.Controllers
                 // if (IsFirst == 0) dic["IsFirst"] = "否";
                 // if (IsFirst == 1) dic["IsFirst"] = "是";
 
-                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
-                dic["PosIsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
+                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
+                dic["PosIsFirst"] = int.Parse(dic["IsFirst"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
 
                 //循环开始时间
                 if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -201,8 +201,8 @@ namespace MySystem.Areas.Admin.Controllers
                 // if (IsFirst == 0) dic["IsFirst"] = "否";
                 // if (IsFirst == 1) dic["IsFirst"] = "是";
 
-                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
-                dic["PosIsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
+                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
+                dic["PosIsFirst"] = int.Parse(dic["IsFirst"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
 
                 //实际押金
                 string SeoKeyword = dic["SeoKeyword"].ToString();

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5152,8 +5152,8 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     var info = "";
                     var IsFirst = "";//是否首台机具
-                    IsFirst += pos.IsFirst == 1 ? "首台(服务费领取)" + "\n" : "非首台(服务费领取)" + "\n";
-                    IsFirst += pos.FirstFlag == 1 ? "首台(机具奖励发放)" + "\n" : "非首台(机具奖励发放)" + "\n";
+                    IsFirst += pos.FirstFlag == 1 ? "首台(服务费领取)" + "\n" : "非首台(服务费领取)" + "\n";
+                    IsFirst += pos.IsFirst == 1 ? "首台(机具奖励发放)" + "\n" : "非首台(机具奖励发放)" + "\n";
                     if (function.CheckNull(mer.MerIdcardNo).Contains("*") || function.CheckNull(mer.MerchantMobile).Contains("*") || function.CheckNull(mer.MerRealName).Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
                     {
                         info = "机具" + PosSn + "所对应的商户未认证";