Kaynağa Gözat

赠送机改为循环机

lichunlei 3 yıl önce
ebeveyn
işleme
257615d454
26 değiştirilmiş dosya ile 50 ekleme ve 50 silme
  1. 2 2
      Areas/Admin/Controllers/MainServer/ActiveRewardController.cs
  2. 4 4
      Areas/Admin/Controllers/MainServer/MachineRenewController.cs
  3. 2 2
      Areas/Admin/Controllers/MainServer/OpenRewardDetailController.cs
  4. 2 2
      Areas/Admin/Controllers/MainServer/PosMachinesController.cs
  5. 2 2
      Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs
  6. 3 3
      Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs
  7. 3 3
      Areas/Admin/Controllers/MainServer/PosMerchantInfoController.cs
  8. 4 4
      Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs
  9. 2 2
      Areas/Admin/Controllers/MainServer/StoreChangeHistoryController.cs
  10. 2 2
      Areas/Admin/Controllers/MainServer/StoreSwapSnController.cs
  11. 1 1
      Areas/Admin/Controllers/MainServer/UserMallLargeSnController.cs
  12. 4 4
      Areas/Admin/Controllers/MainServer/UserSnActInfoController.cs
  13. 2 2
      Areas/Admin/Controllers/MainServer/UserSnDelayChangeController.cs
  14. 2 2
      Areas/Admin/Controllers/MainServer/UserStoreChangeController.cs
  15. 2 2
      Areas/Admin/Controllers/MainServer/UserSwapDetailController.cs
  16. 1 1
      Areas/Admin/Views/MainServer/ActiveReward/Index.cshtml
  17. 2 2
      Areas/Admin/Views/MainServer/MachineRenew/Add.cshtml
  18. 1 1
      Areas/Admin/Views/MainServer/MachineRenew/Index.cshtml
  19. 1 1
      Areas/Admin/Views/MainServer/PosMachinesTwo/Edit.cshtml
  20. 1 1
      Areas/Admin/Views/MainServer/PosMachinesTwoChange/Edit.cshtml
  21. 1 1
      Areas/Admin/Views/MainServer/StoreChangeHistory/Index.cshtml
  22. 1 1
      Areas/Admin/Views/MainServer/StoreSwapSn/Index.cshtml
  23. 1 1
      Areas/Admin/Views/MainServer/UserMallLargeSn/Index.cshtml
  24. 1 1
      Areas/Admin/Views/MainServer/UserSnActInfo/Index.cshtml
  25. 2 2
      Areas/Admin/Views/MainServer/UserSnDelayChange/Index.cshtml
  26. 1 1
      Areas/Admin/Views/MainServer/UserSwapDetail/Index.cshtml

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

@@ -232,7 +232,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //激活类型
                 int ActType = int.Parse(dic["ActType"].ToString());
                 if (ActType == 0) dic["ActType"] = "正常激活";
@@ -583,7 +583,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //激活类型
                 int ActType = int.Parse(dic["ActType"].ToString());
                 if (ActType == 0) dic["ActType"] = "正常激活";

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

@@ -97,11 +97,11 @@ namespace MySystem.Areas.Admin.Controllers
 
                 int DamagedSnType = int.Parse(dic["DamagedSnType"].ToString());
                 if(DamagedSnType == 0) dic["DamagedSnType"] = "兑换机具";
-                if(DamagedSnType == 1) dic["DamagedSnType"] = "赠送机具";
+                if(DamagedSnType == 1) dic["DamagedSnType"] = "循环机具";
                 
                 int ReplaceSnType = int.Parse(dic["ReplaceSnType"].ToString());
                 if(ReplaceSnType == 0) dic["ReplaceSnType"] = "兑换机具";
-                if(ReplaceSnType == 1) dic["ReplaceSnType"] = "赠送机具";
+                if(ReplaceSnType == 1) dic["ReplaceSnType"] = "循环机具";
                 
                 int AuditStatus = int.Parse(dic["AuditStatus"].ToString());
                 if(AuditStatus == 0) dic["AuditStatus"] = "未审核";
@@ -400,11 +400,11 @@ namespace MySystem.Areas.Admin.Controllers
 
                 int DamagedSnType = int.Parse(dic["DamagedSnType"].ToString());
                 if(DamagedSnType == 0) dic["DamagedSnType"] = "兑换机具";
