From 51b23427208736fb7f74a062046304652a79226c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 13 Feb 2017 16:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=8F=B0=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Login.php |  1 +
 application/extra/view/admin.top.html  | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index 8c8bfdf78..c5fd48ad3 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -13,6 +13,7 @@ use think\Db;
  */
 class Login extends BasicAdmin {
 
+
     /**
      * 控制器基础方法
      */
diff --git a/application/extra/view/admin.top.html b/application/extra/view/admin.top.html
index f38b7ac97..63d1e3ad1 100644
--- a/application/extra/view/admin.top.html
+++ b/application/extra/view/admin.top.html
@@ -2,10 +2,9 @@
     <div class="console-topbar">
         <div class="topbar-wrap topbar-clearfix">
             <div class="topbar-head topbar-left">
-                <a href="<{''|site_url}>" class="topbar-logo topbar-left">
+                <a href="{:url('@admin')}" class="topbar-logo topbar-left">
                     <span class="icon-logo">{:sysconf('app_name')}</span>
                 </a>
-
             </div>
             <div class="topbar-info topbar-right">
                 <a data-reload data-tips-text='刷新' class=" topbar-btn topbar-left topbar-info-item text-center"
@@ -15,23 +14,24 @@
                 <div class="topbar-left topbar-user">
                     <div class="dropdown topbar-info-item">
                         <a href="#" class="dropdown-toggle topbar-btn text-center" data-toggle="dropdown">
-                            <span><span
-                                    class='glyphicon glyphicon-user'></span> <{$Think.session.user.username}></span>
-                            <span class="glyphicon glyphicon glyphicon-menu-up transition-min"
-                                  style="font-size:12px"></span>
+                            <span class='glyphicon glyphicon-user'></span> {:session('user.username')} </span>
+                            <span class="glyphicon glyphicon-menu-up transition" style="font-size:12px"></span>
                         </a>
                         <ul class="dropdown-menu">
                             <li class="topbar-info-btn">
-                                <a data-title=" " data-iframe="{:url('admin/main/password')}"><span><span
-                                        class='glyphicon glyphicon-edit'></span> 修改密码</span></a>
+                                <a data-title=" " data-iframe="{:url('admin/main/password')}">
+                                    <span><i class='glyphicon glyphicon-edit'></i> 修改密码</span>
+                                </a>
                             </li>
                             <li class="topbar-info-btn">
-                                <a data-title=" " data-iframe="{:url('admin/main/myinfo')}>"><span><span
-                                        class='glyphicon glyphicon-edit'></span> 修改资料</span></a>
+                                <a data-title=" " data-iframe="{:url('admin/main/myinfo')}>">
+                                    <span><i class='glyphicon glyphicon-edit'></i> 修改资料</span>
+                                </a>
                             </li>
                             <li class="topbar-info-btn">
-                                <a data-load="{:url('admin/login/out')}"><span><span
-                                        class="glyphicon glyphicon-log-out"></span> 退出登录</span></a>
+                                <a data-load="{:url('admin/login/out')}">
+                                    <span><i class="glyphicon glyphicon-log-out"></i> 退出登录</span>
+                                </a>
                             </li>
                         </ul>
                     </div>