Преглед изворни кода

修改文字:购机券 -》兑换券,购买机 -》兑换机

lcl пре 3 година
родитељ
комит
67464e71b6
38 измењених фајлова са 92 додато и 92 уклоњено
  1. 16 16
      .vscode/maindb.code-snippets
  2. 2 2
      Areas/Admin/Controllers/MainServer/ActiveRewardController.cs
  3. 2 2
      Areas/Admin/Controllers/MainServer/KqProductRuleSetController.cs
  4. 4 4
      Areas/Admin/Controllers/MainServer/MachineRenewController.cs
  5. 2 2
      Areas/Admin/Controllers/MainServer/OpenRewardDetailController.cs
  6. 3 3
      Areas/Admin/Controllers/MainServer/OpenSnSnapshotController.cs
  7. 4 4
      Areas/Admin/Controllers/MainServer/OrdersController.cs
  8. 2 2
      Areas/Admin/Controllers/MainServer/PosMachinesController.cs
  9. 2 2
      Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs
  10. 3 3
      Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs
  11. 3 3
      Areas/Admin/Controllers/MainServer/PosMerchantInfoController.cs
  12. 4 4
      Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs
  13. 2 2
      Areas/Admin/Controllers/MainServer/StoreChangeHistoryController.cs
  14. 2 2
      Areas/Admin/Controllers/MainServer/StoreSwapSnController.cs
  15. 5 5
      Areas/Admin/Controllers/MainServer/SysToolsController.cs
  16. 1 1
      Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs
  17. 1 1
      Areas/Admin/Controllers/MainServer/UserMallLargeSnController.cs
  18. 4 4
      Areas/Admin/Controllers/MainServer/UserSnActInfoController.cs
  19. 2 2
      Areas/Admin/Controllers/MainServer/UserSnDelayChangeController.cs
  20. 2 2
      Areas/Admin/Controllers/MainServer/UserStoreChangeController.cs
  21. 2 2
      Areas/Admin/Controllers/MainServer/UserSwapDetailController.cs
  22. 1 1
      Areas/Admin/Views/MainServer/ActiveReward/Index.cshtml
  23. 2 2
      Areas/Admin/Views/MainServer/KqProductRuleSet/Add.cshtml
  24. 2 2
      Areas/Admin/Views/MainServer/KqProductRuleSet/Edit.cshtml
  25. 2 2
      Areas/Admin/Views/MainServer/MachineRenew/Add.cshtml
  26. 1 1
      Areas/Admin/Views/MainServer/MachineRenew/Index.cshtml
  27. 1 1
      Areas/Admin/Views/MainServer/OpenSnSnapshot/Index.cshtml
  28. 1 1
      Areas/Admin/Views/MainServer/PosMachinesTwo/Edit.cshtml
  29. 1 1
      Areas/Admin/Views/MainServer/PosMachinesTwoChange/Edit.cshtml
  30. 1 1
      Areas/Admin/Views/MainServer/StoreChangeHistory/Index.cshtml
  31. 1 1
      Areas/Admin/Views/MainServer/StoreSwapSn/Index.cshtml
  32. 1 1
      Areas/Admin/Views/MainServer/UserMallLargeSn/Index.cshtml
  33. 1 1
      Areas/Admin/Views/MainServer/UserSnActInfo/Index.cshtml
  34. 2 2
      Areas/Admin/Views/MainServer/UserSnDelayChange/Index.cshtml
  35. 1 1
      Areas/Admin/Views/MainServer/UserSwapDetail/Index.cshtml
  36. 1 1
      wwwroot/layuiadmin/modules_main/KqProductRuleSet_Admin.js
  37. 3 3
      wwwroot/layuiadmin/modules_main/Main_Admin.js
  38. 2 2
      wwwroot/layuiadmin/modules_main/OpenSnSnapshot_Admin.js

+ 16 - 16
.vscode/maindb.code-snippets

@@ -2225,7 +2225,7 @@
 "	DateTime PullNewStartDate = $3.PullNewStartDate; //活动开始时间",
 "	DateTime PullNewEndDate = $3.PullNewEndDate; //活动结束时间",
 "	int PullNewExtendDays = $3.PullNewExtendDays; //延长领机天数",
-"	decimal BigTotalAmount = $3.BigTotalAmount; //购买机起始价",
+"	decimal BigTotalAmount = $3.BigTotalAmount; //兑换机起始价",
 "	int BigExtendCycleDays = $3.BigExtendCycleDays; //延长循环周期天数",
 "	DateTime SubsidyStartDate = $3.SubsidyStartDate; //活动开始时间",
 "	DateTime SubsidyEndDate = $3.SubsidyEndDate; //活动结束时间",
@@ -2287,7 +2287,7 @@
 "	DateTime PullNewStartDate = $1.PullNewStartDate; //活动开始时间",
 "	DateTime PullNewEndDate = $1.PullNewEndDate; //活动结束时间",
 "	int PullNewExtendDays = $1.PullNewExtendDays; //延长领机天数",
