Commit d1fc865bf71f3b7e6cceaa3fd4cc1e74b505c074
Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
Showing
2 changed files
with
3 additions
and
9 deletions
index/index.html
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | <header> | 22 | <header> |
| 23 | <div class="nav-bar-wrap"> | 23 | <div class="nav-bar-wrap"> |
| 24 | <div class="float-left login-name"> | 24 | <div class="float-left login-name"> |
| 25 | - <span id="loginName"></span> <span class="cursorpointer" id="logoutId">退出</span> | 25 | + <span id="loginShowName"></span> <span class="cursorpointer" id="logoutId">退出</span> |
| 26 | </div> | 26 | </div> |
| 27 | 27 | ||
| 28 | <nav class="float-right"> | 28 | <nav class="float-right"> |
resource/js/unit.js
| @@ -9,11 +9,8 @@ sysComm = { | @@ -9,11 +9,8 @@ sysComm = { | ||
| 9 | } | 9 | } |
| 10 | 10 | ||
| 11 | //阿里云测试环境，别删 | 11 | //阿里云测试环境，别删 |
| 12 | -// | ||
| 13 | -// var baseUrl = 'http://192.168.1.196:8088/';// url公用地址 | ||
| 14 | -// var parkcloudbaseUrl = 'http://192.168.1.196:8093/';// url公用地址 | ||
| 15 | -// var authUrl = 'http://192.168.1.196:8088/';// 鉴权URL公用地址s | ||
| 16 | 12 | ||
| 13 | +//var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 | ||
| 17 | 14 | ||
| 18 | var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 | 15 | var parkcloudbaseUrl = 'http://192.168.1.196:8100/';// url公用地址 |
| 19 | 16 | ||
| @@ -133,7 +130,6 @@ var fn ={ | @@ -133,7 +130,6 @@ var fn ={ | ||
| 133 | }, | 130 | }, |
| 134 | //登出系统 | 131 | //登出系统 |
| 135 | loginOut: function () { | 132 | loginOut: function () { |
| 136 | - debugger; | ||
| 137 | 133 | ||
| 138 | var token = fn.getToken(); | 134 | var token = fn.getToken(); |
| 139 | 135 | ||
| @@ -572,6 +568,4 @@ var commonClass = { | @@ -572,6 +568,4 @@ var commonClass = { | ||
| 572 | } | 568 | } |
| 573 | } | 569 | } |
| 574 | 570 | ||
| 575 | - | ||
| 576 | - | ||
| 577 | - | 571 | +$("#loginShowName").text(fn.getUserName()); |