Merge remote-tracking branch 'origin/dev_ysm' into dev_ysm

public/react/src/modules/user/LoginRegisterComponent.js

@@ -136,15 +136,22 @@ class LoginRegisterComponent extends Component {
         let pcipns=this.IsPC();
         if (this.props.match.url === "/login") {
             console.log("11111111111111111111111111");
-            this.state = {
-                tab:["0"],
-
-            }
+            // this.state = {
+            //     tab:["0"],
+            //
+            // }
+            this.setState({
+                tab:["0"]
+            })
         } else if (this.props.match.url === "/register") {
-            this.state = {
-                tab:["1"],
-
-            }
+            console.log("11111111111111111111111111");
+            // this.state = {
+            //     tab:["1"],
+            //
+            // }
+            this.setState({
+                tab:["1"]
+            })
         }
         this.setState({
             pciphone:pcipns,
@@ -866,7 +873,8 @@ class LoginRegisterComponent extends Component {
 	}
 	hideweixinlogin=()=>{
 		this.setState({
-			weixinlogin:false
+			weixinlogin:false,
+        tab:["0"]
 		})
 	}
     render() {