我也不知道我改了啥啊

@@ -4,29 +4,30 @@
  * @flow
  * @flow
  */
  */
 
 
-import React, { Component } from 'react';
-import {
-  AppRegistry,
-  StyleSheet,
-  Text,
-  View
-} from 'react-native';
-import Main from './src/pages/main';
+import React, { Component } from "react";
+import { AppRegistry, StyleSheet, Text, View } from "react-native";
+import Main from "./src/pages/main";
 
 
 export default class ProtectGod extends Component {
 export default class ProtectGod extends Component {
   constructor(props) {
   constructor(props) {
     super(props);
     super(props);
     this.state = {
     this.state = {
-    isLogin: true
-  }
+      isLogin: true,
+      selectedItem: "home"
+    };
   }
   }
   render() {
   render() {
-
-    console.log("看看这个登录state",this.state.isLogin);
+    console.log("看看这个登录state", this.state.isLogin);
     return (
     return (
       <Main
       <Main
         loginSuccess={this.state.isLogin}
         loginSuccess={this.state.isLogin}
-        onLogin={ (isLogin) => {this.setState({isLogin})}}
+        selectedItem={this.state.selectedItem}
+        onLogin={isLogin => {
+          this.setState({
+            isLogin: isLogin,
+            selectedItem: "home"
+          });
+        }}
       />
       />
     );
     );
   }
   }
@@ -35,20 +36,20 @@ export default class ProtectGod extends Component {
 const styles = StyleSheet.create({
 const styles = StyleSheet.create({
   container: {
   container: {
     flex: 1,
     flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
+    justifyContent: "center",
+    alignItems: "center",
+    backgroundColor: "#F5FCFF"
   },
   },
   welcome: {
   welcome: {
     fontSize: 20,
     fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
+    textAlign: "center",
+    margin: 10
   },
   },
   instructions: {
   instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
+    textAlign: "center",
+    color: "#333333",
+    marginBottom: 5
+  }
 });
 });
 
 
-AppRegistry.registerComponent('ProtectGod', () => ProtectGod);
+AppRegistry.registerComponent("ProtectGod", () => ProtectGod);

@@ -8,7 +8,7 @@ import {
   TouchableOpacity,
   TouchableOpacity,
   Image,
   Image,
   TextInput,
   TextInput,
-  KeyboardAvoidingView,
+  KeyboardAvoidingView
 } from "react-native";
 } from "react-native";
 
 
 export default class Details extends Component {
 export default class Details extends Component {
@@ -99,7 +99,10 @@ export default class Details extends Component {
               enablesReturnKeyAutomatically={true}
               enablesReturnKeyAutomatically={true}
               returnKeyType="send"
               returnKeyType="send"
             />
             />
-            <TouchableOpacity style={styles.sendButtonContaier} onPress={() => this.sendMsg()}>
+            <TouchableOpacity
+              style={styles.sendButtonContaier}
+              onPress={() => this.sendMsg()}
+            >
               <Text style={styles.sendButton}>发送</Text>
               <Text style={styles.sendButton}>发送</Text>
             </TouchableOpacity>
             </TouchableOpacity>
           </View>
           </View>
@@ -111,13 +114,11 @@ export default class Details extends Component {
   sendMsg() {
   sendMsg() {
     var that = this;
     var that = this;
     this.setState({
     this.setState({
-      text: "",
+      text: ""
     });
     });
   }
   }
 }
 }
 
 
-  
-
 const styles = StyleSheet.create({
 const styles = StyleSheet.create({
   container: {
   container: {
     flex: 1,
     flex: 1,
@@ -128,12 +129,12 @@ const styles = StyleSheet.create({
   },
   },
   KAVContainer: {
   KAVContainer: {
     flex: 1,
     flex: 1,
-    justifyContent: 'center',
+    justifyContent: "center"
     // paddingHorizontal: 20,
     // paddingHorizontal: 20,
     // paddingTop: 20,
     // paddingTop: 20,
   },
   },
   scrollViewContainer: {
   scrollViewContainer: {
-    flex: 1,
+    flex: 1
   },
   },
   titleText: {
   titleText: {
     marginTop: 21,
     marginTop: 21,
@@ -276,7 +277,7 @@ const styles = StyleSheet.create({
     borderStyle: "solid",
     borderStyle: "solid",
     borderColor: "#E8E8E8",
     borderColor: "#E8E8E8",
     borderTopWidth: 1,
     borderTopWidth: 1,
-    backgroundColor: "#E6E6E6",
+    backgroundColor: "#E6E6E6"
   },
   },
   msgInput: {
   msgInput: {
     flex: 1,
     flex: 1,
@@ -287,20 +288,19 @@ const styles = StyleSheet.create({
     paddingTop: 8,
     paddingTop: 8,
     paddingBottom: 7,
     paddingBottom: 7,
     paddingLeft: 13,
     paddingLeft: 13,
-    backgroundColor: "white",
+    backgroundColor: "white"
   },
   },
   sendButtonContaier: {
   sendButtonContaier: {
     // flex: 1,
     // flex: 1,
     alignItems: "center",
     alignItems: "center",
-    justifyContent: "center",
+    justifyContent: "center"
   },
   },
   sendButton: {
   sendButton: {
-    
     fontSize: 15,
     fontSize: 15,
-    marginLeft: 15  ,
+    marginLeft: 15,
     color: "#1B9341",
     color: "#1B9341",
     borderColor: "#E6E6E6",
     borderColor: "#E6E6E6",
     borderStyle: "solid",
     borderStyle: "solid",
-    borderLeftWidth: 0.5,
+    borderLeftWidth: 0.5
   }
   }
 });
 });

@@ -7,7 +7,8 @@ import {
   Image,
   Image,
   TouchableOpacity,
   TouchableOpacity,
   ScrollView,
   ScrollView,
-  TextInput
+  TextInput,
+  KeyboardAvoidingView
 } from "react-native";
 } from "react-native";
 
 
 export default class Login extends Component {
 export default class Login extends Component {
@@ -15,7 +16,8 @@ export default class Login extends Component {
     super(props);
     super(props);
     this.state = {
     this.state = {
       phone: "",
       phone: "",
-      password: ""
+      password: "",
+      isRegister: false
     };
     };
   }
   }
   componentDidMount() {
   componentDidMount() {
@@ -24,6 +26,7 @@ export default class Login extends Component {
   render() {
   render() {
     return (
     return (
       <View style={styles.container}>
       <View style={styles.container}>
+        <KeyboardAvoidingView behavior="padding" style={styles.KAVContainer}>
           <Text style={styles.appName}>保护神</Text>
           <Text style={styles.appName}>保护神</Text>
           <View style={styles.inputField}>
           <View style={styles.inputField}>
             <Image
             <Image
@@ -64,21 +67,54 @@ export default class Login extends Component {
           {/* <TouchableOpacity style={styles.helpContaier}>
           {/* <TouchableOpacity style={styles.helpContaier}>
           <Text style={styles.forgetPassword}>忘记密码？</Text>
           <Text style={styles.forgetPassword}>忘记密码？</Text>
         </TouchableOpacity> */}
         </TouchableOpacity> */}
-        <TouchableOpacity style={styles.confirmBtn} onPress={() => {this.loginRequest()}}>
-          <Text style={styles.login}>登录</Text>
+
+          {/* 登录/注册 按钮 */}
+          {!this.state.isRegister ? (
+            <TouchableOpacity
+              style={styles.confirmBtnLogin}
+              onPress={() => {
+                this.loginRequest();
+              }}
+            >
+              <Text style={styles.confirmText}>登录</Text>
+            </TouchableOpacity>
+          ) : (
+            <TouchableOpacity
+              style={styles.confirmBtnRegister}
+              onPress={() => {
+                this.loginRequest();
+              }}
+            >
+              <Text style={styles.confirmText}>注册</Text>
             </TouchableOpacity>
             </TouchableOpacity>
-        <TouchableOpacity style={styles.registerContaier}>
+          )}
+
+          {/* 点击进行注册 */}
+          {!this.state.isRegister ? (
+            <TouchableOpacity
+              style={styles.registerContaier}
+              onPress={() => this.setState({ isRegister: !this.state.isRegister })}
+            >
               <Text style={styles.register}>注册账号</Text>
               <Text style={styles.register}>注册账号</Text>
             </TouchableOpacity>
             </TouchableOpacity>
+          ) : (
+            <TouchableOpacity
+              style={styles.registerContaier}
+              onPress={() => this.setState({ isRegister: !this.state.isRegister })}
+            >
+              <Text style={styles.register}>登录</Text>
+            </TouchableOpacity>
+          )}
+        </KeyboardAvoidingView>
       </View>
       </View>
     );
     );
   }
   }
 
 
   loginRequest() {
   loginRequest() {
-    if(this.props.loginSuccess) return;
+    if (this.props.loginSuccess) return;
     let phone = this.state.phone,
     let phone = this.state.phone,
       password = this.state.password;
       password = this.state.password;
-    if (!(/^1(3|4|5|7|8)\d{9}$/.test(phone))) {
+    if (!/^1(3|4|5|7|8)\d{9}$/.test(phone)) {
       alert("请正确输入手机号码");
       alert("请正确输入手机号码");
       return;
       return;
     }
     }
@@ -96,7 +132,6 @@ export default class Login extends Component {
     }
     }
     this.props.onLogin(true);
     this.props.onLogin(true);
   }
   }
-
 }
 }
 
 
 const styles = StyleSheet.create({
 const styles = StyleSheet.create({
@@ -109,6 +144,10 @@ const styles = StyleSheet.create({
     paddingLeft: 38,
     paddingLeft: 38,
     paddingRight: 38
     paddingRight: 38
   },
   },
+  KAVContainer: {
+    flex: 1
+    // justifyContent: "center"
+  },
   appName: {
   appName: {
     fontSize: 26,
     fontSize: 26,
     color: "#030303",
     color: "#030303",
@@ -134,31 +173,40 @@ const styles = StyleSheet.create({
   helpContaier: {
   helpContaier: {
     flexDirection: "row",
     flexDirection: "row",
     justifyContent: "flex-end",
     justifyContent: "flex-end",
-    marginTop: 10,
+    marginTop: 10
   },
   },
   forgetPassword: {
   forgetPassword: {
     color: "#999999",
     color: "#999999",
-    fontSize: 14,
+    fontSize: 14
   },
   },
-  confirmBtn: {
+  confirmBtnLogin: {
     marginTop: 30,
     marginTop: 30,
     width: 299,
     width: 299,
     height: 45,
     height: 45,
     backgroundColor: "#1B9341",
     backgroundColor: "#1B9341",
     borderRadius: 5,
     borderRadius: 5,
     alignItems: "center",
     alignItems: "center",
-    justifyContent: "center",
+    justifyContent: "center"
+  },
+  confirmBtnRegister: {
+    marginTop: 30,
+    width: 299,
+    height: 45,
+    backgroundColor: "#BBBBBB",
+    borderRadius: 5,
+    alignItems: "center",
+    justifyContent: "center"
   },
   },
-  login: {
+  confirmText: {
     color: "#fff",
     color: "#fff",
-    fontSize: 16,
+    fontSize: 16
   },
   },
   registerContaier: {
   registerContaier: {
     alignItems: "center",
     alignItems: "center",
-    justifyContent: "center",
+    justifyContent: "center"
   },
   },
   register: {
   register: {
     marginTop: 24,
     marginTop: 24,
-    color: "#1B9341",
+    color: "#1B9341"
   }
   }
 });
 });

@@ -22,7 +22,6 @@ export default class Main extends Component {
     super(props);
     super(props);
     this.state = {
     this.state = {
       selectedItem: "home",
       selectedItem: "home",
-      selectedTab: "home"
     };
     };
   }
   }