Ver Fonte

feat: 支持账户名 + 密码登录

zhangyuhan há 1 ano atrás
pai
commit
bbee3d129c

+ 23 - 8
src/web/staticres/js/login.js

@@ -1049,12 +1049,23 @@ $(function(){
             }
             $.post("/phone/login",payload,function(r){
                 e.setAttribute('data-loading', 'false')
-                if(r.status==1){
-                  logic(r.userInfo,mynum);
-                }else if(r.status==-1){
-                  arr[0].showError('该手机号未注册')
-                }else if(r.status==-2){
-                  arr[1].showError('密码输入错误')
+                switch (r.status) {
+                  case -1: {
+                    arr[0].showError('该手机号未注册')
+                    break
+                  }
+                  case -3: {
+                    arr[0].showError('手机号或账号名输入错误')
+                    break
+                  }
+                  case 1: {
+                    logic(r.userInfo,mynum);
+                    break
+                  }
+                  case -2: {
+                    arr[1].showError('密码输入错误')
+                    break
+                  }
                 }
             });
         },
@@ -1330,9 +1341,13 @@ $(function(){
     }
 
     // 表单规则
+   function ruleForPhoneOrName (data, type) {
+      return true
+   }
+
     function ruleForPhone (data, type) {
     		var phoneReg = /^[1][3-9][0-9]{9}$/.test(data.value);
-		var createPhoneReg =/^[1][0][0][0-9]{8}$/.test(data.value);
+		    var createPhoneReg =/^[1][0][0][0-9]{8}$/.test(data.value);
         var checkStatus =  phoneReg || createPhoneReg;
         if (type === 'input') {
             return data.value.length >= 11 ? checkStatus : true
@@ -1680,7 +1695,7 @@ $(function(){
         }
         var passPhone = createFormStauts({
             el: '.login-dig-input-box input[name="pass_phone"]',
-            rule: ruleForPhone,
+            rule: ruleForPhoneOrName,
             event: ['input', 'blur'],
             upStatus: function () {
                 passSubmit.check()

+ 3 - 4
src/web/templates/common/pc-login-dialog.html

@@ -76,15 +76,14 @@
       </div>
       <!-- 密码登录 -->
       <div class="login-dig-tabbar-content login-module-card password-login" data-name="pass">
-        <div class="login-dig-input-box" data-error="手机号输入错误">
+        <div class="login-dig-input-box" data-error="手机号或账号名输入错误">
           <i class="login-dig-icon-phone"></i>
           <input
             autocomplete="off"
             class="enter-action-login"
             name="pass_phone"
-            type="tel"
-            placeholder="输入手机号码"
-            maxlength="11"
+            type="text"
+            placeholder="请输入手机号或账号名"
           />
         </div>
         <div class="login-dig-input-box" data-error="密码输入错误">