Merge branch 'gitlink_server' of https://gitlink.org.cn/durian/forgeplus-react into feature_md

src/forge/Head/Header.js

@@ -51,11 +51,14 @@ class NewHeader extends Component {
     }
   }
   componentDidMount() {
-    // this.geturlsdata();
-    let settings = localStorage.chromesetting&&JSON.parse(localStorage.chromesetting);
-    this.setState({
-      settings
-    })
+    // 用personal判断是否需要再次请求settings接口，解决登录注册之后无设置按钮的情况
+    if(localStorage.chromesetting && localStorage.chromesetting.personal){
+      this.setState({
+        settings: JSON.parse(localStorage.chromesetting)
+      })
+    }else{
+      this.geturlsdata();
+    }
     window._header_componentHandler = this;
 
     try {

src/modules/loginRegister/LoginRegisterPage.scss

@@ -210,6 +210,9 @@
       line-height: 0.5;
     }
     .login_register_cofBut{margin-top: 0.5vh; }
+    .message.active{
+      margin: -5px 0 10px 0 !important;
+    }
   }
 
   //找回密码框样式

src/modules/loginRegister/Register.jsx

@@ -75,7 +75,7 @@ function Register(props){
   //判断邮箱/手机号是否符合规范、是否注册
   function emailConfirm(rule, value, callback) {
     if(value){
-      if((/(^(\d{3,4}-)?\d{7,8})$|([1][3,4,5,6,7,8,9][0-9]{9})/.test(value) && !registerType) || (/^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value) && registerType)){
+      if((/^([1][3456789])\d{9}$/.test(value) && !registerType) || (/^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value) && registerType)){
         setEmailGo(true);
         (emailGo || value !== emailStr) ? axios.get(`/accounts/valid_email_and_phone.json`, {
           params: {
@@ -90,7 +90,7 @@ function Register(props){
             callback();
           }else{
             setGetCaptchaBut(false);
-            callback(response.data.message);
+            callback(response.data.status === -2 ? `该${registerType ? '邮箱' : '手机号'}已被注册` : response.data.message);
           }
         }):callback();setEmailStr(undefined);
       }else{

src/modules/loginRegister/ResetPassword.jsx

@@ -58,7 +58,7 @@ function ResetPassword(props) {
 
   //判断邮箱/手机号是否符合规范、是否注册
   function emailConfirm(rule, value, callback) {
-    if(/(^(\d{3,4}-)?\d{7,8})$|([1][3,4,5,6,7,8,9][0-9]{9})/.test(value) || /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value)){
+    if(/^([1][3456789])\d{9}$/.test(value) || /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value)){
       setEmailGo(true);
       if(value && (emailGo || value !== emailStr)){
         axios.get(`/accounts/valid_email_and_phone.json`, {