Merge branch 'feature-dgy-后台新功能批量处理' into feature-dgy-后台测试

# Conflicts:
#	Areas/Admin/Views/MainServer/SysTools/SetMerAgent.cshtml

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1084,11 +1084,11 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入商户编号";
             }
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
-            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             if (pos == null)
             {
                 return "机具SN不存在";
             }
+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);
             if (user == null)
             {
@@ -1166,11 +1166,11 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入机具SN";
             }
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
-            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             if (pos == null)
             {
                 return "机具SN不存在";
             }
+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);
             if (user == null)
             {

Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml

@@ -34,7 +34,7 @@
                                     <label class="layui-form-label">创客编号</label>
                                     <div class="layui-input-inline">
                                         <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
-                                            maxlength="10" lay-verify="required|" autocomplete="off"
+                                            maxlength="15" lay-verify="required|" autocomplete="off"
                                             placeholder="请输入创客编号">
                                     </div>
                                 </div>
@@ -67,7 +67,8 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
@@ -84,17 +85,19 @@
                     dataType: "text",
                     success: function (data) {
                         layer.close(index); //关闭弹层
-                        layer.close(indexs); //关闭弹层
                         if (data == "success") {
-                            layer.msg("取消成功");
-                            window.location.reload();
-                        } else {
-                            @* layer.msg(data); *@
-                            layer.msg(data, {
-                                time: 1500
+                            layer.msg('取消成功', {
+                                time: 2000
                             }, function () {
-                                table.reload('LAY-list-manage'); //数据刷新
+                                window.location.reload();
                             });
+                        } else {
+                            @* layer.msg(data); *@
+                                layer.msg(data, {
+                                    time: 2000
+                                }, function () {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                });
                         }
                     }
                 });

Areas/Admin/Views/MainServer/SysTools/SetMerAgent.cshtml

@@ -31,7 +31,7 @@
                                     <label class="layui-form-label">创客编号</label>
                                     <div class="layui-input-inline">
                                         <input class="layui-input" type="text" id="MakerCode" name="MakerCode"
-                                            maxlength="10" lay-verify="required|" autocomplete="off"
+                                            maxlength="15" lay-verify="required|" autocomplete="off"
                                             placeholder="请输入创客编号">
                                     </div>
                                 </div>
@@ -90,9 +90,17 @@
                 success: function (data) {
                     layer.close(index); //关闭弹层
                     if (data == "success") {
-                        layer.msg("重置成功");
+                        layer.msg('设置成功', {
+                            time: 2000
+                        }, function () {
+                            window.location.reload();
+                        });
                     } else {
-                        layer.msg(data);
+                        layer.msg(data, {
+                            time: 2000
+                        }, function () {
+                            table.reload('LAY-list-manage'); //数据刷新
+                        });
                     }
                 }
             });