From 909cfbfbd93f14080b0686c3f4f53eb75a6a3871 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Tue, 31 Jul 2018 15:37:35 +0800
Subject: [PATCH] 登录模块提交

---
 index/index.html             |  3 ++-
 resource/js/unit.js          | 38 +++++++++++++++++++++++++++++---------
 topages/login/login.js       |  1 -
 topages/workfill/workfill.js | 11 ++++++++++-
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/index/index.html b/index/index.html
index eae2d09..87c1344 100644
--- a/index/index.html
+++ b/index/index.html
@@ -22,7 +22,7 @@
 <header>
     <div class="nav-bar-wrap">
         <div class="float-left login-name">
-            <span id="">张志涛</span>&nbsp;&nbsp;<span class="cursorpointer">退出</span>
+            <span id="loginName">张志涛</span>&nbsp;&nbsp;<span class="cursorpointer" id="logoutId">退出</span>
         </div>
 
         <nav class="float-right">
@@ -52,6 +52,7 @@
 <script src="../resource/lib/jqueryform/jquery.form.js"></script>
 
 <script src="../topages/topagesTmp.js?a=1"></script>
+<script src="../resource/js/unit.js?a=1"></script>
 <!--<script src="../topages/workquery/workquery.js"></script>-->
 </body>
 </html>
\ No newline at end of file
diff --git a/resource/js/unit.js b/resource/js/unit.js
index d5138d0..1e83525 100644
--- a/resource/js/unit.js
+++ b/resource/js/unit.js
@@ -36,6 +36,9 @@ dataUrl.util = {
     login: function () {
         return parkcloudbaseUrl + 'oauth/login';
     },
+    getLoginOut:function(){
+        return parkcloudbaseUrl + 'oauth/loginout';
+    }
 
 
 
@@ -104,16 +107,33 @@ var fn ={
     },
     //登出系统
     loginOut: function () {
-        sessionStorage.clear()
+        debugger;
+
         var token = fn.getToken();
-        fn.setToken('');
-        if (StrUtil.isNotEmpty()) {
-            var req = {'token': token, 'url': dataUrl.util.getLoginOut()}
-            sysAjax(req);
+
+        if (token != "" && token != null) {
+
+            var opt = {
+                method: "post",
+                url: dataUrl.util.getLoginOut(),
+                success: function(res){
+                    sessionStorage.clear()
+                    fn.setToken('');
+                    fn.toLoginPage();
+
+                }
+            };
+            sysAjax(opt);
+
 
         }
-        fn.toLoginPage();
-    }
+
+    },
+    //跳转到登录界面
+    toLoginPage: function () {
+        sessionStorage.setItem("sys_parkLot", '');
+        window.location.href = '../login/login.html'
+    },
 };
 
 DateUtil = {
@@ -270,8 +290,8 @@ function sysAjax(opts) {
         beforeSend: function (xhr) {
             //设置请求头
             //xhr.setRequestHeader("User-Agent", "headertest");
-            //console.log(JSON.stringify(sysComm));
-            xhr.setRequestHeader("x-auth-token", fn.getToken());
+            console.log(fn.getToken());
+            xhr.setRequestHeader("X-Auth-Token", fn.getToken());
         },
         success: function (res, status, xhr) {
             //console.log('获取header:'+xhr.getAllResponseHeaders());
diff --git a/topages/login/login.js b/topages/login/login.js
index 0fb3b2b..2676938 100644
--- a/topages/login/login.js
+++ b/topages/login/login.js
@@ -63,7 +63,6 @@ var func ={
     },
     /**初始化*/
     init:function(){
-        debugger;
         func.userLogin();
     }
 };
diff --git a/topages/workfill/workfill.js b/topages/workfill/workfill.js
index a9cc26a..48a59a3 100644
--- a/topages/workfill/workfill.js
+++ b/topages/workfill/workfill.js
@@ -5,7 +5,8 @@ var weekOfday = Number(moment().format('E'));//计算今天是这周第几天
 var clicknum = 0;//定义上下周点击次数
 var fun = {
     init:function () {
-
+        debugger;
+        $("#loginName").text(fn.getUserName());
         //初始化项目
         $('.work-projectName').selectpicker('render');
         //获取本周时间
@@ -13,6 +14,8 @@ var fun = {
         // 获取今天时间
         var todaytime  = moment().subtract('days', 0).format('YYYY/MM/DD');
         $('#time-opr-nowtime').text(todaytime);
+        //
+        fun.logout();
     },
     timeoprprevbtn:function () {
         $('#time-opr-nextbtn').removeClass('display-none');
@@ -37,6 +40,12 @@ var fun = {
 
 
     },
+    //退出
+    logout:function(){
+       $(document).on('click','#logoutId',function(){
+           fn.loginOut();
+       });
+    }
 };
 fun.init();
 // 上一周点击time-opr-prevbtn
--
libgit2 0.21.4