From 97625a076d4d30a649d15d5ac4f650418d9f7c0c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 22 Jul 2020 14:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/auth/form.html   |  4 ++--
 app/admin/view/auth/index.html  | 31 ++++++++++++-------------------
 app/admin/view/oplog/index.html |  2 +-
 app/admin/view/user/index.html  | 12 ++++++------
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/app/admin/view/auth/form.html b/app/admin/view/auth/form.html
index 75825ea37..69ec4ad01 100644
--- a/app/admin/view/auth/form.html
+++ b/app/admin/view/auth/form.html
@@ -3,13 +3,13 @@
     <div class="layui-card-body padding-left-40">
 
         <label class="layui-form-item relative block">
-            <span class="color-green font-w7">访问权限名称</span><span class="color-desc margin-left-5">Permission Name</span>
+            <span class="color-green font-w7">访问权限名称</span><span class="color-desc margin-left-5">PermissionName</span>
             <input type="text" name="title" value='{$vo.title|default=""}' required placeholder="请输入访问权限名称" class="layui-input">
             <span class="help-block">权限名称需要保持不重复，在给用户授权时需要根据名称选择！</span>
         </label>
 
         <label class="layui-form-item relative block">
-            <span class="color-green font-w7">访问权限描述</span><span class="color-desc margin-left-5">Permission Description</span>
+            <span class="color-green font-w7">访问权限描述</span><span class="color-desc margin-left-5">PermissionDescription</span>
             <textarea placeholder="请输入访问权限描述" class="layui-textarea" name="desc">{$vo.desc|default=""}</textarea>
         </label>
 
diff --git a/app/admin/view/auth/index.html b/app/admin/view/auth/index.html
index 068b84e30..5233aaf64 100644
--- a/app/admin/view/auth/index.html
+++ b/app/admin/view/auth/index.html
@@ -13,7 +13,6 @@
 {/block}
 
 {block name="content"}
-
 <div class="think-box-shadow table-block">
     {include file='auth/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
@@ -23,7 +22,8 @@
             <th class='list-table-check-td think-checkbox'>
                 <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
             </th>
-            <th class='text-left nowrap'>权限信息</th>
+            <th class='text-left nowrap'>权限名称</th>
+            <th class='text-left nowrap'>权限描述</th>
             <th class='text-left nowrap'>创建时间</th>
             <th class="text-center nowrap">使用状态</th>
             <th></th>
@@ -31,42 +31,35 @@
         </thead>
         {/notempty}
         <tbody>
-        {foreach $list as $key=>$vo}
+        {foreach $list as $key => $vo}
         <tr data-dbclick>
             <td class='list-table-check-td think-checkbox'>
                 <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
-            <td class='text-left'>
-                权限名称：{$vo.title|default='-'}<br>
-                <p class="color-desc">权限描述：{$vo.desc|default="没有写描述哦！"}</p>
-            </td>
-            <td class="text-left nowrap">
-                日期：{$vo.create_at|format_datetime|str_replace=' ','<br><span class="color-desc">时间：',###|raw}</span>
-            </td>
-            <td class='text-center nowrap'>
-                {eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}
-            </td>
+            <td class='text-left'>{$vo.title|default='-'}</td>
+            <td class='text-left'>{$vo.desc|default="没有写描述哦！"}</td>
+            <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
+            <td class='text-center nowrap'>{eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}</td>
             <td class='text-center nowrap'>
 
                 {if auth("edit")}
-                <span class="text-explode">|</span>
-                <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑权限" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                <a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑权限" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
                 {/if}
 
                 {if auth("apply")}
-                <a class="layui-btn layui-btn-normal layui-btn-sm" data-open='{:url("apply")}?id={$vo.id}'>授 权</a>
+                <a class="layui-btn layui-btn-normal layui-btn-xs" data-open='{:url("apply")}?id={$vo.id}'>授 权</a>
                 {/if}
 
                 {if $vo.status eq 1 and auth("state")}
-                <a class="layui-btn layui-btn-warm layui-btn-sm" data-confirm="确定禁用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
+                <a class="layui-btn layui-btn-warm layui-btn-xs" data-confirm="确定禁用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
                 {/if}
 
                 {if $vo.status eq 0 and auth("state")}
-                <a class="layui-btn layui-btn-warm layui-btn-sm" data-confirm="确定启用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">启 用</a>
+                <a class="layui-btn layui-btn-warm layui-btn-xs" data-confirm="确定启用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">启 用</a>
                 {/if}
 
                 {if auth("remove")}
-                <a class="layui-btn layui-btn-danger layui-btn-sm" data-confirm="确定要删除权限吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                <a class="layui-btn layui-btn-danger layui-btn-xs" data-confirm="确定要删除权限吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
                 {/if}
 
             </td>
diff --git a/app/admin/view/oplog/index.html b/app/admin/view/oplog/index.html
index aa03fb16f..1f81a63bf 100644
--- a/app/admin/view/oplog/index.html
+++ b/app/admin/view/oplog/index.html
@@ -52,7 +52,7 @@
             </td>
             <td class='text-left nowrap'>
                 {if auth("remove")}
-                <a data-dbclick class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该日志吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                <a data-dbclick class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要删除该日志吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
                 {/if}
             </td>
         </tr>
diff --git a/app/admin/view/user/index.html b/app/admin/view/user/index.html
index abf18cbca..9ce104e97 100644
--- a/app/admin/view/user/index.html
+++ b/app/admin/view/user/index.html
@@ -81,23 +81,23 @@
                 <td class='text-left nowrap'>
                     {if isset($type) and $type eq 'all'}
                     <!--{if auth("pass")}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-normal" data-title="设置密码" data-modal='{:url("pass")}?id={$vo.id}'>密 码</a>
+                    <a class="layui-btn layui-btn-xs layui-btn-normal" data-title="设置密码" data-modal='{:url("pass")}?id={$vo.id}'>密 码</a>
                     <!--{/if}-->
                     <!--{if auth("edit")}-->
-                    <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑用户" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                    <a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑用户" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
                     <!--{/if}-->
                     <!--{if auth("state") and $vo.status eq 1}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-warm" data-confirm="确定要禁用该禁用账号吗?" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
+                    <a class="layui-btn layui-btn-xs layui-btn-warm" data-confirm="确定要禁用该禁用账号吗?" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
                     <!--{/if}-->
                     {else}
                     <!--{if auth("edit")}-->
-                    <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑用户" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                    <a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑用户" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
                     <!--{/if}-->
                     <!--{if auth("state") and $vo.status eq 0}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-warm" data-confirm="确定要恢复该账号吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">恢 复</a>
+                    <a class="layui-btn layui-btn-xs layui-btn-warm" data-confirm="确定要恢复该账号吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">恢 复</a>
                     <!--{/if}-->
                     <!--{if auth("remove")}-->
-                    <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要永久删除此账号吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                    <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要永久删除此账号吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
                     <!--{/if}-->
                     {/if}
                 </td>