-                if(DamagedSnType == 1) dic["DamagedSnType"] = "赠送机具";
+                if(DamagedSnType == 1) dic["DamagedSnType"] = "循环机具";
                 
                 int ReplaceSnType = int.Parse(dic["ReplaceSnType"].ToString());
                 if(ReplaceSnType == 0) dic["ReplaceSnType"] = "兑换机具";
-                if(ReplaceSnType == 1) dic["ReplaceSnType"] = "赠送机具";
+                if(ReplaceSnType == 1) dic["ReplaceSnType"] = "循环机具";
                 
                 int AuditStatus = int.Parse(dic["AuditStatus"].ToString());
                 if(AuditStatus == 0) dic["AuditStatus"] = "未审核";

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

@@ -129,7 +129,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
 
                 int MerBuddyType = int.Parse(dic["MerBuddyType"].ToString());
                 if (MerBuddyType == 0) dic["MerBuddyType"] = "非商户型创客";
@@ -436,7 +436,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
 
                 int MerBuddyType = int.Parse(dic["MerBuddyType"].ToString());
                 if (MerBuddyType == 0) dic["MerBuddyType"] = "非商户型创客";

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

@@ -113,7 +113,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
                 if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
-                if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
+                if (PosSnType == 1) dic["PosSnType"] = "循环机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
                 if (DeviceType == "KysSignPos") dic["DeviceType"] = "快益刷电签POS";
@@ -394,7 +394,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
                 if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
-                if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
+                if (PosSnType == 1) dic["PosSnType"] = "循环机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
                 if (DeviceType == "KysSignPos") dic["DeviceType"] = "快益刷电签POS";

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

@@ -173,7 +173,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
                 if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
-                if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
+                if (PosSnType == 1) dic["PosSnType"] = "循环机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
                 if (DeviceType == "KysSignPos") dic["DeviceType"] = "快益刷电签POS";
@@ -913,7 +913,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
                 if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
-                if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
+                if (PosSnType == 1) dic["PosSnType"] = "循环机具";
                 // //设备类型
                 // string DeviceType = dic["DeviceType"].ToString();
                 // if (DeviceType == "KysSignPos") dic["DeviceType"] = "快益刷电签POS";

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

@@ -180,7 +180,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
                 if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
-                if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
+                if (PosSnType == 1) dic["PosSnType"] = "循环机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
                 if (DeviceType == "KysSignPos") dic["DeviceType"] = "快益刷电签POS";
@@ -691,7 +691,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
                 if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
-                if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
+                if (PosSnType == 1) dic["PosSnType"] = "循环机具";
                 // //设备类型
                 // string DeviceType = dic["DeviceType"].ToString();
                 // if (DeviceType == "KysSignPos") dic["DeviceType"] = "快益刷电签POS";
@@ -887,7 +887,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int PosSnType = int.Parse(dic["PosSnType"].ToString());
                 if (PosSnType == 0) dic["PosSnType"] = "兑换机具";
-                if (PosSnType == 1) dic["PosSnType"] = "赠送机具";
+                if (PosSnType == 1) dic["PosSnType"] = "循环机具";
                 //设备类型
                 string DeviceType = dic["DeviceType"].ToString();
                 if (DeviceType == "KysSignPos") dic["DeviceType"] = "快益刷电签POS";

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

@@ -154,7 +154,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
                 //激活类型
@@ -299,7 +299,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
                 //激活类型
@@ -621,7 +621,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
                 //激活类型

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

@@ -119,7 +119,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
                 //激活类型
@@ -235,7 +235,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
                 //激活类型
@@ -360,7 +360,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
                 //激活类型
@@ -891,7 +891,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //返利资格
                 dic["RebateQual"] = dic["RebateQual"].ToString() == "1" ? "是" : "否";
                 //激活类型

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

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

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

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

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

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

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

@@ -102,7 +102,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //SN仓库
                 int SnStoreId = int.Parse(function.CheckInt(dic["SnStoreId"].ToString()));
                 StoreHouse snstoreid_StoreHouse = db.StoreHouse.FirstOrDefault(m => m.Id == SnStoreId) ?? new StoreHouse();
@@ -119,7 +119,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //源SN机具类型
                 int SourceSnType = int.Parse(dic["SourceSnType"].ToString());
                 if (SourceSnType == 0) dic["SourceSnType"] = "兑换机具";
-                if (SourceSnType == 1) dic["SourceSnType"] = "赠送机具";
+                if (SourceSnType == 1) dic["SourceSnType"] = "循环机具";
                 //源SN发货你仓库
                 dic["SourceStoreId"] = RelationClass.GetStoreHouseInfo(int.Parse(dic["SourceStoreId"].ToString()));
 