-"	decimal BigTotalAmount = $1.BigTotalAmount; //购买机起始价",
+"	decimal BigTotalAmount = $1.BigTotalAmount; //兑换机起始价",
 "	int BigExtendCycleDays = $1.BigExtendCycleDays; //延长循环周期天数",
 "	DateTime SubsidyStartDate = $1.SubsidyStartDate; //活动开始时间",
 "	DateTime SubsidyEndDate = $1.SubsidyEndDate; //活动结束时间",
@@ -2343,7 +2343,7 @@
 "	$1.PullNewStartDate = $28; //活动开始时间",
 "	$1.PullNewEndDate = $29; //活动结束时间",
 "	$1.PullNewExtendDays = $30; //延长领机天数",
-"	$1.BigTotalAmount = $31; //购买机起始价",
+"	$1.BigTotalAmount = $31; //兑换机起始价",
 "	$1.BigExtendCycleDays = $32; //延长循环周期天数",
 "	$1.SubsidyStartDate = $33; //活动开始时间",
 "	$1.SubsidyEndDate = $34; //活动结束时间",
@@ -2406,7 +2406,7 @@
 "	PullNewStartDate = $27, //活动开始时间",
 "	PullNewEndDate = $28, //活动结束时间",
 "	PullNewExtendDays = $29, //延长领机天数",
-"	BigTotalAmount = $30, //购买机起始价",
+"	BigTotalAmount = $30, //兑换机起始价",
 "	BigExtendCycleDays = $31, //延长循环周期天数",
 "	SubsidyStartDate = $32, //活动开始时间",
 "	SubsidyEndDate = $33, //活动结束时间",
@@ -4914,8 +4914,8 @@
 "	string RewardDesc = $3.RewardDesc; //奖励描述",
 "	string Remark = $3.Remark; //备注",
 "	string OpenDetailRec = $3.OpenDetailRec; //明细单号",
-"	int BuySnNum = $3.BuySnNum; //购买机数量",
-"	int StdBuySnNum = $3.StdBuySnNum; //标准购买机数量",
+"	int BuySnNum = $3.BuySnNum; //兑换机数量",
+"	int StdBuySnNum = $3.StdBuySnNum; //标准兑换机数量",
 "	decimal RewardAmount = $3.RewardAmount; //奖励金额",
 "	string FailReason = $3.FailReason; //失败原因",
 "	string UserNav = $3.UserNav; //创客路径",
@@ -4958,8 +4958,8 @@
 "	string RewardDesc = $1.RewardDesc; //奖励描述",
 "	string Remark = $1.Remark; //备注",
 "	string OpenDetailRec = $1.OpenDetailRec; //明细单号",
-"	int BuySnNum = $1.BuySnNum; //购买机数量",
-"	int StdBuySnNum = $1.StdBuySnNum; //标准购买机数量",
+"	int BuySnNum = $1.BuySnNum; //兑换机数量",
+"	int StdBuySnNum = $1.StdBuySnNum; //标准兑换机数量",
 "	decimal RewardAmount = $1.RewardAmount; //奖励金额",
 "	string FailReason = $1.FailReason; //失败原因",
 "	string UserNav = $1.UserNav; //创客路径",
@@ -4996,8 +4996,8 @@
 "	$1.RewardDesc = $22; //奖励描述",
 "	$1.Remark = $23; //备注",
 "	$1.OpenDetailRec = $24; //明细单号",
-"	$1.BuySnNum = $25; //购买机数量",
-"	$1.StdBuySnNum = $26; //标准购买机数量",
+"	$1.BuySnNum = $25; //兑换机数量",
+"	$1.StdBuySnNum = $26; //标准兑换机数量",
 "	$1.RewardAmount = $27; //奖励金额",
 "	$1.FailReason = $28; //失败原因",
 "	$1.UserNav = $29; //创客路径",
@@ -5041,8 +5041,8 @@
 "	RewardDesc = $21, //奖励描述",
 "	Remark = $22, //备注",
 "	OpenDetailRec = $23, //明细单号",
-"	BuySnNum = $24, //购买机数量",
-"	StdBuySnNum = $25, //标准购买机数量",
+"	BuySnNum = $24, //兑换机数量",
+"	StdBuySnNum = $25, //标准兑换机数量",
 "	RewardAmount = $26, //奖励金额",
 "	FailReason = $27, //失败原因",
 "	UserNav = $28, //创客路径",
@@ -15269,7 +15269,7 @@
 "	decimal DebitNotCapTradeAmt = $3.DebitNotCapTradeAmt; //商户非封顶借记卡交易总金额",
 "	decimal DebitCapTradeAmt = $3.DebitCapTradeAmt; //商户借记卡封顶交易总额",
 "	int DebitCapTradeNum = $3.DebitCapTradeNum; //商户借记卡封顶交易总笔数",
-"	int MallPosOrderStatus = $3.MallPosOrderStatus; //商城购买机具状态",
+"	int MallPosOrderStatus = $3.MallPosOrderStatus; //商城兑换机具状态",
 "	int ActiveBuddyMerStatus = $3.ActiveBuddyMerStatus; //激活创客同名商户",
 "	string Remark = $3.Remark; //备注",
 "}"
