From 8a76d8a81aec2385d881b53c4a5a5a05a3befb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 17 Jul 2019 14:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/login/EducoderLogin.js  |  1 -
 .../modules/user/LoginRegisterComponent.js    | 38 ++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 124c047ff..8e8bfd112 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -25,7 +25,6 @@ import '../courses/css/Courses.css';
 import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
 import educodernet from '../../../src/images/login/educodernet.png';
 import LoginRegisterComponent from '../user/LoginRegisterComponent';
-import InterestpageComponent from '../user/Interestpage'
 import FindPasswordComponent from '../user/FindPasswordComponent';
 import passopen from "../../images/login/passopen.png";
 //educoder登入页面
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index da5cb0889..943ac341e 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -36,12 +36,12 @@ class LoginRegisterComponent extends Component {
                 activeKey: 0,
                 classpass: "text",
                 // 登录
-                passopens: passopen,
+                passopens: passoff,
                 seconds: 35,
                 discodeBtn: false,
                 clearInterval: false,
                 autoLogin: true,
-                classpassbool: true,
+                classpassbool: false,
                 // 注册
                 readAgreement: false,
                 getverificationcodes: true,
@@ -66,12 +66,12 @@ class LoginRegisterComponent extends Component {
                 activeKey: '1',
                 classpass: "text",
                 // 登录
-                passopens: passopen,
+                passopens: passoff,
                 seconds: 35,
                 discodeBtn: false,
                 clearInterval: false,
                 autoLogin: true,
-                classpassbool: true,
+                classpassbool: false,
                 // 注册
                 readAgreement: false,
                 getverificationcodes: true,
@@ -252,20 +252,21 @@ class LoginRegisterComponent extends Component {
             code: this.state.codes,
         }).then((result) => {
             console.log(result);
-            try {
-                // this.onTabChange("1");
-                this.setState({
-                    logins: "",
-                    dragOk: false,
-                    codes: "",
-                    passwords: "",
-                    Agreetotheterms: "",
-                })
-             this.props.history.push("/interesse");
-             // this.props.Setshowbool(2,this.state.logins,this.state.passwords);
-            } catch (e) {
+            if(result){
+                    try {
+                        this.setState({
+                            logins: "",
+                            dragOk: false,
+                            codes: "",
+                            passwords: "",
+                            Agreetotheterms: "",
+                        })
+                    } catch (e) {
 
+                    }
+                }else{
             }
+
         }).catch((error) => {
 
         })
@@ -572,6 +573,7 @@ class LoginRegisterComponent extends Component {
             tab,
             dragOk,
             Whethertoverify,
+            classpassbool,
             // 注册
             readAgreement,
         } = this.state
@@ -580,7 +582,7 @@ class LoginRegisterComponent extends Component {
             // window.location.href='http://www.cnblogs.com/a-cat/';
         }
 
-        // console.log(activeKey);
+        console.log(classpass);
         return (
 
             <div className="login_register_content" style={  parseInt(tab[0])==0?{height: "346px"} :{height: "490px"}}>
@@ -764,7 +766,7 @@ class LoginRegisterComponent extends Component {
                                 }
                             </style>
                             <Input className="loginInput  font-14 mt25  color-grey-9 loginInputzhuche" placeholder="输入8~16位密码，区分大小写"
-                                   type={classpass}
+                                   type={classpassbool===false?"text":"password"}
 
                                    autoComplete="new-password"
                                    onClick={this.changeType}