@@ -379,7 +379,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //SN机具类型
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if (SnType == 0) dic["SnType"] = "兑换机具";
-                if (SnType == 1) dic["SnType"] = "赠送机具";
+                if (SnType == 1) dic["SnType"] = "循环机具";
                 //SN仓库
                 int SnStoreId = int.Parse(function.CheckInt(dic["SnStoreId"].ToString()));
                 StoreHouse snstoreid_StoreHouse = db.StoreHouse.FirstOrDefault(m => m.Id == SnStoreId) ?? new StoreHouse();
@@ -396,7 +396,7 @@ namespace MySystem.Areas.Admin.Controllers
                 //源SN机具类型
                 int SourceSnType = int.Parse(dic["SourceSnType"].ToString());
                 if (SourceSnType == 0) dic["SourceSnType"] = "兑换机具";
-                if (SourceSnType == 1) 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

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

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

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

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

@@ -115,7 +115,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopRealName"] = tuser.RealName;
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if(SnType == 0) dic["SnType"] = "兑换机具";
-                if(SnType == 1) dic["SnType"] = "赠送机具";
+                if(SnType == 1) dic["SnType"] = "循环机具";
                 int RiskResult = int.Parse(dic["RiskResult"].ToString());
                 if(RiskResult == 0) dic["RiskResult"] = "降档";
                 if(RiskResult == 1) dic["RiskResult"] = "不降档";
@@ -386,7 +386,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopRealName"] = tuser.RealName;
                 int SnType = int.Parse(dic["SnType"].ToString());
                 if(SnType == 0) dic["SnType"] = "兑换机具";
-                if(SnType == 1) dic["SnType"] = "赠送机具";
+                if(SnType == 1) dic["SnType"] = "循环机具";
                 int RiskResult = int.Parse(dic["RiskResult"].ToString());
                 if(RiskResult == 0) dic["RiskResult"] = "降档";
                 if(RiskResult == 1) dic["RiskResult"] = "不降档";

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

@@ -145,7 +145,7 @@
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>

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

@@ -77,7 +77,7 @@
                                 <select id="DamagedSnType" name="DamagedSnType" lay-verify="required|" lay-search="">
                                     <option value="">请选择</option>
                                     <option value="0">兑换机具</option>
-                                    <option value="1">赠送机具</option>
+                                    <option value="1">循环机具</option>
                                 </select>
                             </div>
                         </div>
@@ -106,7 +106,7 @@
                                 <select id="ReplaceSnType" name="ReplaceSnType" lay-verify="required|" lay-search="">
                                     <option value="">请选择</option>
                                     <option value="0">兑换机具</option>
-                                    <option value="1">赠送机具</option>
+                                    <option value="1">循环机具</option>
                                 </select>
                             </div>
                         </div>

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

@@ -82,7 +82,7 @@
                             <select id="DamagedSnTypeSelect" name="DamagedSnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>

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

@@ -36,7 +36,7 @@
                                 <select id="PosSnType" name="PosSnType" lay-search="">
                                     <option value=""></option>
                                     <option value="0">兑换机</option>
-                                    <option value="1">赠送机</option>
+                                    <option value="1">循环机</option>
                                 </select>
                                 <script>$("#PosSnType").val("@editData.PosSnType");</script>
                             </div>

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

@@ -36,7 +36,7 @@
                                 <select id="PosSnType" name="PosSnType" lay-search="">
                                     <option value=""></option>
                                     <option value="0">兑换机</option>
-                                    <option value="1">赠送机</option>
+                                    <option value="1">循环机</option>
                                 </select>
                                 <script>$("#PosSnType").val("@editData.PosSnType");</script>
                             </div>

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

@@ -108,7 +108,7 @@
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>

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

@@ -89,7 +89,7 @@
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>

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

@@ -86,7 +86,7 @@
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>

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

@@ -74,7 +74,7 @@
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>

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

@@ -80,7 +80,7 @@
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>
@@ -90,7 +90,7 @@
                             <select id="SourceSnTypeSelect" name="SourceSnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>

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

@@ -78,7 +78,7 @@
                             <select id="SnTypeSelect" name="SnTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">兑换机具</option>
-                                <option value="1">赠送机具</option>
+                                <option value="1">循环机具</option>
                             </select>
                         </div>
                     </div>