Преглед на файлове

fix: 修复登录页面输入空格问题

周玉环 преди 4 дни
родител
ревизия
ce9774fb11
променени са 1 файла, в които са добавени 45 реда и са изтрити 42 реда
  1. 45 42
      xinkeaboard-seller/src/pages/User/Login.js

+ 45 - 42
xinkeaboard-seller/src/pages/User/Login.js

@@ -143,52 +143,55 @@ export default class LoginPage extends Component {
   //登录操作
   handleSubmits = () => {
     this.props.form.validateFieldsAndScroll(['username', 'password', 'verifyCode'], (err, values) => {
-      if (err) {
-        if (values.username == undefined || values.username == '') {
-          failTip(`${sldComLanguage('用户名不能为空')}`);
-        } else if (values.password == undefined || values.password == '') {
-          failTip(`${sldComLanguage('密码不能为空')}`);
-        } else if (values.verifyCode == undefined || values.verifyCode == '') {
-          failTip(`${sldComLanguage('验证码不能为空')}`);
-        }
-      } else {
-        //用户登录
-        values.verifyKey = this.login_captcha;
-        const { dispatch } = this.props;
-        this.setState({loginLoading: true})
-        dispatch({
-          type: 'login/login',
-          payload: { ...values },
-          callback: (res) => {
-            if (res.state == 200 || res.state == 267) {
-              localStorage.setItem('sld_token', res.data.access_token);
-              localStorage.setItem('sld_refresh_token', res.data.refresh_token);
-              {
-                setLocalStorageTime();
-              }
-              localStorage.setItem('user_info', JSON.stringify({ user_name: res.data.vendorName, vendorMobile: res.data.vendorMobile }));
-              if (res.state == 267) {
-                //登录的时候初始化入驻状态
-                if (res.data.applyState == 0) {
-                  //未入驻
-                  saveSettleData('state', '');
-                  saveSettleData('cur_step', 0);
-                  router.push('/apply/settled_protocol');
-                } else {
-                  saveSettleData('cur_step', 3);
-                  router.push('/apply/open_up');
-                }
+      Object.keys(values).forEach(key => {
+        values[key] = values[key] ? values[key].replace(/\s/g, '') : ''
+      })
+      const { username, password, verifyCode } = values;
+      if (!username) {
+        return failTip(`${sldComLanguage('用户名不能为空')}`);
+      }
+      if (!password) {
+        return failTip(`${sldComLanguage('密码不能为空')}`);
+      } 
+      if (!verifyCode) {
+        return failTip(`${sldComLanguage('验证码不能为空')}`);
+      }
+      //用户登录
+      values.verifyKey = this.login_captcha;
+      const { dispatch } = this.props;
+      this.setState({loginLoading: true})
+      dispatch({
+        type: 'login/login',
+        payload: { ...values },
+        callback: (res) => {
+          if (res.state == 200 || res.state == 267) {
+            localStorage.setItem('sld_token', res.data.access_token);
+            localStorage.setItem('sld_refresh_token', res.data.refresh_token);
+            {
+              setLocalStorageTime();
+            }
+            localStorage.setItem('user_info', JSON.stringify({ user_name: res.data.vendorName, vendorMobile: res.data.vendorMobile }));
+            if (res.state == 267) {
+              //登录的时候初始化入驻状态
+              if (res.data.applyState == 0) {
+                //未入驻
+                saveSettleData('state', '');
+                saveSettleData('cur_step', 0);
+                router.push('/apply/settled_protocol');
               } else {
-                // dispatch({ type: 'global/get_site_list_data' });
+                saveSettleData('cur_step', 3);
+                router.push('/apply/open_up');
               }
             } else {
-              failTip(res.msg);
-              this.getCaptcha('login_captcha');
+              // dispatch({ type: 'global/get_site_list_data' });
             }
-            this.setState({loginLoading: false})
-          },
-        });
-      }
+          } else {
+            failTip(res.msg);
+            this.getCaptcha('login_captcha');
+          }
+          this.setState({loginLoading: false})
+        },
+      });
     });
   };