Browse Source

修改后台样式

邹景立 3 years ago
parent
commit
8695e8e7a2

+ 1 - 1
app/admin/controller/User.php

@@ -75,7 +75,7 @@ class User extends Controller
             }
             // 列表排序并显示
             $query->equal('status,usertype')->dateBetween('login_at,create_at');
-            $query->like('username,contact_phone#phone,contact_mail#mail')->layTable();
+            $query->like('username,nickname,contact_phone#phone,contact_mail#mail')->layTable();
         }
     }
 

+ 1 - 1
app/admin/view/user/form.html

@@ -33,7 +33,7 @@
             </div>
         </fieldset>
 
-        {if !empty($authorizes) && !empty($bases)}
+        {if !empty($authorizes) || !empty($bases)}
         <fieldset>
             <legend><b class="layui-badge think-bg-violet">用户权限</b></legend>
             {if !empty($bases)}

+ 1 - 1
app/admin/view/user/index.html

@@ -41,7 +41,7 @@
             cols: [[
                 {checkbox: true, fixed: true},
                 {field: 'sort', title: '排序权重', width: 100, align: 'center', sort: true, templet: '#SortInputTpl'},
-                {field: 'nickname', title: '用户名称', align: 'center', sort: false, templet: '<div>{{d.nickname||"-"}}</div>'},
+                {field: 'nickname', title: '用户名称', minWidth: 100, align: 'center', sort: false, templet: '<div>{{d.nickname||"-"}}</div>'},
                 {field: 'username', title: '登录账号', minWidth: 100, align: 'center', sort: true, templet: '<div>{{d.username||"-"}}</div>'},
                 {field: 'usertype', title: '角色身份', minWidth: 100, align: 'center', sort: true, templet: '<div>{{d.usertype||"-"}}</div>'},
                 {field: 'contact_mail', title: '联系邮箱', align: 'center', sort: false, templet: '<div>{{d.contact_mail||"-"}}</div>'},

+ 16 - 9
app/admin/view/user/index_search.html

@@ -2,7 +2,21 @@
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
 
-        {notempty name='bases'}
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">用户名称</label>
+            <label class="layui-input-inline">
+                <input name="nickname" value="{:input('get.nickname')}" placeholder="请输入用户名称" class="layui-input">
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">登录账号</label>
+            <label class="layui-input-inline">
+                <input name="username" value="{:input('get.username')}" placeholder="请输入登录账号" class="layui-input">
+            </label>
+        </div>
+
+        <!--{notempty name='bases'}-->
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">用户身份</label>
             <div class="layui-input-inline">
@@ -16,14 +30,7 @@
                 </select>
             </div>
         </div>
-        {/notempty}
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">用户账号</label>
-            <label class="layui-input-inline">
-                <input name="username" value="{:input('get.username')}" placeholder="请输入用户名" class="layui-input">
-            </label>
-        </div>
+        <!--{/notempty}-->
 
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">联系手机</label>

File diff suppressed because it is too large
+ 0 - 0
public/static/theme/css/console.css


File diff suppressed because it is too large
+ 0 - 0
public/static/theme/css/console.css.map


Some files were not shown because too many files changed in this diff