From d4488a987cccd3ddd51a202a9f8aa71d3cdcbced Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Apr 2021 17:12:16 +0800
Subject: [PATCH] 20210423

---
 src/main/resources/templates/febs/views/modules/agent/agent.html |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/agent/agent.html b/src/main/resources/templates/febs/views/modules/agent/agent.html
index a213515..dc1c200 100644
--- a/src/main/resources/templates/febs/views/modules/agent/agent.html
+++ b/src/main/resources/templates/febs/views/modules/agent/agent.html
@@ -23,8 +23,8 @@
                                         <div class="layui-input-inline">
                                             <select name="accountType">
                                                 <option value=""></option>
-                                                <option value="1">测试账号</option>
-                                                <option value="2">正常账号</option>
+                                                <option value="2">测试账号</option>
+                                                <option value="1">正常账号</option>
                                             </select>
                                         </div>
                                     </div>
@@ -42,11 +42,10 @@
                                         <label class="layui-form-label layui-form-label-sm">实名状态</label>
                                         <div class="layui-input-inline">
                                             <select name="certifyStatus">
-                                                <option value=""></option>
-                                                <option value="0">未通过</option>
-                                                <option value="1">审核中</option>
+                                                <option value="">请选择</option>
+                                                <option value="1">待审核</option>
                                                 <option value="2">审核通过</option>
-                                                <option value="2">未实名</option>
+                                                <option value="3">未实名</option>
                                             </select>
                                         </div>
                                     </div>
@@ -79,8 +78,7 @@
 <script type="text/html" id="certify-status">
     {{#
     var certifyStatus = {
-    0: {title: '未实名', color: 'blue'},
-    1: {title: '未实名', color: 'blue'},
+    1: {title: '待审核', color: 'blue'},
     2: {title: '审核通过', color: 'green'},
     3: {title: '未实名', color: 'blue'}
     }[d.certifyStatus];
@@ -92,7 +90,7 @@
     var accountStatus = {
     1: {title: '正常', color : 'blue'},
     0: {title: '禁用', color : 'red'}
-    }[d.status];
+    }[d.accountStatus];
     }}
     <span class="layui-badge febs-bg-{{accountStatus.color}}">{{ accountStatus.title }}</span>
 </script>
@@ -232,10 +230,9 @@
         // 刷新按钮
         $reset.on('click', function () {
             $searchForm[0].reset();
-            sortObject.type = 'null';
             createTimeTo = null;
             createTimeFrom = null;
-            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+            tableIns.reload({where: $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type}), page: {curr: 1}});
         });
 
         $add.on('click', function() {
@@ -287,6 +284,8 @@
                 createTimeFrom = createTime.split(' - ')[0];
                 createTimeTo = createTime.split(' - ')[1];
             }
+            var accountStatus = $searchForm.find("select[name='accountStatus']").val();
+            console.log(accountStatus);
             return {
                 startTime: createTimeFrom,
                 endTime: createTimeTo,

--
Gitblit v1.9.1