Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

Andy
2 parents cbd7c7e7 23d4952a
Showing 2 changed files with 3 additions and 9 deletions
index/index.html
resource/js/unit.js
@@ -22,7 +22,7 @@
 <header>
     <div class="nav-bar-wrap">
         <div class="float-left login-name">
-            <span id="loginName"></span>&nbsp;&nbsp;<span class="cursorpointer" id="logoutId">退出</span>
+            <span id="loginShowName"></span>&nbsp;&nbsp;<span class="cursorpointer" id="logoutId">退出</span>
         </div>
  
         <nav class="float-right">
@@ -9,11 +9,8 @@ sysComm = {
 }
  
 //阿里云测试环境，别删
-//
-// var baseUrl = 'http://192.168.1.196:8088/';// url公用地址
-//       var parkcloudbaseUrl = 'http://192.168.1.196:8093/';// url公用地址
-//       var authUrl = 'http://192.168.1.196:8088/';// 鉴权URL公用地址s
  
+//var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
  
 var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址
  
@@ -133,7 +130,6 @@ var fn ={
     },
     //登出系统
     loginOut: function () {
-        debugger;
  
         var token = fn.getToken();
  
@@ -572,6 +568,4 @@ var commonClass = {
     }
 }
  
-
-
-
+$("#loginShowName").text(fn.getUserName());