Merge branch 'master' of http://smartcost.f3322.net:3000/caiaolin/Calculation

app/view/login/login.ejs

@@ -14,20 +14,20 @@
     <!--演示版-->
     <form class="form-signin" method="post" action="/login">
         <h1 class="d-flex justify-content-center mb-4">计量支付</h1>
-        <nav class="nav nav-tabs nav-justified mb-3" role="tablist" id="login-tab">
-            <a class="nav-item nav-link active" data-toggle="tab" data-type="1" href="#preview" role="tab">演示版登录</a>
-            <a class="nav-item nav-link" data-toggle="tab" data-type="2" href="#paid" role="tab">项目版登录</a>
-        </nav>
+        <!--<nav class="nav nav-tabs nav-justified mb-3" role="tablist" id="login-tab">-->
+            <!--<a class="nav-item nav-link" data-toggle="tab" data-type="1" href="#preview" role="tab">演示版登录</a>-->
+            <!--<a class="nav-item nav-link active" data-toggle="tab" data-type="2" href="#paid" role="tab">项目版登录</a>-->
+        <!--</nav>-->
         <div class="tab-content">
-            <div class="tab-pane active" id="preview" role="tabpanel">
-                <div class="form-group <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">
-                    <input id="username" name="username" class="form-control " placeholder="通行账号 邮箱/手机" value="laiku123@qq.com" autofocus="">
-                </div>
-                <div class="form-group <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">
-                    <input id="password" name="password" class="form-control " placeholder="输入密码" value="19930523" type="password">
-                </div>
-            </div>
-            <div class="tab-pane" id="paid" role="tabpanel">
+            <!--<div class="tab-pane active" id="preview" role="tabpanel">-->
+                <!--<div class="form-group <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">-->
+                    <!--<input id="username" name="username" class="form-control " placeholder="通行账号 邮箱/手机" value="laiku123@qq.com" autofocus="">-->
+                <!--</div>-->
+                <!--<div class="form-group <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">-->
+                    <!--<input id="password" name="password" class="form-control " placeholder="输入密码" value="19930523" type="password">-->
+                <!--</div>-->
+            <!--</div>-->
+            <div class="tab-pane active" id="paid" role="tabpanel">
                 <div class="form-group <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">
                     <input id="project" class="form-control" name="project" placeholder="项目编号" autofocus="" />
                 </div>
@@ -47,7 +47,7 @@
         <div class="form-group">
             <button class="btn btn-primary btn-block" type="submit">登录</button>
             <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
-            <input type="hidden" name="type" value="1" />
+            <input type="hidden" name="type" value="2" />
         </div>
         <div class="pt-1 d-flex justify-content-center">
             <a href="http://sso.smartcost.com.cn/getpasswd" target="_blank" class="mr-3">忘记密码</a>
@@ -69,16 +69,16 @@ $(document).ready(function() {
         type = isNaN(type) || type <= 0 ? 1 : type;
         $("input[name='type']:hidden").val(type);
     });
-    $('#username').blur(function () {
-        let account = $(this).val();
-        // 判断输入的邮箱/手机是否格式正确
-        if(/^1[3456789]\d{9}$/.test(account) || /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/.test(account)) {
-            $('#error-msg').hide();
-        } else {
-            $('#error-msg').show();
-            $('#error-msg').text('账号格式有误');
-        }
-    })
+    // $('#username').blur(function () {
+    //     let account = $(this).val();
+    //     // 判断输入的邮箱/手机是否格式正确
+    //     if(/^1[3456789]\d{9}$/.test(account) || /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/.test(account)) {
+    //         $('#error-msg').hide();
+    //     } else {
+    //         $('#error-msg').show();
+    //         $('#error-msg').text('账号格式有误');
+    //     }
+    // })
 });
 </script>
 </body>