@@ -15296,7 +15296,7 @@
 "	decimal DebitNotCapTradeAmt = $1.DebitNotCapTradeAmt; //商户非封顶借记卡交易总金额",
 "	decimal DebitCapTradeAmt = $1.DebitCapTradeAmt; //商户借记卡封顶交易总额",
 "	int DebitCapTradeNum = $1.DebitCapTradeNum; //商户借记卡封顶交易总笔数",
-"	int MallPosOrderStatus = $1.MallPosOrderStatus; //商城购买机具状态",
+"	int MallPosOrderStatus = $1.MallPosOrderStatus; //商城兑换机具状态",
 "	int ActiveBuddyMerStatus = $1.ActiveBuddyMerStatus; //激活创客同名商户",
 "	string Remark = $1.Remark; //备注",
 "}"
@@ -15317,7 +15317,7 @@
 "	$1.DebitNotCapTradeAmt = $8; //商户非封顶借记卡交易总金额",
 "	$1.DebitCapTradeAmt = $9; //商户借记卡封顶交易总额",
 "	$1.DebitCapTradeNum = $10; //商户借记卡封顶交易总笔数",
-"	$1.MallPosOrderStatus = $11; //商城购买机具状态",
+"	$1.MallPosOrderStatus = $11; //商城兑换机具状态",
 "	$1.ActiveBuddyMerStatus = $12; //激活创客同名商户",
 "	$1.Remark = $13; //备注",
 "}"
@@ -15345,7 +15345,7 @@
 "	DebitNotCapTradeAmt = $7, //商户非封顶借记卡交易总金额",
 "	DebitCapTradeAmt = $8, //商户借记卡封顶交易总额",
 "	DebitCapTradeNum = $9, //商户借记卡封顶交易总笔数",
-"	MallPosOrderStatus = $10, //商城购买机具状态",
+"	MallPosOrderStatus = $10, //商城兑换机具状态",
 "	ActiveBuddyMerStatus = $11, //激活创客同名商户",
 "	Remark = $12, //备注",
 "});"

+ 2 - 2
Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -231,7 +231,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //激活类型
                 int ActType = int.Parse(dic["ActType"].ToString());
@@ -582,7 +582,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //激活类型
                 int ActType = int.Parse(dic["ActType"].ToString());

+ 2 - 2
Areas/Admin/Controllers/MainServer/KqProductRuleSetController.cs

@@ -138,7 +138,7 @@ Fields.Add("CyclePosDays", data.CyclePosDays); //领机天数
 Fields.Add("PullNewStartDate", data.PullNewStartDate); //活动开始时间
 Fields.Add("PullNewEndDate", data.PullNewEndDate); //活动结束时间
 Fields.Add("PullNewExtendDays", data.PullNewExtendDays); //延长领机天数
-Fields.Add("BigTotalAmount", data.BigTotalAmount); //购买机起始价
+Fields.Add("BigTotalAmount", data.BigTotalAmount); //兑换机起始价
 Fields.Add("BigExtendCycleDays", data.BigExtendCycleDays); //延长循环周期天数
 Fields.Add("SubsidyStartDate", data.SubsidyStartDate); //活动开始时间
 Fields.Add("SubsidyEndDate", data.SubsidyEndDate); //活动结束时间
@@ -229,7 +229,7 @@ Fields.Add("CyclePosDays", data.CyclePosDays); //领机天数
 Fields.Add("PullNewStartDate", data.PullNewStartDate); //活动开始时间
 Fields.Add("PullNewEndDate", data.PullNewEndDate); //活动结束时间
 Fields.Add("PullNewExtendDays", data.PullNewExtendDays); //延长领机天数
-Fields.Add("BigTotalAmount", data.BigTotalAmount); //购买机起始价
+Fields.Add("BigTotalAmount", data.BigTotalAmount); //兑换机起始价
 Fields.Add("BigExtendCycleDays", data.BigExtendCycleDays); //延长循环周期天数
 Fields.Add("SubsidyStartDate", data.SubsidyStartDate); //活动开始时间
 Fields.Add("SubsidyEndDate", data.SubsidyEndDate); //活动结束时间

+ 4 - 4
Areas/Admin/Controllers/MainServer/MachineRenewController.cs

@@ -96,11 +96,11 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["RealName"] = user.RealName;
 
                 int DamagedSnType = int.Parse(dic["DamagedSnType"].ToString());
-                if(DamagedSnType == 0) dic["DamagedSnType"] = "购买机具";
+                if(DamagedSnType == 0) dic["DamagedSnType"] = "兑换机具";
                 if(DamagedSnType == 1) dic["DamagedSnType"] = "赠送机具";
                 
                 int ReplaceSnType = int.Parse(dic["ReplaceSnType"].ToString());
-                if(ReplaceSnType == 0) dic["ReplaceSnType"] = "购买机具";
+                if(ReplaceSnType == 0) dic["ReplaceSnType"] = "兑换机具";
                 if(ReplaceSnType == 1) dic["ReplaceSnType"] = "赠送机具";
                 
                 int AuditStatus = int.Parse(dic["AuditStatus"].ToString());
