调整

src/routes/Login.js

@@ -183,54 +183,51 @@ class LoginPage extends React.Component {
   toLogin = (requestCode = false) => {
     const { tokenData, formData } = this.state;
     const { orgId, username, password, phoneCode } = formData;
+    // this.props.dispatch({
+    //   type: "app/getDataByPost",
+    //   url: "BI/BIController/getVersion",
+    //   onComplete: (ret) => {
+    // if (ret > config.version) {
+    //   window.localStorage.clear();
+    //   message.success("清除成功，即将重新加载页面", 2, () => {
+    //     setTimeout(() => window.location.reload(true), 500);
+    //   });
+    // } else {
+    // }
+    //   },
+    // });
     this.props.dispatch({
-      type: "app/getDataByPost",
+      type: "login/toLogin",
-      url: "BI/BIController/getVersion",
+      payload: {
-      onComplete: (ret) => {
+        Parameter1: username,
-        // if (ret > config.version) {
+        Parameter2: MD5(password),
-        //   window.localStorage.clear();
+        Parameter4: orgId,
-        //   message.success("清除成功，即将重新加载页面", 2, () => {
+        Parameter5: storage("lacal").getItem("formConfigVersion").val,
-        //     setTimeout(() => window.location.reload(true), 500);
+        Parameter6: requestCode,
-        //   });
+        Parameter7: phoneCode,
-        // } else {
-          
-        // }
-        this.props
-        .dispatch({
-          type: "login/toLogin",
-          payload: {
-            Parameter1: username,
-            Parameter2: MD5(password),
-            Parameter4: orgId,
-            Parameter5: storage("lacal").getItem("formConfigVersion").val,
-            Parameter6: requestCode,
-            Parameter7: phoneCode,
-          },
-          loginPayload: {
-            username: username,
-            password: MD5(password),
-            accessToken: tokenData.access_token,
-            refreshToken: tokenData.refreshToken,
-            expiresIn: tokenData.expiresIn,
-            userid: tokenData.userid,
-          },
-        })
-        .then((validRes) => {
-          if (validRes) {
-            storage("lacal").setItem("verifyPhoneCode", tokenData.userid);
-            this.props.dispatch({
-              type: "app/getAllEnum",
-            });
-            if (window.navigator.userAgent.indexOf("Windows") < 1) {
-              window.location.replace(config.guideH5Host);
-            } else {
-              this.props.history.push({ pathname: "/home" });
-            }
-          }
-        });
-
       },
-    });
+      loginPayload: {
+        username: username,
+        password: MD5(password),
+        accessToken: tokenData.access_token,
+        refreshToken: tokenData.refreshToken,
+        expiresIn: tokenData.expiresIn,
+        userid: tokenData.userid,
+      },
+    })
+      .then((validRes) => {
+        if (validRes) {
+          storage("lacal").setItem("verifyPhoneCode", tokenData.userid);
+          this.props.dispatch({
+            type: "app/getAllEnum",
+          });
+          if (window.navigator.userAgent.indexOf("Windows") < 1) {
+            window.location.replace(config.guideH5Host);
+          } else {
+            this.props.history.push({ pathname: "/home" });
+          }
+        }
+      });
   };
 
   preLogin = () => {
@@ -336,9 +333,8 @@ class LoginPage extends React.Component {
             {/* <span className='login-page__login-en'>LOGIN</span> */}
             <div className="login-page__login-box">
               <div
-                className={`login-page__login-formWrap ${
+                className={`login-page__login-formWrap ${isCheckPhoneCode === true ? "showPhoneCode" : ""
-                  isCheckPhoneCode === true ? "showPhoneCode" : ""
+                  }`}
-                }`}
               >
                 <Form className="login-page__login-form">
                   <Form.Item validateStatus={orgId} style={{ display: "none" }}>
@@ -451,9 +447,8 @@ class LoginPage extends React.Component {
                           type="primary"
                           onClick={this.getPhoneCode}
                           className="login-page__login-verifyCode"
-                        >{`${
+                        >{`${checkTime > 0 ? checkTime + "s后" : ""
-                          checkTime > 0 ? checkTime + "s后" : ""
+                          }再次发送`}</Button>
-                        }再次发送`}</Button>
                       }
                       placeholder="请输入短信验证码"
                       className="login-page__login-input"