Merge pull request !2 from zzlkk/master

pull/269678/MERGE
zzlkk 2017-04-24 23:23:53 +08:00 committed by Karson
commit 2d31c2072e
2 changed files with 9 additions and 1 deletions

View File

@ -2,6 +2,7 @@
namespace app\admin\controller\general; namespace app\admin\controller\general;
use think\Session;
use app\admin\model\AdminLog; use app\admin\model\AdminLog;
use app\common\controller\Backend; use app\common\controller\Backend;
use fast\Random; use fast\Random;
@ -62,6 +63,13 @@ class Profile extends Backend
{ {
model('admin')->where('id', $this->auth->id)->update($params); model('admin')->where('id', $this->auth->id)->update($params);
AdminLog::record(__('Update'), $params); AdminLog::record(__('Update'), $params);
//因为个人资料面板读取的Session显示修改自己资料后同时更新Session
$admin = Session::get('admin');
$admin_id = $admin ? $admin->id : 0;
if($this->auth->id==$admin_id){
$admin = model('admin')->get(['id' => $admin_id]);
Session::set("admin", $admin);
}
$this->code = 1; $this->code = 1;
} }
} }

View File

@ -91,7 +91,7 @@
<!-- Menu Footer--> <!-- Menu Footer-->
<li class="user-footer"> <li class="user-footer">
<div class="pull-left"> <div class="pull-left">
<a href="{:url('general.profile/index')}" class="btn btn-default btn-flat">{:__('Profile')}</a> <a href="{:url('general.profile/index')}" addtabs="" url="{:url('general.profile/index')}" class="btn btn-default btn-flat">{:__('Profile')}</a>
</div> </div>
<div class="pull-right"> <div class="pull-right">
<a href="{:url('index/logout')}" class="btn btn-default btn-flat">{:__('Logout')}</a> <a href="{:url('index/logout')}" class="btn btn-default btn-flat">{:__('Logout')}</a>