@@ -399,11 +399,11 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["RealName"] = user.RealName;
 
                 int DamagedSnType = int.Parse(dic["DamagedSnType"].ToString());
-                if(DamagedSnType == 0) dic["DamagedSnType"] = "购买机具";
+                if(DamagedSnType == 0) dic["DamagedSnType"] = "兑换机具";
                 if(DamagedSnType == 1) dic["DamagedSnType"] = "赠送机具";
                 
                 int ReplaceSnType = int.Parse(dic["ReplaceSnType"].ToString());
-                if(ReplaceSnType == 0) dic["ReplaceSnType"] = "购买机具";
+                if(ReplaceSnType == 0) dic["ReplaceSnType"] = "兑换机具";
                 if(ReplaceSnType == 1) dic["ReplaceSnType"] = "赠送机具";
                 
                 int AuditStatus = int.Parse(dic["AuditStatus"].ToString());

+ 2 - 2
Areas/Admin/Controllers/MainServer/OpenRewardDetailController.cs

@@ -128,7 +128,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
 
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
 
                 int MerBuddyType = int.Parse(dic["MerBuddyType"].ToString());
@@ -435,7 +435,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
 
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
 
                 int MerBuddyType = int.Parse(dic["MerBuddyType"].ToString());

+ 3 - 3
Areas/Admin/Controllers/MainServer/OpenSnSnapshotController.cs

@@ -122,7 +122,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 1) dic["Status"] = "成功";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string PrizeAmt = "0.00", BuyPosCount = "0.00", StadardBuyPosCount = "0.00";//奖励金额 购买机数量 标准购买机数量
+            string PrizeAmt = "0.00", BuyPosCount = "0.00", StadardBuyPosCount = "0.00";//奖励金额 兑换机数量 标准兑换机数量
             DataTable dt = OtherMySqlConn.dtable("select sum(PrizeAmt),sum(BuyPosCount),sum(StadardBuyPosCount) from OpenSnSnapshot where 1=1" + condition);
             if(dt.Rows.Count > 0)
             {
@@ -425,8 +425,8 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("TopMakerCode", "顶级创客编号");
             ReturnFields.Add("TopRealName", "顶级创客名称");
             ReturnFields.Add("BrandId", "产品名称");
-            ReturnFields.Add("BuySnNum", "购买机数量");
-            ReturnFields.Add("StdBuySnNum", "标准购买机数量");
+            ReturnFields.Add("BuySnNum", "兑换机数量");
+            ReturnFields.Add("StdBuySnNum", "标准兑换机数量");
             ReturnFields.Add("RewardAmount", "奖励金额");
             ReturnFields.Add("MerchantNo", "商户编号");
             ReturnFields.Add("MerchantName", "商户名称");

+ 4 - 4
Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -1300,7 +1300,7 @@ namespace MySystem.Areas.Admin.Controllers
             result += "订单号:" + order.OrderNo + "\n";
             result += "下单创客\n创客编号:" + user.MakerCode + ",姓名:" + user.RealName + ",手机号:" + user.Mobile + "\n";
             result += "上级创客\n创客编号:" + puser.MakerCode + ",姓名:" + puser.RealName + ",手机号:" + puser.Mobile + "\n";
-            int machineCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台购买
+            int machineCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台兑换
             int ActiveCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机(不限购买或赠送)
             if (machineCount + ActiveCount >= 3)
             {
@@ -1330,7 +1330,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                result += "上级创客未满足条件\n购买机:" + machineCount + "台,激活机:" + ActiveCount + "台\n";
+                result += "上级创客未满足条件\n兑换机:" + machineCount + "台,激活机:" + ActiveCount + "台\n";
                 dic.Add("code", "1");
             }
             dic.Add("result", result);
@@ -1352,7 +1352,7 @@ namespace MySystem.Areas.Admin.Controllers
                         if (user != null)
                         {
                             int ParentUserId = user.ParentUserId;
-                            int machineCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.PosSnType == 0); //判断是否拥有3台购买
+                            int machineCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.PosSnType == 0); //判断是否拥有3台兑换
                             int ActiveCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.ActivationState == 1); //判断是否拥有3台激活机(不限购买或赠送)
                             if (machineCount + ActiveCount >= 3)
                             {
@@ -1407,7 +1407,7 @@ namespace MySystem.Areas.Admin.Controllers
                             }
                             else
                             {
-                                return "上级创客未满足条件:购买机:" + machineCount + "台,激活机:" + ActiveCount + "台";
+                                return "上级创客未满足条件:兑换机:" + machineCount + "台,激活机:" + ActiveCount + "台";
                             }
                         }
                     }

+ 2 - 2
Areas/Admin/Controllers/MainServer/PosMachinesController.cs

@@ -112,7 +112,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("BindMerchantId");
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
-                if (PosSnType == 0) dic["PosSnType"] = "购买机具";
+                if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
                 if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
@@ -393,7 +393,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("BindMerchantId");
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
-                if (PosSnType == 0) dic["PosSnType"] = "购买机具";
+                if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
                 if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();

