Changed on Login Stuff and visibility control.

js/entrance.js

@@ -16,12 +16,11 @@ if(userId == null){
 }else{
     // 没问题
     // 是否存在
-
     var use = getCookie("doibyUser");
     if(use == null){
         // No Login
-    }else{
         location.href="sign-in1.html?from=entrance-2";
+    }else{
     }
 }
 

sign-in1.html

@@ -47,6 +47,8 @@
         <div class="logo">
             <a href="javascript:void(0);">工厂产能监控登陆</a>
         </div>
+        <div class="alert alert-warning" id="mpAlert" style="display:none">
+        </div>
         <div class="card">
             <div class="body">
                 <form id="sign_in" method="POST" onsubmit="return false;">
@@ -98,7 +100,7 @@
     function gotoLogin(){
         var password = $('input[name="password"]').val();
         var username = $('input[name="username"]').val();
-        get_data("/server/fcWorker/login?u=" + username +
+        get_data("/fcWorker/login?u=" + username +
                 "&p="+ password, onlogin_finish);
     }
 
@@ -109,7 +111,7 @@
 
         obj = first_parse(this, obj);
 
-        if(obj.list === undefined || obj.list.length < 1){
+        if(obj == undefined || obj == null || obj.list === undefined || obj.list == null || obj.list.length < 1){
             send_alert("用户名密码错误");
         }else{
             // TODO: 判断是否存在flowMaster，是否有权限