浏览代码

修改后台样式

Anyon 4 年之前
父节点
当前提交
c3a3c98518

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

@@ -102,7 +102,7 @@ class User extends Controller
                 'repassword.confirm:password' => '两次输入的密码不一致!'
             ]);
             if (data_save($this->table, ['id' => $data['id'], 'password' => md5($data['password'])], 'id')) {
-                $this->success('密码修改成功,下次请使用新密码登录!', '');
+                $this->success('密码修改成功,请使用新密码登录!', '');
             } else {
                 $this->error('密码修改失败,请稍候再试!');
             }

+ 7 - 4
app/admin/view/index/index.html

@@ -53,7 +53,10 @@
                     {/if}
                     <dd lay-unselect><a data-load="{:url('admin/login/out')}" data-confirm="确定要退出登录吗?"><i class="layui-icon layui-icon-release margin-right-5"></i> 退出登录</a></dd>
                 </dl>
-                <a><span><i class="layui-icon layui-icon-username margin-right-5"></i> {:session('user.username')}</span></a>
+                <a class="layui-elip">
+                    <img alt="headimg" src="{:session('user.headimg')?:'__ROOT__/static/theme/img/headimg.png'}">
+                    <span class="padding-left-5">{:session('user.nickname')?:session('user.username')}</span>
+                </a>
             </li>
             {else}
             <li class="layui-nav-item">
@@ -72,21 +75,21 @@
                 <li class="layui-nav-item">
                     <a data-target-tips="{$two.title}" data-menu-node="m-{$one.id}-{$two.id}" data-open="{$two.url}">
                         <span class='{$two.icon|default="layui-icon layui-icon-link"}'></span>
-                        <span class="nav-text padding-left-5">{$two.title}</span>
+                        <span class="nav-text padding-left-5">{$two.title|default=''}</span>
                     </a>
                 </li>
                 {else}
                 <li class="layui-nav-item" data-submenu-layout='m-{$one.id}-{$two.id}'>
                     <a data-target-tips="{$two.title}" style="background:#393D49">
                         <span class='nav-icon layui-hide {$two.icon|default="layui-icon layui-icon-triangle-d"}'></span>
-                        <span class="nav-text padding-left-5">{$two.title}</span>
+                        <span class="nav-text padding-left-5">{$two.title|default=''}</span>
                     </a>
                     <dl class="layui-nav-child">
                         {foreach $two.sub as $thr}
                         <dd>
                             <a data-target-tips="{$thr.title}" data-open="{$thr.url}" data-menu-node="m-{$one.id}-{$two.id}-{$thr.id}">
                                 <span class='nav-icon padding-left-5 {$thr.icon|default="layui-icon layui-icon-link"}'></span>
-                                <span class="nav-text padding-left-5">{$thr.title}</span>
+                                <span class="nav-text padding-left-5">{$thr.title|default=''}</span>
                             </a>
                         </dd>
                         {/foreach}

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

@@ -26,33 +26,32 @@
                 </label>
             </div>
         </div>
+        <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
         <div class="layui-row layui-col-space15">
             <div class="layui-col-xs4">
                 <label class="relative block">
-                    <span class="color-green font-w7">联系邮箱</span>
-                    <span class="color-desc margin-left-5">Email</span>
-                    <input name="contact_mail" autocomplete="off" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.contact_mail|default=""}' placeholder="请输入联系电子邮箱" class="layui-input">
+                    <span class="color-green font-w7">联系邮箱</span><span class="color-desc margin-left-5">Contact Email</span>
+                    <input name="contact_mail" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.contact_mail|default=""}' placeholder="请输入联系电子邮箱" class="layui-input">
                     <span class="color-desc">可选,请填写常用的电子邮箱</span>
                 </label>
             </div>
             <div class="layui-col-xs4">
                 <label class="relative block">
-                    <span class="color-green font-w7">联系手机</span>
-                    <span class="color-desc margin-left-5">Mobile</span>
-                    <input type="tel" maxlength="11" autocomplete="off" name="contact_phone" value='{$vo.contact_phone|default=""}' pattern="^1[3-9][0-9]{9}$" placeholder="请输入用户联系手机" class="layui-input">
+                    <span class="color-green font-w7">联系手机</span><span class="color-desc margin-left-5">Contact Mobile</span>
+                    <input type="tel" maxlength="11" name="contact_phone" value='{$vo.contact_phone|default=""}' pattern="^1[3-9][0-9]{9}$" placeholder="请输入用户联系手机" class="layui-input">
                     <span class="color-desc">可选,请填写常用的联系手机号</span>
                 </label>
             </div>
             <div class="layui-col-xs4">
                 <label class="relative block">
-                    <span class="color-green font-w7">联系QQ</span>
-                    <span class="color-desc margin-left-5">TencentQQ</span>
-                    <input name="contact_qq" autocomplete="off" pattern="^\d{6,}$" value='{$vo.contact_qq|default=""}' placeholder="请输入联系QQ" class="layui-input">
+                    <span class="color-green font-w7">联系QQ</span><span class="color-desc margin-left-5">Contact QQ</span>
+                    <input name="contact_qq" pattern="^\d{6,}$" value='{$vo.contact_qq|default=""}' placeholder="请输入常用的联系QQ" class="layui-input">
                     <span class="color-desc">可选,请填写常用的联系QQ号</span>
                 </label>
             </div>
         </div>
         {notempty name='authorizes'}
+        <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
         <div class="layui-form-item">
             <span class="color-green font-w7">访问权限</span>
             <span class="color-desc margin-left-5">Authorize</span>
@@ -75,6 +74,7 @@
             </div>
         </div>
         {/notempty}
+        <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
         <label class="layui-form-item block relative">
             <span class="color-green font-w7">用户描述</span><span class="color-desc margin-left-5">Description</span>
             <textarea placeholder="请输入用户描述" class="layui-textarea" name="describe">{$vo.describe|default=""}</textarea>

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

@@ -20,7 +20,7 @@
             </label>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">登录时间</label>
+            <label class="layui-form-label">最后登录</label>
             <div class="layui-input-inline">
                 <input data-date-range name="login_at" value="{:input('get.login_at')}" placeholder="请选择登录时间" class="layui-input">
             </div>

+ 1 - 3
app/admin/view/user/pass.html

@@ -39,12 +39,10 @@
             <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
         </div>
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗?" data-close>取消编辑</button>
     </div>
-</form>
+</form>

+ 5 - 0
public/static/theme/css/console.css

@@ -380,6 +380,11 @@ label.think-radio {
 .layui-header .layui-nav-item .layui-nav-child + a {
   padding-right: 35px;
 }
+.layui-header .layui-nav-item .layui-nav-child + a img {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+}
 .layui-header .layui-nav-item .layui-nav-child.layui-show + a {
   background: #fff;
 }

文件差异内容过多而无法显示
+ 0 - 0
public/static/theme/css/console.css.map


+ 6 - 0
public/static/theme/css/console.layout.less

@@ -82,6 +82,12 @@
         padding-right: 35px
       }
 
+      + a img {
+        width: 20px;
+        height: 20px;
+        border-radius: 50%
+      }
+
       &.layui-show + a {
         background: #fff
       }

+ 1 - 1
vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-06-01 16:22:21
+// This file is automatically generated at:2020-06-03 17:21:29
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',

部分文件因为文件数量过多而无法显示