+ 2 - 2
Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -172,7 +172,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("BindMerchantId");
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
-                if (PosSnType == 0) dic["PosSnType"] = "购买机具";
+                if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
                 if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
@@ -912,7 +912,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("BindMerchantId");
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
-                if (PosSnType == 0) dic["PosSnType"] = "购买机具";
+                if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
                 if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
                 // //设备类型
                 // string DeviceType = dic["DeviceType"].ToString();

+ 3 - 3
Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -179,7 +179,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("BindMerchantId");
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
-                if (PosSnType == 0) dic["PosSnType"] = "购买机具";
+                if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
                 if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
@@ -690,7 +690,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("BindMerchantId");
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
-                if (PosSnType == 0) dic["PosSnType"] = "购买机具";
+                if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
                 if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
                 // //设备类型
                 // string DeviceType = dic["DeviceType"].ToString();
@@ -886,7 +886,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("BindMerchantId");
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
-                if (PosSnType == 0) dic["PosSnType"] = "购买机具";
+                if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
                 if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();

+ 3 - 3
Areas/Admin/Controllers/MainServer/PosMerchantInfoController.cs

@@ -153,7 +153,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
@@ -298,7 +298,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
@@ -620,7 +620,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";

+ 4 - 4
Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -118,7 +118,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
@@ -234,7 +234,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
@@ -359,7 +359,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
@@ -890,7 +890,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["StoreName"] = store.StoreName;
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";

+ 2 - 2
Areas/Admin/Controllers/MainServer/StoreChangeHistoryController.cs

@@ -136,7 +136,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (TransType == 0) dic["TransType"] = "采购";
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //库存操作方向
                 int StockOpDirect = int.Parse(dic["StockOpDirect"].ToString());
@@ -437,7 +437,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (TransType == 0) dic["TransType"] = "采购";
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //库存操作方向
                 int StockOpDirect = int.Parse(dic["StockOpDirect"].ToString());

+ 2 - 2
Areas/Admin/Controllers/MainServer/StoreSwapSnController.cs

@@ -109,7 +109,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //SN类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
+                if(SnType == 0) dic["SnType"] = "兑换机具";
                 if(SnType == 1) dic["SnType"] = "赠送机具";
 
                 //兑换状态
@@ -394,7 +394,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //SN类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
+                if(SnType == 0) dic["SnType"] = "兑换机具";
                 if(SnType == 1) dic["SnType"] = "赠送机具";
 
                 //兑换状态

+ 5 - 5
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1191,7 +1191,7 @@ namespace MySystem.Areas.Admin.Controllers
             result += "机器持有人顶级:创客编号:" + posTopUser.MakerCode + ",姓名:" + posTopUser.RealName + "\n";
             result += "\n";
             result += "机具SN:" + pos.PosSn + "\n";
-            string PosSnType = pos.PosSnType == 0 ? "购买机" : "循环机";
+            string PosSnType = pos.PosSnType == 0 ? "兑换机" : "循环机";
             result += "机具类型:" + PosSnType + "\n";
             result += "商户编号:" + merInfo + ",商户姓名:" + merName + "\n";
             result += "商户型机器/直拓机器:创客编号:" + posSubUser.MakerCode + ",姓名:" + posSubUser.RealName + "\n";
@@ -2554,7 +2554,7 @@ namespace MySystem.Areas.Admin.Controllers
             result += "订单号:" + order.OrderNo + "\n";
             result += "下单创客\n创客编号:" + user.MakerCode + ",姓名:" + user.RealName + ",手机号:" + user.Mobile + "\n";
             result += "上级创客\n创客编号:" + puser.MakerCode + ",姓名:" + puser.RealName + ",手机号:" + puser.Mobile + "\n";
-            int machineCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台购买
+            int machineCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台兑换
             int ActiveCount = db.PosMachinesTwo.Count(m => m.UserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机(不限购买或赠送)
             if (machineCount + ActiveCount >= 3)
             {
@@ -2585,7 +2585,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                result += "上级创客未满足条件\n购买机:" + machineCount + "台,激活机:" + ActiveCount + "台\n";
+                result += "上级创客未满足条件\n兑换机:" + machineCount + "台,激活机:" + ActiveCount + "台\n";
                 dic.Add("code", "1");
             }
             dic.Add("result", result);
@@ -2618,7 +2618,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 while (ParentUserId > 0)
                                 {
                                     Users puser = db.Users.FirstOrDefault(m => m.Id == ParentUserId) ?? new Users();
-                                    int machineCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.PosSnType == 0); //判断是否拥有3台购买
+                                    int machineCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.PosSnType == 0); //判断是否拥有3台兑换
                                     int ActiveCount = db.PosMachinesTwo.Count(m => m.UserId == ParentUserId && m.ActivationState == 1); //判断是否拥有3台激活机(不限购买或赠送)
                                     int couponCount = db.PosCoupons.Count(m => m.UserId == ParentUserId && m.IsUse == 0); //判断是否拥有3张券
                                     if ((machineCount + ActiveCount + couponCount >= 3 || puser.LeaderLevel > 0) && !directPrize)
