Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote

Application/Admin/Model/PromoteModel.class.php

@@ -161,6 +161,15 @@ class PromoteModel extends Model{
         session('promote_auth_sign', data_auth_sign($auth));
 
     }
+
+    /**
+     * 退出登录
+     */
+    public function logout(){
+        session('promote_auth', null);
+        session('promote_auth_sign', null);
+        session('game_divide_second_pwd', null);
+    }
     
     /**
      * 验证用户密码

Application/Home/Controller/IndexController.class.php

@@ -283,4 +283,13 @@ class IndexController extends HomeController
         $this->assign('data', $data);
         $this->display();
     }
+
+    /**
+     * 退出登录
+     */
+    public function logout(){
+        $Promote = new PromoteApi();
+        $Promote->logout();
+        redirect(U('Index/index'));
+    }
 }

Application/Home/View/default/Public/promote_base.html

@@ -148,7 +148,7 @@
 			<div class="header-right">
 				<span class="pinfo jstime">今天是：<span></span></span>
 				<span class="pinfo">您好！{:session('promote_auth.account')}</span>
-				<a class="pinfo" href="{:U('Public/logout')}" ><img src="__IMG__/20180207/icon_normal_tuichu.png"><!--{:L('Quit')}--></a>
+				<a class="pinfo" href="{:U('Index/logout')}" ><img src="__IMG__/20180207/icon_normal_tuichu.png"><!--{:L('Quit')}--></a>
 			</div>
 		</div>
 		<!--结束 头部个人信息-->

Application/User/Api/PromoteApi.class.php

@@ -76,6 +76,13 @@ class PromoteApi extends Api{
     public function login($username, $password){
         return $this->model->login($username, $password);
     }
+
+    /**
+     * 退出登录
+     */
+    public function logout(){
+        $this->model->logout();
+    }
     
     /**
     *添加推广员