Home Explore
原型工具、Api管理、Bug管理等 更多工具
 团队协作  快速原型  自动标注  Bug管理  Api管理
Sign In
zhuliang
/
DocSys
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更改用户名必须为邮箱

zhuliang 7 years ago
parent
2358bd659b
commit
e9c7cee473
6 changed files with 56 additions and 46 deletions
Split View Show Diff Stats
  1. 1 1
      web/index.html
  2. 1 1
      web/static/css/app.d1a553d1e84b4c2cd5cfad51315a3d00.css
  3. 0 1
      web/static/js/app.40622d14219150cf0842.js
  4. 1 0
      web/static/js/app.acd85f0a49a20f855119.js
  5. 29 24
      web_src/src/components/user/Login.vue
  6. 24 19
      web_src/src/components/user/Register.vue

+ 1 - 1
web/index.html
View File 

@@ -4,4 +4,4 @@
 
       "server": window.location.protocol +'//'+ window.location.host + window.location.pathname+ '../server/index.php?s=',
 
       //"lang" :'en'
 
       "lang" :'zh-cn'
 
-  }</script><link href=./static/css/app.d1a553d1e84b4c2cd5cfad51315a3d00.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c40e244d08e2558b4f27.js></script><script type=text/javascript src=./static/js/app.40622d14219150cf0842.js></script></body></html>
 
+  }</script><link href=./static/css/app.7103dddb3d7863ff1182db241ed8d777.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c40e244d08e2558b4f27.js></script><script type=text/javascript src=./static/js/app.acd85f0a49a20f855119.js></script></body></html>

File diff suppressed because it is too large
+ 1 - 1
web/static/css/app.d1a553d1e84b4c2cd5cfad51315a3d00.css


File diff suppressed because it is too large
+ 0 - 1
web/static/js/app.40622d14219150cf0842.js


File diff suppressed because it is too large
+ 1 - 0
web/static/js/app.acd85f0a49a20f855119.js


+ 29 - 24
web_src/src/components/user/Login.vue
View File 

@@ -59,30 +59,35 @@ export default {
 
   methods: {
 
       onSubmit() {
 
           //this.$message.success(this.username);
 
-          var that = this ;
 
-          var url = DocConfig.server+'/api/user/login';
 
-          var params = new URLSearchParams();
 
-          params.append('username', this.username);
 
-          params.append('password', this.password);
 
-          params.append('v_code', this.v_code);
 
-
 
-          that.axios.post(url, params)
 
-            .then(function (response) {
 
-              if (response.data.error_code === 0 ) {
 
-                //that.$message.success("登录成功");
 
-                let redirect = decodeURIComponent(that.$route.query.redirect || '/item/index');
 
-                that.$router.replace({
 
-                  path: redirect
 
-                });
 
-              }else{
 
-                if (response.data.error_code === 10206 || response.data.error_code === 10210) {
 
-                  that.show_v_code = true ;
 
-                  that.change_v_code_img() ;
 
-                };
 
-                that.$alert(response.data.error_message);
 
-              }
 
-              
-            });
 
+          var mailReg = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
 
+          if (mailReg.test(this.username)) {
 
+              var that = this ;
 
+              var url = DocConfig.server+'/api/user/login';
 
+              var params = new URLSearchParams();
 
+              params.append('username', this.username);
 
+              params.append('password', this.password);
 
+              params.append('v_code', this.v_code);
 
+
 
+              that.axios.post(url, params)
 
+                  .then(function (response) {
 
+                      if (response.data.error_code === 0 ) {
 
+                          //that.$message.success("登录成功");
 
+                          let redirect = decodeURIComponent(that.$route.query.redirect || '/item/index');
 
+                          that.$router.replace({
 
+                              path: redirect
 
+                          });
 
+                      }else{
 
+                          if (response.data.error_code === 10206 || response.data.error_code === 10210) {
 
+                              that.show_v_code = true ;
 
+                              that.change_v_code_img() ;
 
+                          };
 
+                          that.$alert(response.data.error_message);
 
+                      }
 
+
 
+                  });
 
+          } else {
 
+              this.$message.error('用户名必须是邮箱');
 
+          }
 
       },
 
       change_v_code_img(){
 
         var rand = '&rand='+Math.random();

+ 24 - 19
web_src/src/components/user/Register.vue
View File 

@@ -63,25 +63,30 @@ export default {
 
   methods: {
 
       onSubmit() {
 
           //this.$message.success(this.username);
 
-          var that = this ;
 
-          var url = DocConfig.server+'/api/user/register';
 
-
 
-          var params = new URLSearchParams();
 
-          params.append('username', this.username);
 
-          params.append('password', this.password);
 
-          params.append('confirm_password', this.confirm_password);
 
-          params.append('v_code', this.v_code);
 
-
 
-          that.axios.post(url, params)
 
-            .then(function (response) {
 
-              if (response.data.error_code === 0 ) {
 
-                //that.$message.success("注册成功");
 
-                that.$router.push({path:'/item/index'});
 
-              }else{
 
-                that.$alert(response.data.error_message);
 
-              }
 
-              
-            });
 
+          var mailReg = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
 
+          if (mailReg.test(this.username)) {
 
+              var that = this ;
 
+              var url = DocConfig.server+'/api/user/register';
 
+
 
+              var params = new URLSearchParams();
 
+              params.append('username', this.username);
 
+              params.append('password', this.password);
 
+              params.append('confirm_password', this.confirm_password);
 
+              params.append('v_code', this.v_code);
 
+
 
+              that.axios.post(url, params)
 
+                  .then(function (response) {
 
+                      if (response.data.error_code === 0 ) {
 
+                          //that.$message.success("注册成功");
 
+                          that.$router.push({path:'/item/index'});
 
+                      }else{
 
+                          that.$alert(response.data.error_message);
 
+                      }
 
+
 
+                  });
 
+          } else {
 
+              this.$message.error('用户名必须是邮箱');
 
+          }
 
       },
 
       change_v_code_img(){
 
         var rand = '&rand='+Math.random();