@@ -2793,7 +2793,7 @@ namespace MySystem.Areas.Admin.Controllers
                         Users puser = db.Users.FirstOrDefault(m => m.Id == UserId && m.AuthFlag == 1);
                         if (puser != null && Prize > 0)
                         {
-                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台购买
+                            int machineCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.PosSnType == 0); //判断是否拥有3台兑换
                             int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == puser.Id && m.ActivationState == 1); //判断是否拥有3台激活机(不限购买或赠送)
                             int couponCount = db.PosCoupons.Count(m => m.UserId == puser.Id && m.IsUse == 0); //判断是否拥有3张券
                             if (machineCount + ActiveCount + couponCount >= 3)

+ 1 - 1
Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -482,7 +482,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == toChargeBackRecord.Remark) ?? new PosMachinesTwo();
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(pos.BrandId);
-                if (pos.PosSnType == 0) dic["PosSnType"] = "购买机";
+                if (pos.PosSnType == 0) dic["PosSnType"] = "兑换机";
                 if (pos.PosSnType == 1) dic["PosSnType"] = "循环机";
                 dic["RecycEndDate"] = pos.RecycEndDate;
 

+ 1 - 1
Areas/Admin/Controllers/MainServer/UserMallLargeSnController.cs

@@ -106,7 +106,7 @@ namespace MySystem.Areas.Admin.Controllers
                 
                 //SN类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
+                if(SnType == 0) dic["SnType"] = "兑换机具";
                 if(SnType == 1) dic["SnType"] = "赠送机具";
             }
             return Json(obj);

+ 4 - 4
Areas/Admin/Controllers/MainServer/UserSnActInfoController.cs

@@ -101,7 +101,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //SN仓库
                 int SnStoreId = int.Parse(function.CheckInt(dic["SnStoreId"].ToString()));
@@ -118,7 +118,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (ActiveStatus == 2) dic["ActiveStatus"] = "SN已返现";
                 //源SN机具类型
                 int SourceSnType = int.Parse(dic["SourceSnType"].ToString());
-                if (SourceSnType == 0) dic["SourceSnType"] = "购买机具";
+                if (SourceSnType == 0) dic["SourceSnType"] = "兑换机具";
                 if (SourceSnType == 1) dic["SourceSnType"] = "赠送机具";
                 //源SN发货你仓库
                 dic["SourceStoreId"] = RelationClass.GetStoreHouseInfo(int.Parse(dic["SourceStoreId"].ToString()));
@@ -378,7 +378,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //SN仓库
                 int SnStoreId = int.Parse(function.CheckInt(dic["SnStoreId"].ToString()));
@@ -395,7 +395,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (ActiveStatus == 2) dic["ActiveStatus"] = "SN已返现";
                 //源SN机具类型
                 int SourceSnType = int.Parse(dic["SourceSnType"].ToString());
-                if (SourceSnType == 0) dic["SourceSnType"] = "购买机具";
+                if (SourceSnType == 0) dic["SourceSnType"] = "兑换机具";
                 if (SourceSnType == 1) dic["SourceSnType"] = "赠送机具";
                 //源SN发货你仓库
                 dic["SourceStoreId"] = RelationClass.GetStoreHouseInfo(int.Parse(dic["SourceStoreId"].ToString()));

+ 2 - 2
Areas/Admin/Controllers/MainServer/UserSnDelayChangeController.cs

@@ -115,12 +115,12 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
+                if(SnType == 0) dic["SnType"] = "兑换机具";
                 if(SnType == 1) dic["SnType"] = "赠送机具";
 
                 //源SN类型
                 int SourceSnType = int.Parse(dic["SourceSnType"].ToString());
-                if(SourceSnType == 0) dic["SourceSnType"] = "购买机具";
+                if(SourceSnType == 0) dic["SourceSnType"] = "兑换机具";
                 if(SourceSnType == 1) dic["SourceSnTypeSelect"] = "赠送机具";
             }
             return Json(obj);

+ 2 - 2
Areas/Admin/Controllers/MainServer/UserStoreChangeController.cs

@@ -144,7 +144,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (TransType == 0) dic["TransType"] = "";
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //库存操作方向
                 int StockOpDirect = int.Parse(dic["StockOpDirect"].ToString());
@@ -521,7 +521,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (TransType == 0) dic["TransType"] = "";
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if (SnType == 0) dic["SnType"] = "购买机具";
+                if (SnType == 0) dic["SnType"] = "兑换机具";
                 if (SnType == 1) dic["SnType"] = "赠送机具";
                 //库存操作方向
                 int StockOpDirect = int.Parse(dic["StockOpDirect"].ToString());

+ 2 - 2
Areas/Admin/Controllers/MainServer/UserSwapDetailController.cs

@@ -114,7 +114,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopMakerCode"] = tuser.MakerCode;
                 dic["TopRealName"] = tuser.RealName;
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
+                if(SnType == 0) dic["SnType"] = "兑换机具";
                 if(SnType == 1) dic["SnType"] = "赠送机具";
                 int RiskResult = int.Parse(dic["RiskResult"].ToString());
                 if(RiskResult == 0) dic["RiskResult"] = "降档";
