Merge remote-tracking branch 'origin/test' into test

xiejianpeng
2 parents c4c82500 16f7790b
Showing 2 changed files with 4 additions and 2 deletions
login/login.html
topages/login/login.js
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2">
     <link rel="stylesheet" href="../resource/public/commoncss.css?a=2">
     <link rel="stylesheet" href="../topages/login/login.css">
-    <script src="../resource/js/unit.js"></script>
+
 </head>
 <body>
@@ -27,7 +27,8 @@
 <script src="../resource/lib/jquery/jquery.min.js"></script>
+    <script src="../resource/js/unit.js"></script>
 <script src="../topages/login/login.js?a=1"></script>
-<script src="../resource/js/unit.js?a=1"></script>
+<!--<script src="../resource/js/unit.js?a=1"></script>-->
 </body>
 </html>
 \ No newline at end of file
@@ -38,6 +38,7 @@ var func ={
             dataType: 'json',
             success: function (res) {
                 if(res != null && res != '' && res !=undefined &&  res.code =='8888' ){
+
                     $('#login-errorifo').text('');
                     fn.setToken(res.data.accessToken);
                     fn.setUserName(res.data.userName);