7.6

Author: qingxuanying

src/common/getFromUrl.js

@@ -1,11 +1,9 @@
-import { name } from 'store/storages/cookieStorage';
-
-function getQueryVariable(name) {
+function getQueryVariable(variable) {
   let query = window.location.search.substring(1);
   let vars = query.split('&');
   for (let i = 0; i < vars.length; i++) {
-    var pair = vars[i].split('=');
-    if (pair[0] == name) {
+    let pair = vars[i].split('=');
+    if (pair[0] === variable) {
       return pair[1];
     }
   }

src/common/service.js

@@ -1,8 +1,5 @@
 import 'whatwg-fetch';
 import Notification from 'rc-notification';
-import getCookie from './cookie';
-import getFromUrl from './getFromUrl';
-
 function Fetch(url, opt = {}) {
   opt.method = opt.method || 'GET';
   opt.headers = {};

src/pages/login/login.js

@@ -8,33 +8,9 @@ import Service from '../../common/service';
 import Layout from '../../component/layout';
 import Button from '../../component/common/button/button';
 import Input from '../../component/common/input/input';
+import getFromUrl from '../../common/getFromUrl';
 
 class Login extends Component {
-  // componentDidMount() {
-  //   if (localStorage.getItem('checked')) {
-  //     Service.Login(
-  //       localStorage.getItem('username'),
-  //       localStorage.getItem('password')
-  //     ).then(res => {
-  //       if (res !== null && res !== undefined) {
-  //         let landing = 'pass.muxi-tech.xyz/';
-  //         if (landing) {
-  //           window.location.href =
-  //             'http://' +
-  //             landing +
-  //             'landing/?username=' +
-  //             localStorage.getItem('username') +
-  //             '&token=' +
-  //             res.token +
-  //             '&id=' +
-  //             res.user_id;
-  //         }
-  //       } else {
-  //         this.failed = true;
-  //       }
-  //     });
-  //   }
-  // }
   componentDidMount() {
     if (localStorage.getItem('checked')) {
       Service.refreshtoken(
@@ -88,11 +64,11 @@ class Login extends Component {
     console.log(username, password, isChecked);
     if (username && password) {
       Service.getOauthCode(username, password).then(res => {
-        if (res.code == 20102) {
+        if (res.code === 20102) {
           this.alert('用户不存在');
-        } else if (res.code == 20301) {
+        } else if (res.code === 20301) {
           this.alert('密码错误');
-        } else if (res.code == 0) {
+        } else if (res.code === 0) {
           this.alert('登录成功，正在跳转');
           //如果用户勾选下次自动登录，保存此次登录信息
           if (isChecked) {

src/pages/register/register.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import './register.css';
 import { Link } from 'react-router-dom';
-// import Background from '../../images/login.png';
 import Service from '../../common/service';
 import Notification from 'rc-notification';
 import 'rc-notification/assets/index.css';