@@ -385,7 +385,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopMakerCode"] = tuser.MakerCode;
                 dic["TopRealName"] = tuser.RealName;
                 int SnType = int.Parse(dic["SnType"].ToString());
-                if(SnType == 0) dic["SnType"] = "购买机具";
+                if(SnType == 0) dic["SnType"] = "兑换机具";
                 if(SnType == 1) dic["SnType"] = "赠送机具";
                 int RiskResult = int.Parse(dic["RiskResult"].ToString());
                 if(RiskResult == 0) dic["RiskResult"] = "降档";

+ 1 - 1
Areas/Admin/Views/MainServer/ActiveReward/Index.cshtml

@@ -144,7 +144,7 @@
                         <div class="layui-input-inline">
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 2 - 2
Areas/Admin/Views/MainServer/KqProductRuleSet/Add.cshtml

@@ -216,9 +216,9 @@
 </div>
 <div class="layui-tab-item">
 <div class="layui-form-item">
-<label class="layui-form-label">购买机起始价</label>
+<label class="layui-form-label">兑换机起始价</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="BigTotalAmount" name="BigTotalAmount" maxlength="20" lay-verify="required,number," autocomplete="off" placeholder="请输入购买机起始价">
+<input class="layui-input" type="text" id="BigTotalAmount" name="BigTotalAmount" maxlength="20" lay-verify="required,number," autocomplete="off" placeholder="请输入兑换机起始价">
 </div>
 </div>
 <div class="layui-form-item">

+ 2 - 2
Areas/Admin/Views/MainServer/KqProductRuleSet/Edit.cshtml

@@ -219,9 +219,9 @@
 </div>
 <div class="layui-tab-item">
 <div class="layui-form-item">
-<label class="layui-form-label">购买机起始价</label>
+<label class="layui-form-label">兑换机起始价</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="BigTotalAmount" name="BigTotalAmount" value="@editData.BigTotalAmount" maxlength="20" lay-verify="required,number," autocomplete="off" placeholder="请输入购买机起始价">
+<input class="layui-input" type="text" id="BigTotalAmount" name="BigTotalAmount" value="@editData.BigTotalAmount" maxlength="20" lay-verify="required,number," autocomplete="off" placeholder="请输入兑换机起始价">
 </div>
 </div>
 <div class="layui-form-item">

+ 2 - 2
Areas/Admin/Views/MainServer/MachineRenew/Add.cshtml

@@ -76,7 +76,7 @@
                             <div class="layui-input-inline">
                                 <select id="DamagedSnType" name="DamagedSnType" lay-verify="required|" lay-search="">
                                     <option value="">请选择</option>
-                                    <option value="0">购买机具</option>
+                                    <option value="0">兑换机具</option>
                                     <option value="1">赠送机具</option>
                                 </select>
                             </div>
@@ -105,7 +105,7 @@
                             <div class="layui-input-inline">
                                 <select id="ReplaceSnType" name="ReplaceSnType" lay-verify="required|" lay-search="">
                                     <option value="">请选择</option>
-                                    <option value="0">购买机具</option>
+                                    <option value="0">兑换机具</option>
                                     <option value="1">赠送机具</option>
                                 </select>
                             </div>

+ 1 - 1
Areas/Admin/Views/MainServer/MachineRenew/Index.cshtml

@@ -81,7 +81,7 @@
                         <div class="layui-input-inline">
                             <select id="DamagedSnTypeSelect" name="DamagedSnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 1 - 1
Areas/Admin/Views/MainServer/OpenSnSnapshot/Index.cshtml

@@ -131,7 +131,7 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    奖励金额(元):<span style="color: #f00;" id="PrizeAmt">0.00</span> | 购买机数量(元):<span style="color: #f00;" id="BuyPosCount">0.00</span> | 标准购买机数量(元):<span style="color: #f00;" id="StadardBuyPosCount">0.00</span>
+                    奖励金额(元):<span style="color: #f00;" id="PrizeAmt">0.00</span> | 兑换机数量(元):<span style="color: #f00;" id="BuyPosCount">0.00</span> | 标准兑换机数量(元):<span style="color: #f00;" id="StadardBuyPosCount">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">

+ 1 - 1
Areas/Admin/Views/MainServer/PosMachinesTwo/Edit.cshtml

@@ -35,7 +35,7 @@
                             <div class="layui-input-inline">
                                 <select id="PosSnType" name="PosSnType" lay-search="">
                                     <option value=""></option>
-                                    <option value="0">购买机</option>
+                                    <option value="0">兑换机</option>
                                     <option value="1">赠送机</option>
                                 </select>
                                 <script>$("#PosSnType").val("@editData.PosSnType");</script>

+ 1 - 1
Areas/Admin/Views/MainServer/PosMachinesTwoChange/Edit.cshtml

@@ -35,7 +35,7 @@
                             <div class="layui-input-inline">
                                 <select id="PosSnType" name="PosSnType" lay-search="">
                                     <option value=""></option>
-                                    <option value="0">购买机</option>
+                                    <option value="0">兑换机</option>
                                     <option value="1">赠送机</option>
                                 </select>
                                 <script>$("#PosSnType").val("@editData.PosSnType");</script>

