DuGuYang 3 tahun lalu
induk
melakukan
16ec812d37

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

@@ -102,8 +102,8 @@ namespace MySystem.Areas.Admin.Controllers
                 
                 //业务状态
                 int OperateType = int.Parse(dic["OperateType"].ToString());
-                if(OperateType == 1) dic["OperateTypeName"] = "正常";
-                if(OperateType == 2) dic["OperateTypeName"] = "异常";
+                if(OperateType == 1) dic["OperateTypeName"] = "设置";
+                if(OperateType == 2) dic["OperateTypeName"] = "取消";
 
             }
             return Json(obj);

+ 9 - 10
Areas/Admin/Views/MainServer/SetMerchantTypeRecord/Index.cshtml

@@ -17,25 +17,24 @@
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline {
+        .layui-input-inline{
             width: 175px !important;
         }
-
-        .layui-form-label {
-            width: 85px !important;
+        .layui-form-label{
+            width: 115px !important;
         }
-
-        .layui-inline {
+        .layui-inline{
             margin-right: 0px !important;
         }
-
-        .w100 {
+        .w100{
             width: 100px !important;
         }
-
-        .ml50 {
+        .ml50{
             margin-left: 50px !important;
         }
+        tbody .layui-table-cell{
+            height: 60px !important;
+        }
     </style>
 </head>
 

+ 26 - 22
Areas/Admin/Views/MainServer/SysTools/CancelMerAgent.cshtml

@@ -1,20 +1,23 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>设置商户型创客</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
@@ -38,17 +41,15 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">机具SN</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="PosSn"
-                                            name="PosSn" maxlength="50" lay-verify="required|"
-                                            autocomplete="off" placeholder="请输入机具SN">
+                                        <input class="layui-input" type="text" id="PosSn" name="PosSn" maxlength="50"
+                                            lay-verify="required|" autocomplete="off" placeholder="请输入机具SN">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">商户编号</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="MerNo"
-                                            name="MerNo" maxlength="50" lay-verify="required|"
-                                            autocomplete="off" placeholder="请输入商户编号">
+                                        <input class="layui-input" type="text" id="MerNo" name="MerNo" maxlength="50"
+                                            lay-verify="required|" autocomplete="off" placeholder="请输入商户编号">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
@@ -73,7 +74,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,24 +86,25 @@
             var userdata = $("#confirmFrm").serialize();
             $.ajax({
                 type: "POST",
-                url: "/Admin/SysTools/SetMerAgentDo?r=" + Math.random(1),
+                url: "/Admin/SysTools/CancelMerAgentDo?r=" + Math.random(1),
                 data: userdata,
                 dataType: "text",
                 success: function (data) {
                     layer.close(index); //关闭弹层
                     if (data == "success") {
-                        layer.msg("重置成功");
+                        layer.msg("取消成功");
+                        window.location.reload();
                     } else {
                         layer.msg(data);
                     }
                 }
             });
         }
-        
-                    
+
+
         //编辑器
         KindEditor.ready(function (K) {
-            
+
         });
 
         var ids = "";
@@ -207,7 +210,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -227,30 +230,31 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
-            
+
 
             //穿梭框
-            
+
 
             //TreeView,比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

+ 25 - 21
Areas/Admin/Views/MainServer/SysTools/SetMerAgent.cshtml

@@ -1,20 +1,23 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>设置商户型创客</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
@@ -38,17 +41,15 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">机具SN</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="PosSn"
-                                            name="PosSn" maxlength="50" lay-verify="required|"
-                                            autocomplete="off" placeholder="请输入机具SN">
+                                        <input class="layui-input" type="text" id="PosSn" name="PosSn" maxlength="50"
+                                            lay-verify="required|" autocomplete="off" placeholder="请输入机具SN">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">商户编号</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="MerNo"
-                                            name="MerNo" maxlength="50" lay-verify="required|"
-                                            autocomplete="off" placeholder="请输入商户编号">
+                                        <input class="layui-input" type="text" id="MerNo" name="MerNo" maxlength="50"
+                                            lay-verify="required|" autocomplete="off" placeholder="请输入商户编号">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
@@ -73,7 +74,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>
@@ -90,18 +92,19 @@
                 success: function (data) {
                     layer.close(index); //关闭弹层
                     if (data == "success") {
-                        layer.msg("重置成功");
+                        layer.msg("设置成功");
+                        window.location.reload();
                     } else {
                         layer.msg(data);
                     }
                 }
             });
         }
-        
-                    
+
+
         //编辑器
         KindEditor.ready(function (K) {
-            
+
         });
 
         var ids = "";
@@ -207,7 +210,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -227,30 +230,31 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
-            
+
 
             //穿梭框
-            
+
 
             //TreeView,比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

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

@@ -91,8 +91,8 @@ layui.config({
         , url: '/Admin/SetMerchantTypeRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-            , { field: 'SnNo', width: 200, title: 'SN编号', sort: true }
-            , { field: 'BrandName', width: 200, title: '产品类型', sort: true }
+            , { field: 'PosSn', width: 200, title: 'SN编号', sort: true }
+            // , { field: 'BrandName', width: 200, title: '产品类型', sort: true }
             , { field: 'OperateTypeName', width: 200, title: '操作类别', sort: true }
             , { field: 'MerUserTypeName', width: 200, title: '商户型创客姓名', sort: true }
             , { field: 'MerUserTypeMakerCode', width: 200, title: '商户型创客编码', sort: true }