Просмотр исходного кода

Merge branch 'feature-dgy-首页改版' into feature-dgy-后台测试

DuGuYang 3 лет назад
Родитель
Сommit
b2fa20fded

+ 3 - 0
AppStart/RelationClassForConst.cs

@@ -153,6 +153,9 @@ namespace MySystem
                 case 127:
                     result = "运营中心分仓奖励";
                     break;
+                case 130:
+                    result = "预发临时额度退还";
+                    break;
                 case 201:
                     result = "分期预扣款";
                     break;

+ 3 - 0
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4064,6 +4064,9 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
+            
+            CustomTagSet set = db.CustomTagSet.FirstOrDefault(m => m.Tags == "CashWithoutUser") ?? new CustomTagSet();
+            ViewBag.set = set;
 
             return View();
         }

+ 5 - 1
Areas/Admin/Views/MainServer/SysTools/CashWithoutUser.cshtml

@@ -1,3 +1,7 @@
+@using MySystem.Models;
+@{
+    CustomTagSet editData = ViewBag.set as CustomTagSet;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
@@ -33,7 +37,7 @@
                                     <label class="layui-form-label">代付排除创客名单</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="Content" id="Content"
-                                            placeholder="请输入创客编号,多个创客编号用逗号隔开"></textarea>
+                                            placeholder="请输入创客编号,多个创客编号用逗号隔开">@(editData.Contents)</textarea>
                                     </div>
                                 </div>
                             </div>

+ 1 - 1
Areas/Admin/Views/MainServer/SysTools/SetPosFee.cshtml

@@ -31,7 +31,7 @@
                         <div class="layui-tab-content mt20">
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">机SN</label>
+                                    <label class="layui-form-label">机SN</label>
                                     <div class="layui-input-block">
                                         <textarea class="layui-textarea" lay-verify="required|" name="PosSn" id="PosSn"
                                             placeholder="请输入机具SN,多个SN用回车隔开"></textarea>