Commit 2b0ce64b44e142da6ccf68067553cbf50e681ad9
Merge remote-tracking branch 'origin/test' into test
Showing
2 changed files
with
4 additions
and
2 deletions
login/login.html
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2"> |
| 9 | 9 | <link rel="stylesheet" href="../resource/public/commoncss.css?a=2"> |
| 10 | 10 | <link rel="stylesheet" href="../topages/login/login.css"> |
| 11 | - <script src="../resource/js/unit.js"></script> | |
| 11 | + | |
| 12 | 12 | |
| 13 | 13 | </head> |
| 14 | 14 | <body> |
| ... | ... | @@ -27,7 +27,8 @@ |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | <script src="../resource/lib/jquery/jquery.min.js"></script> |
| 30 | + <script src="../resource/js/unit.js"></script> | |
| 30 | 31 | <script src="../topages/login/login.js?a=1"></script> |
| 31 | -<script src="../resource/js/unit.js?a=1"></script> | |
| 32 | +<!--<script src="../resource/js/unit.js?a=1"></script>--> | |
| 32 | 33 | </body> |
| 33 | 34 | </html> |
| 34 | 35 | \ No newline at end of file | ... | ... |
topages/login/login.js
| ... | ... | @@ -38,6 +38,7 @@ var func ={ |
| 38 | 38 | dataType: 'json', |
| 39 | 39 | success: function (res) { |
| 40 | 40 | if(res != null && res != '' && res !=undefined && res.code =='8888' ){ |
| 41 | + | |
| 41 | 42 | $('#login-errorifo').text(''); |
| 42 | 43 | fn.setToken(res.data.accessToken); |
| 43 | 44 | fn.setUserName(res.data.userName); | ... | ... |