+ 1 - 1
Areas/Admin/Views/MainServer/StoreChangeHistory/Index.cshtml

@@ -107,7 +107,7 @@
                         <div class="layui-input-inline">
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 1 - 1
Areas/Admin/Views/MainServer/StoreSwapSn/Index.cshtml

@@ -88,7 +88,7 @@
                         <div class="layui-input-inline">
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 1 - 1
Areas/Admin/Views/MainServer/UserMallLargeSn/Index.cshtml

@@ -85,7 +85,7 @@
                         <div class="layui-input-inline">
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 1 - 1
Areas/Admin/Views/MainServer/UserSnActInfo/Index.cshtml

@@ -73,7 +73,7 @@
                         <div class="layui-input-inline">
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 2 - 2
Areas/Admin/Views/MainServer/UserSnDelayChange/Index.cshtml

@@ -79,7 +79,7 @@
                         <div class="layui-input-inline">
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>
@@ -89,7 +89,7 @@
                         <div class="layui-input-inline">
                             <select id="SourceSnTypeSelect" name="SourceSnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 1 - 1
Areas/Admin/Views/MainServer/UserSwapDetail/Index.cshtml

@@ -77,7 +77,7 @@
                         <div class="layui-input-inline">
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">购买机具</option>
+                                <option value="0">兑换机具</option>
                                 <option value="1">赠送机具</option>
                             </select>
                         </div>

+ 1 - 1
wwwroot/layuiadmin/modules_main/KqProductRuleSet_Admin.js

@@ -94,7 +94,7 @@ layui.config({
             ,{field:'PullNewStartDate', width: 200, title:'活动开始时间', sort: true}
             ,{field:'PullNewEndDate', width: 200, title:'活动结束时间', sort: true}
             ,{field:'PullNewExtendDays', width: 200, title:'延长领机天数', sort: true}
-            ,{field:'BigTotalAmount', width: 200, title:'购买机起始价', sort: true}
+            ,{field:'BigTotalAmount', width: 200, title:'兑换机起始价', sort: true}
             ,{field:'BigExtendCycleDays', width: 200, title:'延长循环周期天数', sort: true}
             ,{field:'SubsidyStartDate', width: 200, title:'活动开始时间', sort: true}
             ,{field:'SubsidyEndDate', width: 200, title:'活动结束时间', sort: true}

+ 3 - 3
wwwroot/layuiadmin/modules_main/Main_Admin.js

@@ -1056,7 +1056,7 @@ var KqProductRuleSet_cols = [[
 ,{field:'PullNewStartDate', title:'活动开始时间', sort: true}
 ,{field:'PullNewEndDate', title:'活动结束时间', sort: true}
 ,{field:'PullNewExtendDays', title:'延长领机天数', sort: true}
-,{field:'BigTotalAmount', title:'购买机起始价', sort: true}
+,{field:'BigTotalAmount', title:'兑换机起始价', sort: true}
 ,{field:'BigExtendCycleDays', title:'延长循环周期天数', sort: true}
 ,{field:'SubsidyStartDate', title:'活动开始时间', sort: true}
 ,{field:'SubsidyEndDate', title:'活动结束时间', sort: true}
@@ -1323,8 +1323,8 @@ var OpenSnSnapshot_cols = [[
 ,{field:'RewardType', title:'奖励类型', sort: true}
 ,{field:'RewardTips', title:'奖励描述', sort: true}
 ,{field:'OpenRewardNo', title:'开机奖励单号', sort: true}
-,{field:'BuySnNum', title:'购买机数量', sort: true}
-,{field:'StdBuySnNum', title:'标准购买机数量', sort: true}
+,{field:'BuySnNum', title:'兑换机数量', sort: true}
+,{field:'StdBuySnNum', title:'标准兑换机数量', sort: true}
 ,{field:'RewardAmount', title:'奖励金额', sort: true}
 ,{field:'FailReason', title:'失败原因', sort: true}
 ,{field:'CreateDate', title:'创建时间', sort: true}

+ 2 - 2
wwwroot/layuiadmin/modules_main/OpenSnSnapshot_Admin.js

@@ -125,8 +125,8 @@ $('#TradeDate').val(value);
             // ,{field:'TopMakerCode', width: 200, title:'顶级创客编号', sort: true}
             // ,{field:'TopRealName', width: 200, title:'顶级创客名称', sort: true}
             ,{field:'BrandId', width: 200, title:'产品名称', sort: true}
-            ,{field:'BuySnNum', width: 200, title:'购买机数量', sort: true}
-            ,{field:'StdBuySnNum', width: 200, title:'标准购买机数量', sort: true}
+            ,{field:'BuySnNum', width: 200, title:'兑换机数量', sort: true}
+            ,{field:'StdBuySnNum', width: 200, title:'标准兑换机数量', sort: true}
             ,{field:'RewardAmount', width: 200, title:'奖励金额', sort: true}
             ,{field:'MerchantNo', width: 200, title:'商户编号', sort: true}
             ,{field:'MerchantName', width: 200, title:'商户名称', sort: true}