更新代码

App.js

@@ -11,10 +11,10 @@ import { AsyncStorage } from 'react-native';
 import { createStackNavigator, createAppContainer } from 'react-navigation';
 import Storage from 'react-native-storage';
 import MainActivity from './pages/MainActivity';
-import SchoolAge from './pages/components/SchoolAge';
+import SchoolAge from './pages/SchoolAge';
 import MainPage from './pages/components/MainPage';
 import SchedulePage from './pages/components/SchedulePage';
-import PersonalInfo from './pages/components/PersonalInfo';
+import PersonalInfo from './pages/PersonalInfo';
 import CourseDetails from './pages/CourseDetails';
 import userCenter from './pages/userCenter';
 import Order from './pages/buy/order';
@@ -23,6 +23,7 @@ import Buy from './pages/buy/buy';
 import Login from './pages/Login';
 import SearchResult from './pages/searchResult';
 import PhoneBind from './pages/PhoneBind';
+import Splash from './pages/Splash';
 
 const RootNavigator = createStackNavigator(
 	{
@@ -38,10 +39,11 @@ const RootNavigator = createStackNavigator(
 		Login: { screen: Login },
 		Buy: { screen: Buy },
 		SearchResult: { screen: SearchResult },
-		PhoneBind: { screen: PhoneBind }
+		PhoneBind: { screen: PhoneBind },
+		Splash: { screen: Splash }
 	},
 	{
-		initialRouteName: 'PersonalInfo',
+		initialRouteName: 'Splash',
 		headerMode: 'null'
 	}
 );

README.md

@@ -35,4 +35,8 @@ global.storage.load({
         key:'token'
     })
 ```
-https://www.jianshu.com/p/72c3d3af094f
+https://www.jianshu.com/p/72c3d3af094f
+
+
+##react-native-device-fino github地址
+1.https://github.com/zqHero/deviceInfoDemo#getuniqueid

android/app/build.gradle

@@ -151,6 +151,8 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-splash-screen')
+    implementation project(':react-native-device-info')
     implementation project(':react-native-wechat')
     implementation project(':react-native-image-picker')
     implementation project(':react-native-orientation')

android/app/src/main/AndroidManifest.xml

@@ -16,7 +16,9 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="com.xiaomi.permission.AUTH_THIRDPAY" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
 
     <application
         android:name="com.edufound.MainApplication"
@@ -35,30 +37,30 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:screenOrientation="sensorPortrait"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
         <activity
             android:name=".activity.WebActivity"
             android:screenOrientation="sensorPortrait" />
         <activity
             android:name=".activity.SplashActivity"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-            android:screenOrientation="sensorPortrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            android:screenOrientation="sensorPortrait"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+
         </activity>
         <activity
             android:name=".wxapi.WXEntryActivity"
-            android:label="@string/app_name"
             android:exported="true"
-            />
+            android:label="@string/app_name" />
         <activity
             android:name=".wxapi.WXPayEntryActivity"
-            android:label="@string/app_name"
             android:exported="true"
-            />
+            android:label="@string/app_name" />
     </application>
 
 </manifest>

android/app/src/main/java/com/edufound/MainApplication.java

@@ -14,6 +14,9 @@ import com.github.yamill.orientation.OrientationPackage;
 import com.imagepicker.ImagePickerPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.theweflex.react.WeChatPackage;
+import com.learnium.RNDeviceInfo.RNDeviceInfo;
+
+import org.devio.rn.splashscreen.SplashScreenReactPackage;
 
 import java.util.Arrays;
 import java.util.List;
@@ -36,7 +39,9 @@ public class MainApplication extends Application implements ReactApplication {
                     new ReactVideoPackage(),
                     new OrientationPackage(),
                     new ImagePickerPackage(),
-                    new WeChatPackage()
+                    new WeChatPackage(),
+                    new RNDeviceInfo(),
+                    new SplashScreenReactPackage()
             );
         }
 

android/app/src/main/java/com/edufound/mobile/MainActivity.java

@@ -1,13 +1,11 @@
 package com.edufound.mobile;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
 
-import com.edufound.mobile.activity.WebActivity;
 import com.facebook.react.ReactActivity;
 
+import org.devio.rn.splashscreen.SplashScreen;
+
 public class MainActivity extends ReactActivity {
 
     /**
@@ -21,19 +19,21 @@ public class MainActivity extends ReactActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        SplashScreen.show(this, true);
         super.onCreate(savedInstanceState);
-        String params = getIntent().getStringExtra("params");
-        Log.e("com.edufound.mobile", "跳转参数a：" + params);
-        if (!TextUtils.isEmpty(params) && !params.equals("null")) {
-            switch (params) {
-                case "WebActivity":
-                    Intent intent = new Intent(MainActivity.this, WebActivity.class);
-                    intent.putExtra("json", "MainActivity---params--json");
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(intent);
-                    break;
-            }
-        }
+//        String params = getIntent().getStringExtra("params");
+//        Log.e("com.edufound.mobile", "跳转参数a：" + params);
+//        if (!TextUtils.isEmpty(params) && !params.equals("null")) {
+//            switch (params) {
+//                case "WebActivity":
+//                    Intent intent = new Intent(MainActivity.this, WebActivity.class);
+//                    intent.putExtra("json", "MainActivity---params--json");
+//                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//                    startActivity(intent);
+//                    break;
+//            }
+//        }
+
 
     }
 }

android/app/src/main/res/layout/launch_screen.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/splash">
+
+</FrameLayout>

android/app/src/main/res/values-v19/styles.xml

@@ -5,6 +5,7 @@
         <!-- Customize your theme here. -->
 
         <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowIsTranslucent">true</item>
     </style>
 
 </resources>

android/app/src/main/res/values/styles.xml

@@ -4,6 +4,7 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowIsTranslucent">true</item>
     </style>
 
 

android/settings.gradle

@@ -1,4 +1,8 @@
 rootProject.name = 'efunbox_mobile_8'
+include ':react-native-splash-screen'
+project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
+include ':react-native-device-info'
+project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-wechat'
 project(':react-native-wechat').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-wechat/android')
 include ':react-native-image-picker'

ios/efunbox_mobile_8.xcodeproj/project.pbxproj

@@ -46,6 +46,9 @@
 		E7126B830D54449191E5A4A3 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4C934671D884A4AAA31603D /* libRNImagePicker.a */; };
 		EBD8BAD03DF74C0E96E4D170 /* libRCTWeChat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F42902D7FF684CA6A48558A1 /* libRCTWeChat.a */; };
 		D3F60855D8FF4C4A9C5D4ACA /* RCTWeChatTests.xctest in Resources */ = {isa = PBXBuildFile; fileRef = 7411A64812B4434AAAD1DBB5 /* RCTWeChatTests.xctest */; };
+		12BDF20DBE4141F8A990F8D7 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F9FCB46EDB7F456AB88EF68C /* libRNDeviceInfo.a */; };
+		5C6A0716F9C849D2B67AE09E /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 505D2A7DD9E64E7B82EC655D /* libRNDeviceInfo-tvOS.a */; };
+		5ABEAAADCD024F01B438B689 /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D337E77E80D430CB4D8DF4B /* libSplashScreen.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -365,6 +368,11 @@
 		593F0F0596BC4EB7996A9D21 /* RCTWeChat.xcodeproj */ = {isa = PBXFileReference; name = "RCTWeChat.xcodeproj"; path = "../node_modules/react-native-wechat/ios/RCTWeChat.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
 		F42902D7FF684CA6A48558A1 /* libRCTWeChat.a */ = {isa = PBXFileReference; name = "libRCTWeChat.a"; path = "libRCTWeChat.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
 		7411A64812B4434AAAD1DBB5 /* RCTWeChatTests.xctest */ = {isa = PBXFileReference; name = "RCTWeChatTests.xctest"; path = "RCTWeChatTests.xctest"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.cfbundle; explicitFileType = undefined; includeInIndex = 0; };
+		18F4C7BFE3EB4947A8A72EB4 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; name = "RNDeviceInfo.xcodeproj"; path = "../node_modules/react-native-device-info/ios/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
+		F9FCB46EDB7F456AB88EF68C /* libRNDeviceInfo.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo.a"; path = "libRNDeviceInfo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
+		505D2A7DD9E64E7B82EC655D /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
+		2CB189F11F9C4B5B8D057FFC /* SplashScreen.xcodeproj */ = {isa = PBXFileReference; name = "SplashScreen.xcodeproj"; path = "../node_modules/react-native-splash-screen/ios/SplashScreen.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
+		1D337E77E80D430CB4D8DF4B /* libSplashScreen.a */ = {isa = PBXFileReference; name = "libSplashScreen.a"; path = "libSplashScreen.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -399,6 +407,8 @@
 				E7126B830D54449191E5A4A3 /* libRNImagePicker.a in Frameworks */,
 				EBD8BAD03DF74C0E96E4D170 /* libRCTWeChat.a in Frameworks */,
 				D3F60855D8FF4C4A9C5D4ACA /* RCTWeChatTests.xctest in Resources */,
+				12BDF20DBE4141F8A990F8D7 /* libRNDeviceInfo.a in Frameworks */,
+				5ABEAAADCD024F01B438B689 /* libSplashScreen.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -416,6 +426,7 @@
 				2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */,
 				2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */,
 				40B60160FAE8416EABF8F455 /* libRNGestureHandler-tvOS.a in Frameworks */,
+				5C6A0716F9C849D2B67AE09E /* libRNDeviceInfo-tvOS.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -594,6 +605,8 @@
 				13F318D169DD4BA79CB54ED5 /* RCTOrientation.xcodeproj */,
 				B11B05F3205C483583EB7421 /* RNImagePicker.xcodeproj */,
 				593F0F0596BC4EB7996A9D21 /* RCTWeChat.xcodeproj */,
+				18F4C7BFE3EB4947A8A72EB4 /* RNDeviceInfo.xcodeproj */,
+				2CB189F11F9C4B5B8D057FFC /* SplashScreen.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -1228,6 +1241,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1236,6 +1252,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Debug;
@@ -1264,6 +1282,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1272,6 +1293,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Release;
@@ -1299,6 +1322,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Debug;
@@ -1325,6 +1350,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Release;
@@ -1361,6 +1388,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1369,6 +1399,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Debug;
@@ -1405,6 +1437,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1413,6 +1448,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Release;
@@ -1448,6 +1485,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1456,6 +1496,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Debug;
@@ -1491,6 +1533,9 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1499,6 +1544,8 @@
 					"$(SRCROOT)\..\node_modules\react-native-orientation\iOS\RCTOrientation/**",
 					"$(SRCROOT)\..\node_modules\react-native-image-picker\ios",
 					"$(SRCROOT)\..\node_modules\react-native-wechat\ios",
+					"$(SRCROOT)\..\node_modules\react-native-device-info\ios\RNDeviceInfo",
+					"$(SRCROOT)\..\node_modules\react-native-splash-screen\ios",
 				);
 			};
 			name = Release;

package-lock.json

@@ -2845,7 +2845,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2863,11 +2864,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2880,15 +2883,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2991,7 +2997,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3001,6 +3008,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3013,17 +3021,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3040,6 +3051,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3112,7 +3124,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3122,6 +3135,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3197,7 +3211,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3227,6 +3242,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3244,6 +3260,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3282,11 +3299,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -6281,7 +6300,7 @@
     },
     "opencollective": {
       "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/opencollective/download/opencollective-1.0.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/opencollective/download/opencollective-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fopencollective%2Fdownload%2Fopencollective-1.0.3.tgz",
       "integrity": "sha1-ruY3K8KBRFg2kMPKja7PwSDdDvE=",
       "requires": {
         "babel-polyfill": "6.23.0",
@@ -6299,12 +6318,12 @@
         },
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -6316,7 +6335,7 @@
         },
         "inquirer": {
           "version": "3.0.6",
-          "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-3.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finquirer%2Fdownload%2Finquirer-3.0.6.tgz",
+          "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-3.0.6.tgz",
           "integrity": "sha1-4EqqnQW3o8ubD0B9BDdfBEcZA0c=",
           "requires": {
             "ansi-escapes": "^1.1.0",
@@ -7072,6 +7091,11 @@
         }
       }
     },
+    "react-native-device-info": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npm.taobao.org/react-native-device-info/download/react-native-device-info-2.1.1.tgz",
+      "integrity": "sha1-xt3AIgM3VqXkxYmeuD45C1oYzBc="
+    },
     "react-native-gesture-handler": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/react-native-gesture-handler/download/react-native-gesture-handler-1.1.0.tgz",
@@ -7105,6 +7129,11 @@
       "resolved": "https://registry.npm.taobao.org/react-native-screens/download/react-native-screens-1.0.0-alpha.22.tgz",
       "integrity": "sha1-ehIDd7Uqqbu5TQuFQaAUAmvpKJs="
     },
+    "react-native-splash-screen": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npm.taobao.org/react-native-splash-screen/download/react-native-splash-screen-3.2.0.tgz",
+      "integrity": "sha1-1H7IVXsbqYjuPqmNAUYwgbYP/0U="
+    },
     "react-native-storage": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/react-native-storage/download/react-native-storage-1.0.1.tgz",

package.json

@@ -14,9 +14,11 @@
     "react-art": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-native": "0.59.4",
+    "react-native-device-info": "^2.1.1",
     "react-native-gesture-handler": "^1.1.0",
     "react-native-image-picker": "^0.28.1",
     "react-native-orientation": "^3.1.3",
+    "react-native-splash-screen": "^3.2.0",
     "react-native-storage": "^1.0.1",
     "react-native-swiper": "^1.5.14",
     "react-native-video": "^4.4.1",

pages/BasePage.js

@@ -6,102 +6,112 @@
  * @flow
  */
 
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
-  Platform,
-  StyleSheet,
-  Text,
-  View,
-  Image,
-  TouchableOpacity,
-  ImageBackground,
-  Button,
-  Dimensions,
-  DeviceEventEmitter
-} from "react-native";
-import AndroidUtil from "../util/AndroidUtil";
-
+	Platform,
+	StyleSheet,
+	Text,
+	View,
+	Image,
+	TouchableOpacity,
+	ImageBackground,
+	Button,
+	Dimensions,
+	DeviceEventEmitter
+} from 'react-native';
+import AndroidUtil from '../util/AndroidUtil';
+import { NavigationActions, StackActions } from 'react-navigation';
+import commonUtil from '../pages/utils/commonutil';
 
 type Props = {};
-var width = Dimensions.get("window").width;
-var height = Dimensions.get("window").height;
+var width = Dimensions.get('window').width;
+var height = Dimensions.get('window').height;
 export default class BasePage extends Component<Props> {
-  render() {
-    return (
-      <ImageBackground
-        style={{
-          flex: 1,
-          width: "100%",
-          height: "100%",
-          Background: "#F8F8F8"
-        }}
-      />
-    );
-  }
-  getWindowHeight() {
-    return height;
-  }
-  getWindowWidth() {
-    return width;
-  }
+	render() {
+		return (
+			<ImageBackground
+				style={{
+					flex: 1,
+					width: '100%',
+					height: '100%',
+					Background: '#F8F8F8'
+				}}
+			/>
+		);
+	}
+	getWindowHeight() {
+		return height;
+	}
+	getWindowWidth() {
+		return width;
+	}
 
-  toNextPage= (params,obj) => {
-    //跳转之前移除当前界面的监听
-    this.removeListener();
-    this.props.navigation.navigate(params,obj);
-  }
-  Toast(params) {
-    AndroidUtil.showToast(params, AndroidUtil.SHORT);
-  }
-  toWebPage(json) {
-    AndroidUtil.toWebActivity(json);
-  }
-  testJssss() {
-    //测试调用安卓方法然后安卓方法调用JS下面的监听
-    AndroidUtil.testJS();
-  }
-  goBack() {
-    //返回上一页
-    this.props.navigation.goBack();
-  }
+	clearPageToNext = (name, obj) => {
+		const resetAction = StackActions.reset({
+			index: 0,
+			actions: [
+				NavigationActions.navigate({ routeName: name }) //要跳转到的页面名字
+			]
+		});
+		this.props.navigation.dispatch(resetAction, obj);
+	};
 
-  removeListener() {
-    if (this.testJSaaa) {
-      this.testJSaaa.remove();
-    }
-    if (this.toJsByAndroid) {
-      this.toJsByAndroid.remove();
-    }
-  }
+	toNextPage = (params, obj) => {
+		//跳转之前移除当前界面的监听
+		this.removeListener();
+		this.props.navigation.navigate(params, obj);
+	};
+	Toast(params) {
+		AndroidUtil.showToast(params, AndroidUtil.SHORT);
+	}
+	toWebPage(json) {
+		AndroidUtil.toWebActivity(json);
+	}
+	testJssss() {
+		//测试调用安卓方法然后安卓方法调用JS下面的监听
+		AndroidUtil.testJS();
+	}
+	goBack() {
+		//返回上一页
+		this.props.navigation.goBack();
+	}
 
-  componentWillMount() {
-    //监听事件名为EventName的事件
-    this.testJSaaa = DeviceEventEmitter.addListener("testJSaaa", e => {
-      //e是原生传过来的参数,ceshi是安卓里面put的key
-      alert(e.ceshi);
-    });
+	removeListener() {
+		if (this.testJSaaa) {
+			this.testJSaaa.remove();
+		}
+		if (this.toJsByAndroid) {
+			this.toJsByAndroid.remove();
+		}
+	}
 
-    this.toJsByAndroid = DeviceEventEmitter.addListener("toJsByAndroid", e => {
-      alert(e.name);
-      alert(e.sex);
-      alert(e.age);
-    });
-  }
+	componentWillMount() {
+		//监听事件名为EventName的事件
+		this.testJSaaa = DeviceEventEmitter.addListener('testJSaaa', (e) => {
+			//e是原生传过来的参数,ceshi是安卓里面put的key
+			alert(e.ceshi);
+		});
+		this.toJsByAndroid = DeviceEventEmitter.addListener('toJsByAndroid', (e) => {
+			alert(e.name);
+			alert(e.sex);
+			alert(e.age);
+		});
+	}
 
-  componentWillUnmount() {
-    // 移除监听
-    this.removeListener();
-  }
+	componentWillUnmount() {
+		// 移除监听
+		this.removeListener();
+	}
 }
 
 const styles = StyleSheet.create({
-  title_text: {
-    justifyContent: "center",
-    alignItems: "center",
-    color: "red",
-    fontSize: 30,
-    textAlign: "center",
-    marginTop: 30,
-    marginBottom: 50
-  }
+	title_text: {
+		justifyContent: 'center',
+		alignItems: 'center',
+		color: 'red',
+		fontSize: 30,
+		textAlign: 'center',
+		marginTop: 30,
+		marginBottom: 50
+	}
 });

pages/Login.js

@@ -1,166 +1,290 @@
 /* 
  * 登录
 */
-import React, { Component } from "react";
-import {
-    Platform,
-    StyleSheet,
-    Text,
-    View,
-    Image,
-    TouchableOpacity,
-    ImageBackground,
-    Button,
-    StatusBar,
-    Modal,
-    TouchableHighlight,
-    DeviceEventEmitter,
-    TextInput,
-    ScrollView
-} from "react-native";
-import BasePage from "./BasePage";
+import React, { Component } from 'react';
+import { StyleSheet, Text, View, Image, TouchableOpacity, StatusBar, ToastAndroid, TextInput } from 'react-native';
+import BasePage from './BasePage';
 import Dimensions from './utils/dimensions';
-import ShopBox from "./components/ShopBox";
+import ShopBox from './components/ShopBox';
 import TopicTitle from './components/TopicTitle';
 import ScrollRow from './components/ScrollRow';
+import DeviceInfo from 'react-native-device-info';
+import commonutil from './utils/commonutil';
+import http_user from './services/user';
+import wechat from './utils/wechat';
 
 export default class Login extends BasePage {
-    state = {
+	state = {
+		phone_num: '',
+		verification_text: '获取验证码',
+		verification_code: '',
+		http_verification_code: '',
+		deviceCode: '',
+		sss: ''
+	};
+	render() {
+		return (
+			<View style={styles.wrapper}>
+				<StatusBar backgroundColor={'white'} translucent={true} barStyle={'dark-content'} />
+				<View style={styles.jump}>
+					<TouchableOpacity style={styles.jumpBtn}>
+						<Text style={styles.jumpText}>跳过</Text>
+						<Image source={require('./images/common/arrowRight.png')} />
+					</TouchableOpacity>
+				</View>
+				<View style={styles.phoneNumberBox}>
+					<Text style={styles.phoneNumber}>手机号</Text>
+					<TextInput
+						style={styles.phoneText}
+						onChangeText={(text) => this.setState({ phone_num: text })}
+						value={this.state.phone_num}
+						placeholder={'请输入手机号'}
+					/>
+				</View>
+				<View style={styles.signNumberBox}>
+					<Text style={styles.phoneNumber}>验证码</Text>
+					<View style={styles.signNumberLine2}>
+						<TextInput
+							style={styles.signText}
+							onChangeText={(text) => this.setState({ verification_code: text })}
+							value={this.state.verification_code}
+							placeholder={'请输入验证码'}
+						/>
+						<TouchableOpacity onPress={this.getVerification.bind(this)}>
+							<Text style={styles.getSign}> {this.state.verification_text}</Text>
+						</TouchableOpacity>
+					</View>
+				</View>
+				<View style={styles.loginIn}>
+					<Text style={styles.loginText} onPress={this.clickOK.bind(this)}>
+						登录
+					</Text>
+				</View>
+				<View style={styles.wechatLogin}>
+					<Image source={require('./images/common/wechat.png')} />
+					<Text style={styles.wechatLoginText} onPress={this.wechatLogin.bind(this)}>
+						微信登录
+					</Text>
+					<Image source={require('./images/common/arrowRight.png')} />
+				</View>
+			</View>
+		);
+	}
 
+	componentWillMount() {
+		console.log('================================================'); // e.g US
+		console.log('Device getUniqueID', DeviceInfo.getUniqueID()); // e.g US
+		console.log('Device getSerialNumber', DeviceInfo.getSerialNumber()); // e.g US
+		console.log('================================================'); // e.g US
+		this.setState({
+			deviceCode: DeviceInfo.getUniqueID() + DeviceInfo.getSerialNumber()
+		});
+	}
 
-    };
-    render() {
-        return (
-            <View style={styles.wrapper}>
-                <View style={styles.jump}>
-                    <TouchableOpacity style={styles.jumpBtn}>
-                        <Text style={styles.jumpText}>跳过</Text>
-                        <Image source={require('./images/common/arrowRight.png')}></Image>
-                    </TouchableOpacity>
-                </View>
-                <View style={styles.phoneNumberBox}>
-                    <Text style={styles.phoneNumber}>手机号</Text>
-                    <TextInput
-                        style={styles.phoneText}
-                        onChangeText={(text) => this.setState({ text })}
-                        value={this.state.text}
-                        placeholder={'请输入手机号'}
-                    />
-                </View>
-                <View style={styles.signNumberBox}>
-                    <Text style={styles.phoneNumber}>验证码</Text>
-                    <View style={styles.signNumberLine2}>
-                        <TextInput
-                            style={styles.signText}
-                            onChangeText={(text) => this.setState({ text })}
-                            value={this.state.text}
-                            placeholder={'请输入验证码'}
-                        />
-                        <TouchableOpacity>
-                            <Text style={styles.getSign}>获取验证码</Text>
-                        </TouchableOpacity>
-                    </View>
-                </View>
-                <View style={styles.loginIn}>
-                    <Text style={styles.loginText}>登录</Text>
-                </View>
-                <View style={styles.wechatLogin}>
-                    <Image source={require('./images/common/wechat.png')}></Image>
-                    <Text style={styles.wechatLoginText}>微信登录</Text>
-                    <Image source={require('./images/common/arrowRight.png')}></Image>
-                </View>
-            </View>
-        )
-    }
+	getVerification() {
+		if (this.state.verification_text === '获取验证码') {
+			if (commonutil.isPoneAvailable(this.state.phone_num)) {
+				http_user.getVerificationCode(this.state.phone_num).then((result) => {
+					if (result.code != 200) {
+						ToastAndroid.show(result.message, ToastAndroid.SHORT);
+						return;
+					} else {
+						this.setState({
+							http_verification_code: result.data
+						});
+					}
+					this.setState({
+						verification_text: '60'
+					});
+					this.CountDown();
+				});
+			} else {
+				ToastAndroid.show('请输入正确的手机号', ToastAndroid.SHORT);
+			}
+		} else {
+		}
+	}
 
+	CountDown() {
+		if (parseInt(this.state.verification_text) == 0) {
+			this.setState({
+				verification_text: '获取验证码'
+			});
+		} else {
+			this.count_timeout = setTimeout(() => {
+				this.setState({
+					verification_text: parseInt(this.state.verification_text) - 1 + ''
+				});
+				this.CountDown();
+			}, 1000);
+		}
+	}
+
+	clickOK() {
+		if (!commonutil.isPoneAvailable(this.state.phone_num)) {
+			ToastAndroid.show('请输入正确的手机号', ToastAndroid.SHORT);
+			return;
+		}
+		if (this.state.verification_code == '') {
+			ToastAndroid.show('请输入验证码', ToastAndroid.SHORT);
+			return;
+		}
+		if (this.state.http_verification_code == this.state.verification_code) {
+			let option = {
+				method: 'POST', //请求方法
+				//请求体
+				body: {
+					mobile: this.state.phone_num,
+					sign: this.state.verification_code,
+					channel: '006',
+					deviceCode: this.state.deviceCode
+				}
+			};
+			http_user.mobileLoginAndReg(option).then((result) => {
+				if (result.code == 200) {
+					//登陆成功了,可以存储用户数据到本地
+					console.log('===============手机号登录成功=====================');
+					console.log(result.data);
+					console.log('===============手机号登录成功=====================');
+
+					clearTimeout(this.count_timeout);
+					this.saveUserInfo(result.data);
+					this.clearPageToNext('SchoolAge');
+				} else {
+					ToastAndroid.show(result.message, ToastAndroid.SHORT);
+				}
+			});
+		} else {
+			ToastAndroid.show('验证码不正确', ToastAndroid.SHORT);
+		}
+	}
+
+	wechatLogin() {
+		wechat.wechatLogin((user) => {
+			let option = {
+				method: 'POST',
+				body: {
+					channel: '006',
+					deviceCode: this.state.deviceCode,
+					openId: user['openid'],
+					unionId: user['unionid'],
+					avatar: user['province'] + user['city'],
+					sex: +user['sex'],
+					nickName: user['nickname']
+				}
+			};
+			http_user.wechatLogin(option).then((result) => {
+				if (result.code == 200) {
+					//登陆成功了,可以存储用户数据到本地
+					this.saveUserInfo(result.data);
+					this.clearPageToNext('SchoolAge');
+				} else {
+					ToastAndroid.show(result.message, ToastAndroid.SHORT);
+				}
+			});
+		});
+	}
+
+	saveUserInfo(user_data) {
+		global.storage
+			.save({
+				key: 'userInfo',
+				data: user_data
+			})
+			.then((result) => {
+				console.log('保存成功');
+			})
+			.catch((err) => {
+				console.log('保存失败');
+			});
+	}
 }
 
 const styles = StyleSheet.create({
-    wrapper: {
-        flex: 1
-    },
-    jumpText: {
-        color: '#3e3e3e',
-        fontSize: 16,
-        marginRight: 4
-    },
-    jump: {
-        // width: Dimensions.width,
-        flex: 2,
-        alignItems: 'flex-end',
-        justifyContent: 'center',
-        paddingHorizontal: '8%'
-    },
-    jumpBtn: {
-        flexDirection: 'row',
-        alignItems: 'center',
-        justifyContent: 'center'
-    },
-    phoneNumberBox: {
-        flex: 2,
-        paddingHorizontal: '8%'
-    },
-    phoneNumber: {
-        color: '#3e3e3e',
-        fontSize: 18,
-        marginBottom: 10
-    },
-    phoneText: {
-        width: '100%',
-        height: Dimensions.getHeight(50),
-        borderRadius: 25,
-        backgroundColor: '#f3f3f3'
-    },
-    signNumberBox: {
-        flex: 2,
-        paddingHorizontal: '8%'
-    },
-    signNumberLine2: {
-        flexDirection: 'row',
-        width: Dimensions.width,
-    },
-    signText: {
-        width: '54%',
-        height: Dimensions.getHeight(50),
-        borderRadius: 25,
-        backgroundColor: '#f3f3f3',
-        marginRight: 9
-    },
-    getSign: {
-        width: 105,
-        height: Dimensions.getHeight(50),
-        borderRadius: 25,
-        backgroundColor: '#38da84',
-        lineHeight: Dimensions.getHeight(50),
-        color: '#fff',
-        fontSize: 16,
-        textAlign: 'center'
-    },
-    loginIn: {
-        flex: 3,
-        paddingHorizontal: '8%'
-    },
-    loginText: {
-        width: '100%',
-        height: Dimensions.getHeight(50),
-        backgroundColor: '#63aeff',
-        textAlign: 'center',
-        lineHeight: Dimensions.getHeight(50),
-        color: '#fff',
-        fontSize: 20,
-        borderRadius: 25
-    },
-    wechatLogin: {
-        flex: 3,
-        flexDirection: 'row',
-        paddingHorizontal: '33.6%',
-        alignItems: 'center',
-        justifyContent: 'center',
-
-    },
-    wechatLoginText: {
-        fontSize: 16,
-        color: '#3e3e3e',
-        marginHorizontal: 6
-    }
-})
+	wrapper: {
+		flex: 1
+	},
+	jumpText: {
+		color: '#3e3e3e',
+		fontSize: 16,
+		marginRight: 4
+	},
+	jump: {
+		// width: Dimensions.width,
+		flex: 2,
+		alignItems: 'flex-end',
+		justifyContent: 'center',
+		paddingHorizontal: '8%'
+	},
+	jumpBtn: {
+		flexDirection: 'row',
+		alignItems: 'center',
+		justifyContent: 'center'
+	},
+	phoneNumberBox: {
+		flex: 2,
+		paddingHorizontal: '8%'
+	},
+	phoneNumber: {
+		color: '#3e3e3e',
+		fontSize: 18,
+		marginBottom: 10
+	},
+	phoneText: {
+		width: '100%',
+		height: Dimensions.getHeight(50),
+		borderRadius: 25,
+		backgroundColor: '#f3f3f3'
+	},
+	signNumberBox: {
+		flex: 2,
+		paddingHorizontal: '8%'
+	},
+	signNumberLine2: {
+		flexDirection: 'row',
+		width: Dimensions.width
+	},
+	signText: {
+		width: '54%',
+		height: Dimensions.getHeight(50),
+		borderRadius: 25,
+		backgroundColor: '#f3f3f3',
+		marginRight: 9
+	},
+	getSign: {
+		width: 105,
+		height: Dimensions.getHeight(50),
+		borderRadius: 25,
+		backgroundColor: '#38da84',
+		lineHeight: Dimensions.getHeight(50),
+		color: '#fff',
+		fontSize: 16,
+		textAlign: 'center'
+	},
+	loginIn: {
+		flex: 3,
+		paddingHorizontal: '8%'
+	},
+	loginText: {
+		width: '100%',
+		height: Dimensions.getHeight(50),
+		backgroundColor: '#63aeff',
+		textAlign: 'center',
+		lineHeight: Dimensions.getHeight(50),
+		color: '#fff',
+		fontSize: 20,
+		borderRadius: 25
+	},
+	wechatLogin: {
+		flex: 3,
+		flexDirection: 'row',
+		paddingHorizontal: '33.6%',
+		alignItems: 'center',
+		justifyContent: 'center'
+	},
+	wechatLoginText: {
+		fontSize: 16,
+		color: '#3e3e3e',
+		marginHorizontal: 6
+	}
+});

pages/components/PersonalInfo.js

@@ -16,46 +16,43 @@ import {
 	TouchableOpacity,
 	ImageBackground,
 	ToastAndroid,
-	Button,
+	BackHandler,
 	StatusBar,
-	Modal,
-	TouchableHighlight,
-	DeviceEventEmitter
+	Modal
 } from 'react-native';
-import AndroidUtil from '../../util/AndroidUtil';
-import BasePage from '../BasePage';
-import CourseTitle from './CourseTitle';
-import ChosePhoto from './ChosePhoto';
-import RegionModal from './RegionModal';
-import BirthdayModal from './BirthdayModal';
-import GradeSelectionModal from './GradeSelectionModal';
-import Header from './Header';
-import PersonalInfoDialog from './PersonalInfoDialog';
+import BasePage from './BasePage';
+import CourseTitle from '../pages/components/CourseTitle';
+import ChosePhoto from '../pages/components/ChosePhoto';
+import RegionModal from '../pages/components/RegionModal';
+import BirthdayModal from '../pages/components/BirthdayModal';
+import GradeSelectionModal from '../pages/components/GradeSelectionModal';
+import PersonalInfoDialog from '../pages/components/PersonalInfoDialog';
 import { NavigationActions, StackActions } from 'react-navigation';
-import asyncStorage from '../utils/asyncStorage';
-import user from '../services/user';
-import wechat from '../utils/wechat';
+import asyncStorage from './utils/asyncStorage';
+import http_user from './services/user';
+import wechat from './utils/wechat';
 type Props = {};
 
 export default class PersonalInfo extends BasePage {
 	state = {
-		nickName: '初始昵称',
+		user_nickName: '未设置',
 		schoolName: '未设置',
-		provinceName: '广东省',
-		citys: '深圳市',
+		provinceName: '未设置',
+		citys: '',
 		grade_text: '七年级',
 		grade_index: 6,
 		birthday_year: 0,
 		birthday_month: 0,
 		birthday_day: 0,
 		birthday_time: 0,
-		photo_uri: require('../images/userInfo/default_photo.png'),
+		photo_uri: require('./images/userInfo/default_photo.png'),
 		phone: '',
 		phone_bind_result: false,
 		phone_bind_type: 1, //1是绑定，2是修改
-		phone_bind_color: '',
+		phone_bind_color: 'red',
 		wechat_nickName: '',
-		wechat_bind_color: ''
+		wechat_bind_color: 'red',
+		show_bind_phone: false
 	};
 
 	render() {
@@ -94,7 +91,7 @@ export default class PersonalInfo extends BasePage {
 						}}
 					>
 						<ImageBackground
-							source={require('../images/userInfo/top.png')}
+							source={require('./images/userInfo/top.png')}
 							style={{
 								flex: 3,
 								width: '100%',
@@ -256,7 +253,7 @@ export default class PersonalInfo extends BasePage {
 												numberOfLines={1}
 												ellipsizeMode={'tail'}
 											>
-												{this.state.nickName}
+												{this.state.user_nickName}
 											</Text>
 										</View>
 										<View
@@ -637,7 +634,7 @@ export default class PersonalInfo extends BasePage {
 										onPress={() => this.logout()}
 									>
 										<ImageBackground
-											source={require('../images/userInfo/logoutbg1.png')}
+											source={require('./images/userInfo/logoutbg1.png')}
 											style={{
 												flex: 1,
 												width: '100%',
@@ -669,66 +666,110 @@ export default class PersonalInfo extends BasePage {
 						</View>
 					</View>
 				</View>
+				{/* <BindPhoneSuccess show={this.state.show_bind_phone} /> */}
 			</View>
 		);
 	}
 
 	componentWillMount() {
-		var date = new Date();
-		var year = date.getFullYear().toString();
-		var month = (date.getMonth() + 1).toString();
-		var day = date.getDate().toString();
-		this.setState({
-			birthday_year: year,
-			birthday_month: month,
-			birthday_day: day,
-			birthday_time: year + '年' + month + '月' + day + '日'
-		});
-		if (this.state.phone == null || this.state.phone === '') {
-			this.setState({
-				phone_bind_color: 'red',
-				phone_bind_type: 1,
-				phone: '未绑定'
-			});
-		} else {
-			this.setState({
-				phone_bind_color: 'rgba(113, 113, 113, 1)',
-				phone_bind_type: 2
+		//获取用户信息
+		this.getUserInfo();
+		BackHandler.addEventListener('hardwareBackPress', this.onBackAndroid);
+	}
+	componentWillUnmount() {
+		BackHandler.removeEventListener('hardwareBackPress', this.onBackAndroid);
+	}
+
+	async getUserInfo() {
+		let userinfo = await global.storage
+			.load({
+				key: 'userInfo'
+			})
+			.then((result) => {
+				console.log('============PersonalInfo========================');
+				console.log(result.user.birthday);
+				console.log('============PersonalInfo========================');
+				var time = this.formaterDate(result.user.birthday);
+				this.setState({
+					schoolName:
+
+							result.user.school === '' ? '未设置' :
+							result.user.school,
+					provinceName:
+
+							result.user.province === '' ? '未设置' :
+							result.user.province,
+					citys:
+
+							result.user.city === '' ? '未设置' :
+							result.user.city,
+					phone: result.user.mobile,
+					wechat_nickName: result.user.wechat_nickName,
+					user_nickName: result.user.nickName,
+					birthday_time: time
+				});
+
+				if (this.state.phone == null || this.state.phone === '') {
+					this.setState({
+						phone_bind_color: 'red',
+						phone_bind_type: 1,
+						phone: '未绑定'
+					});
+				} else {
+					this.setState({
+						phone_bind_color: 'rgba(113, 113, 113, 1)',
+						phone_bind_type: 2
+					});
+				}
+				if (this.state.wechat_nickName == null || this.state.wechat_nickName === '') {
+					this.setState({
+						wechat_bind_color: 'red',
+						wechat_nickName: '未绑定'
+					});
+				} else {
+					this.setState({
+						wechat_bind_color: 'rgba(113, 113, 113, 1)'
+					});
+				}
+				return result;
+			})
+			.catch((err) => {
+				console.log('PersonalInfo:ERROR' + err.message);
+				return null;
 			});
-		}
-		if (this.state.wechat_nickName == null || this.state.wechat_nickName === '') {
+	}
+
+	onBackAndroid = () => {
+		if (this.state.show_bind_phone) {
 			this.setState({
-				wechat_bind_color: 'red',
-				wechat_nickName: '未绑定'
+				show_bind_phone: false
 			});
 		} else {
-			this.setState({
-				wechat_bind_color: 'rgba(113, 113, 113, 1)'
-			});
+			this.goBack();
 		}
-	}
+		return true;
+	};
 
 	getArraowImg(type) {
 		return (
-			<TouchableOpacity
+			<View
 				style={{
 					width: '100%',
 					height: '100%',
 					alignItems: 'center',
-
 					resizeMode: 'contain',
 					justifyContent: 'center'
 				}}
 				//onPress={() => this.arrowpress(type)}
 			>
 				<Image
-					source={require('../images/userInfo/arrow.png')}
+					source={require('./images/userInfo/arrow.png')}
 					style={{
 						width: '20%',
 						height: '30%'
 					}}
 				/>
-			</TouchableOpacity>
+			</View>
 		);
 	}
 
@@ -736,29 +777,29 @@ export default class PersonalInfo extends BasePage {
 		let headerpath;
 		switch (type) {
 			case 0:
-				headerpath = require('../images/userInfo/headportrait.png');
+				headerpath = require('./images/userInfo/headportrait.png');
 
 				break;
 			case 1:
-				headerpath = require('../images/userInfo/nickname.png');
+				headerpath = require('./images/userInfo/nickname.png');
 				break;
 			case 2:
-				headerpath = require('../images/userInfo/birthday.png');
+				headerpath = require('./images/userInfo/birthday.png');
 				break;
 			case 3:
-				headerpath = require('../images/userInfo/location.png');
+				headerpath = require('./images/userInfo/location.png');
 				break;
 			case 4:
-				headerpath = require('../images/userInfo/school.png');
+				headerpath = require('./images/userInfo/school.png');
 				break;
 			case 5:
-				headerpath = require('../images/userInfo/grade.png');
+				headerpath = require('./images/userInfo/grade.png');
 				break;
 			case 6:
-				headerpath = require('../images/userInfo/phone.png');
+				headerpath = require('./images/userInfo/phone.png');
 				break;
 			case 7:
-				headerpath = require('../images/userInfo/wechat.png');
+				headerpath = require('./images/userInfo/wechat.png');
 				break;
 		}
 		// alert(headerpath);
@@ -802,7 +843,7 @@ export default class PersonalInfo extends BasePage {
 			case 6:
 				this.props.navigation.navigate('PhoneBind', {
 					type: this.state.phone_bind_type,
-					BindData: this.bind_phone.bind(this)
+					bind_phone_back: this.bind_phone_back.bind(this)
 				});
 				break;
 			//微信
@@ -823,7 +864,7 @@ export default class PersonalInfo extends BasePage {
 							nickName: result['nickname']
 						}
 					};
-					user.bind_wechat(opts).then((res) => {
+					http_user.bind_wechat(opts).then((res) => {
 						if (res.code == 200) {
 							this.setState({
 								wechat_nickName: res['nickname'],
@@ -839,13 +880,9 @@ export default class PersonalInfo extends BasePage {
 	}
 
 	logout() {
-		const resetAction = StackActions.reset({
-			index: 0,
-			actions: [
-				NavigationActions.navigate({ routeName: 'Login' }) //要跳转到的页面名字
-			]
-		});
-		this.props.navigation.dispatch(resetAction);
+		//清空存储的用户信息
+		global.storage.remove({ key: 'userInfo' });
+		this.clearPageToNext('Login');
 	}
 
 	updateState(input_text, type) {
@@ -894,17 +931,61 @@ export default class PersonalInfo extends BasePage {
 			method: 'PUT', //请求方法
 			body: object //请求体
 		};
-		user.update_UserInfo(opts).then((res) => {
+		http_user.update_UserInfo(opts).then((res) => {
 			console.log(res);
 		});
 	}
 
-	bind_phone(phone_num, result) {
-		alert('绑定手机号回传');
-		this.setState({ phone: phone_num, phone_bind_result: result });
+	bind_phone_back(phone_num, result) {
+		if (result == true) {
+			ToastAndroid.show('修改成功', ToastAndroid.SHORT);
+			this.setState({ phone: phone_num, phone_bind_result: result, show_bind_phone: true });
+		} else {
+			// ToastAndroid.show('修改失败', ToastAndroid.SHORT);
+		}
+	}
+
+	formaterDate(date) {
+		var date = new Date(date);
+		var Y = date.getFullYear() + '';
+		var M =
+			(
+				date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) :
+				date.getMonth() + 1) + '';
+
+		var D =
+			(
+				date.getDate() < 10 ? '0' + date.getDate() :
+				date.getDate()) + ' ';
+
+		//影响选择出生年月日了。
+		this.setState({
+			birthday_year: Y,
+			birthday_month: M,
+			birthday_day: D
+		});
+		return Y + '-' + M + '-' + D;
 	}
 }
 
+class BindPhoneSuccess extends BasePage {
+	render() {
+		if (this.props.show) {
+			return (
+				<View
+					style={{
+						position: 'absolute',
+						width: '100%',
+						height: '100%',
+						backgroundColor: 'rgba(0, 0, 0, 0.5)'
+					}}
+				/>
+			);
+		} else {
+			return null;
+		}
+	}
+}
 const styles = StyleSheet.create({
 	item: {
 		flex: 1,

pages/PhoneBind.js

@@ -3,27 +3,18 @@
 */
 import React, { Component } from 'react';
 import {
-	Platform,
 	StyleSheet,
 	Text,
 	View,
 	Image,
 	TouchableOpacity,
-	ImageBackground,
-	Button,
-	StatusBar,
-	Modal,
-	TouchableHighlight,
 	ToastAndroid,
-	DeviceEventEmitter,
+	StatusBar,
 	TextInput,
-	ScrollView
+	BackHandler
 } from 'react-native';
 import BasePage from './BasePage';
 import Dimensions from './utils/dimensions';
-import ShopBox from './components/ShopBox';
-import TopicTitle from './components/TopicTitle';
-import ScrollRow from './components/ScrollRow';
 import http_user from './services/user';
 import commonutil from './utils/commonutil';
 
@@ -35,15 +26,29 @@ export default class PhoneBind extends BasePage {
 		verification_code: '',
 		http_verification_code: '',
 		page_title_text: '绑定手机号',
-		click_ok_text: '绑 定'
+		click_ok_text: '绑 定',
+		phone_bind_result: false
 	};
 	render() {
 		return (
 			<View style={styles.wrapper}>
-				<View style={styles.jump}>
-					<TouchableOpacity style={styles.jumpBtn}>
-						<Text style={styles.jumpText}>{this.state.page_title_text}</Text>
-					</TouchableOpacity>
+				<StatusBar backgroundColor={'white'} translucent={true} barStyle={'dark-content'} />
+
+				<View style={{ flex: 2 }}>
+					<View style={{ marginTop: '6%', flex: 2, flexDirection: 'row' }}>
+						<TouchableOpacity
+							style={{ marginLeft: '5%' }}
+							activeOpacity={1}
+							onPress={this.backresult.bind(this)}
+						>
+							<Image source={require('./images/schedulePage/back_black.png')} />
+						</TouchableOpacity>
+					</View>
+					<View style={styles.jump}>
+						<TouchableOpacity style={styles.jumpBtn}>
+							<Text style={styles.jumpText}>{this.state.page_title_text}</Text>
+						</TouchableOpacity>
+					</View>
 				</View>
 				<View style={styles.phoneNumberBox}>
 					<Text style={styles.phoneNumber}>手机号</Text>
@@ -86,24 +91,39 @@ export default class PhoneBind extends BasePage {
 		);
 	}
 	componentWillMount() {
-		switch (this.props.navigation.state.params.type) {
+		BackHandler.addEventListener('hardwareBackPress', this.onBackAndroid);
+		var type;
+		if (this.props.navigation.state.params == undefined) {
+			type = 1;
+		} else {
+			type = this.props.navigation.state.params.type;
+		}
+		switch (type) {
 			case 1:
 				this.setState({
-					type: this.props.navigation.state.params.type,
+					type: type,
 					page_title_text: '绑定手机号',
 					click_ok_text: '绑 定'
 				});
 				break;
 			case 2:
 				this.setState({
-					type: this.props.navigation.state.params.type,
+					type: type,
 					page_title_text: '修改手机号',
 					click_ok_text: '修 改'
 				});
 				break;
 		}
 	}
+	componentWillUnmount() {
+		BackHandler.removeEventListener('hardwareBackPress', this.onBackAndroid);
+	}
 
+	onBackAndroid = () => {
+		this.props.navigation.state.params.bind_phone_back(this.state.phone_num, this.state.phone_bind_result);
+		this.props.navigation.goBack();
+		return true;
+	};
 	getVerification() {
 		if (this.state.verification_text === '获取验证码') {
 			if (commonutil.isPoneAvailable(this.state.phone_num)) {
@@ -148,6 +168,14 @@ export default class PhoneBind extends BasePage {
 
 	//绑定手机号
 	clickOK() {
+		if (!commonutil.isPoneAvailable(this.state.phone_num)) {
+			ToastAndroid.show('请输入正确的手机号', ToastAndroid.SHORT);
+			return;
+		}
+		if (this.state.verification_code == '') {
+			ToastAndroid.show('请输入验证码', ToastAndroid.SHORT);
+			return;
+		}
 		if (this.state.http_verification_code == this.state.verification_code) {
 			let option = {
 				method: 'PUT', //请求方法
@@ -157,11 +185,28 @@ export default class PhoneBind extends BasePage {
 					sign: this.state.verification_code
 				}
 			};
-			http_user.bind_phone(option).then((result) => {});
+			http_user.bind_phone(option).then((result) => {
+				if (result.code == 200) {
+					this.setState({
+						phone_bind_result: true
+					});
+					ToastAndroid.show(result.message, ToastAndroid.SHORT);
+				} else {
+					this.setState({
+						phone_bind_result: false
+					});
+					ToastAndroid.show(result.message, ToastAndroid.SHORT);
+				}
+			});
 		} else {
 			ToastAndroid.show('验证码不正确', ToastAndroid.SHORT);
 		}
 	}
+
+	backresult() {
+		this.props.navigation.state.params.bind_phone_back(this.state.phone_num, this.state.phone_bind_result);
+		this.props.navigation.goBack();
+	}
 }
 
 const styles = StyleSheet.create({

pages/SchoolAge.js

@@ -0,0 +1,104 @@
+/**
+ * Sample React Native App
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ * @flow
+ */
+
+import React, { Component } from 'react';
+import {
+	Platform,
+	StyleSheet,
+	Text,
+	View,
+	Image,
+	TouchableOpacity,
+	StatusBar,
+	ImageBackground,
+	Button,
+	DeviceEventEmitter
+} from 'react-native';
+import BasePage from './BasePage';
+
+type Props = {};
+export default class SchoolAge extends BasePage {
+	render() {
+		return (
+			<ImageBackground
+				// source={{
+				// 	uri:
+				// 		'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556277324856&di=dc1548a0c5ba10481af922e174912937&imgtype=0&src=http%3A%2F%2Fwww.51pptmoban.com%2Fd%2Ffile%2F2012%2F05%2F12%2F82c4568a90055adcf8fbb896f0841c69.jpg'
+				// }}
+				style={{
+					flex: 1,
+					width: '100%',
+					height: '100%',
+					backgroundColor: 'white'
+				}}
+			>
+				<StatusBar backgroundColor={'transparent'} translucent={true} barStyle={'dark-content'} />
+				<View style={{ flex: 0.5 }} />
+				<Text style={styles.title_text}>请选择孩子所在的学龄段</Text>
+				<View style={{ flex: 0.1 }} />
+				<View
+					style={{
+						flex: 5,
+						flexDirection: 'column',
+						justifyContent: 'center',
+						alignItems: 'center'
+					}}
+				>
+					<View style={styles.view_flex} />
+					<TouchableOpacity activeOpacity={1} onPress={this.pres.bind(this)} style={styles.touchable_item}>
+						<Image source={require('./images/schoolAge/preschool.png')} style={styles.image_item} />
+					</TouchableOpacity>
+					<View style={styles.view_flex} />
+					<TouchableOpacity activeOpacity={1} onPress={this.primary.bind(this)} style={styles.touchable_item}>
+						<Image source={require('./images/schoolAge/primary.png')} style={styles.image_item} />
+					</TouchableOpacity>
+					<View style={styles.view_flex} />
+					<TouchableOpacity activeOpacity={1} onPress={this.middle.bind(this)} style={styles.touchable_item}>
+						<Image source={require('./images/schoolAge/middle.png')} style={styles.image_item} />
+					</TouchableOpacity>
+					<View style={styles.view_flex} />
+				</View>
+			</ImageBackground>
+		);
+	}
+
+	pres() {
+		this.clearPageToNext('MainPage', { index: 0 });
+	}
+
+	primary() {
+		this.clearPageToNext('MainPage', { index: 1 });
+	}
+
+	middle() {
+		this.clearPageToNext('MainPage', { index: 2 });
+	}
+}
+
+const styles = StyleSheet.create({
+	title_text: {
+		justifyContent: 'center',
+		alignItems: 'center',
+		color: 'black',
+		fontSize: 20,
+		fontWeight: '300',
+		textAlign: 'center'
+	},
+	view_flex: { flex: 0.1 },
+	touchable_item: {
+		flex: 1,
+		width: '90%',
+		justifyContent: 'center',
+		alignItems: 'center'
+	},
+	image_item: {
+		width: '100%',
+		height: '95%',
+		resizeMode: 'contain'
+	}
+});

pages/Splash.js

@@ -0,0 +1,61 @@
+import React, { PureComponent } from 'react';
+import { StyleSheet, Text, View, Image, TouchableOpacity, StatusBar, ToastAndroid, TextInput } from 'react-native';
+import BasePage from './BasePage';
+import SplashScreen from 'react-native-splash-screen';
+export default class Splash extends BasePage {
+	state = {
+		exist: false
+	};
+	render() {
+		return (
+			<View style={{ flex: 1 }}>
+				<StatusBar backgroundColor={'transparent'} translucent={true} />
+			</View>
+		);
+	}
+
+	componentWillMount() {
+		// global.storage.remove({ key: 'userInfo' });
+		this.getUserInfo();
+	}
+
+	componentDidMount() {
+		setTimeout(() => {
+			SplashScreen.hide();
+			if (this.state.exist) {
+				this.clearPageToNext('MainPage');
+			} else {
+				this.clearPageToNext('Login');
+			}
+		}, 3000);
+	}
+
+	getUserInfo() {
+		//判断是否有用户
+		global.storage
+			.load({
+				key: 'userInfo'
+			})
+			.then((result) => {
+				this.setState({
+					exist: true
+				});
+			})
+			.catch((err) => {
+				console.log(err.message);
+				switch (err.name) {
+					case 'NotFoundError':
+						// TODO;
+						// alert('NotFoundError');
+						this.setState({
+							exist: false
+						});
+						break;
+					case 'ExpiredError':
+						// TODO
+						// alert('ExpiredError');
+						break;
+				}
+			});
+	}
+}

pages/components/BirthdayModal.js

@@ -6,522 +6,492 @@
  * @flow
  */
 
-import React, { Component } from "react";
+import React, { Component } from 'react';
 import {
-  Platform,
-  StyleSheet,
-  Text,
-  View,
-  Image,
-  TouchableOpacity,
-  ImageBackground,
-  TextInput,
-  Button,
-  StatusBar,
-  Modal,
-  ScrollView,
-  TouchableHighlight,
-  DeviceEventEmitter,
-  findNodeHandle,
-  UIManager
-} from "react-native";
+	Platform,
+	StyleSheet,
+	Text,
+	View,
+	Image,
+	TouchableOpacity,
+	ImageBackground,
+	TextInput,
+	Button,
+	StatusBar,
+	Modal,
+	ScrollView,
+	TouchableHighlight,
+	DeviceEventEmitter,
+	findNodeHandle,
+	UIManager
+} from 'react-native';
 
 type Props = {};
 export default class BirthdayModal extends Component<Props> {
-  state = {
-    text_height: -1,
-    modalVisible: false,
-    year_type: false, //true为闰年，false为平年
-    year_array_views: [],
-    year_array: [],
-    year_array_views_index: -1,
-    month_array_views: [],
-    month_array_views_indexs: -1,
-    month_array: [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "7",
-      "8",
-      "9",
-      "10",
-      "11",
-      "12"
-    ],
-    day_array: [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "7",
-      "8",
-      "9",
-      "10",
-      "11",
-      "12",
-      "13",
-      "14",
-      "15",
-      "16",
-      "17",
-      "18",
-      "19",
-      "20",
-      "21",
-      "22",
-      "23",
-      "24",
-      "25",
-      "26",
-      "27",
-      "28",
-      "29",
-      "30",
-      "31"
-    ],
-    day_array_views: [],
-    day_array_views_index: -1
-  };
+	state = {
+		text_height: -1,
+		modalVisible: false,
+		year_type: false, //true为闰年，false为平年
+		year_array_views: [],
+		year_array: [],
+		year_array_views_index: -1,
+		month_array_views: [],
+		month_array_views_indexs: -1,
+		month_array: [ '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12' ],
+		day_array: [
+			'1',
+			'2',
+			'3',
+			'4',
+			'5',
+			'6',
+			'7',
+			'8',
+			'9',
+			'10',
+			'11',
+			'12',
+			'13',
+			'14',
+			'15',
+			'16',
+			'17',
+			'18',
+			'19',
+			'20',
+			'21',
+			'22',
+			'23',
+			'24',
+			'25',
+			'26',
+			'27',
+			'28',
+			'29',
+			'30',
+			'31'
+		],
+		day_array_views: [],
+		day_array_views_index: -1
+	};
 
-  render() {
-    return (
-      <Modal
-        animationType="slide"
-        transparent={true}
-        visible={this.state.modalVisible}
-        onRequestClose={() => {
-          this.setState({ modalVisible: false });
-        }}
-      >
-        <View
-          style={{
-            flex: 1,
-            flexDirection: "column"
-          }}
-        >
-          <TouchableOpacity
-            style={{
-              flex: 3.2,
-              backgroundColor: "rgba(0, 0, 0, 0.5)",
-              width: "100%"
-            }}
-            activeOpacity={1}
-            onPress={() =>
-              this.setState({
-                modalVisible: false
-              })
-            }
-          />
-          <View
-            style={{
-              flex: 2,
-              backgroundColor: "white",
-              flexDirection: "column",
-              justifyContent: "center",
-              alignItems: "center",
-              width: "100%"
-            }}
-          >
-            <View
-              style={{
-                flex: 1,
-                flexDirection: "row",
-                alignItems: "center",
-                justifyContent: "center"
-              }}
-            >
-              <TouchableOpacity
-                style={{
-                  flex: 1
-                }}
-                activeOpacity={1}
-                onPress={() => this.cancel()}
-              >
-                <View
-                  style={{
-                    flex: 1,
-                    alignItems: "center",
-                    justifyContent: "center"
-                  }}
-                >
-                  <Text
-                    style={{
-                      fontSize: 20,
-                      color: "rgba(59, 59, 59, 1)",
-                      textAlignVertical: "center"
-                    }}
-                  >
-                    取消
-                  </Text>
-                </View>
-              </TouchableOpacity>
-              <View style={{ flex: 3.5 }} />
-              <TouchableOpacity
-                style={{
-                  flex: 1
-                }}
-                activeOpacity={1}
-                onPress={() => this.commit()}
-              >
-                <View
-                  style={{
-                    flex: 1,
-                    alignItems: "center",
-                    justifyContent: "center"
-                  }}
-                >
-                  <Text
-                    style={{
-                      fontSize: 20,
-                      color: "rgba(59, 59, 59, 1)",
-                      textAlignVertical: "center"
-                    }}
-                  >
-                    完成
-                  </Text>
-                </View>
-              </TouchableOpacity>
-            </View>
-            <View
-              style={{
-                flex: 0.05,
-                width: "90%",
-                backgroundColor: "rgba(246, 247, 248, 1)"
-              }}
-            />
-            <View
-              style={{
-                flex: 5,
-                flexDirection: "row"
-              }}
-            >
-              <View
-                style={{
-                  flex: 1
-                }}
-              >
-                <ScrollView
-                  style={{
-                    flex: 1
-                  }}
-                  ref={view => (this.year_scroll = view)}
-                  onLayout={() => this.year_onlayout()}
-                  showsVerticalScrollIndicator={false}
-                >
-                  {this.create_year_item()}
-                </ScrollView>
-              </View>
-              <View
-                style={{
-                  flex: 1
-                }}
-              >
-                <ScrollView
-                  ref={view => (this.month_scroll = view)}
-                  onLayout={() => this.month_onlayout()}
-                  style={{
-                    flex: 1
-                  }}
-                  showsVerticalScrollIndicator={false}
-                >
-                  {this.create_month_item()}
-                </ScrollView>
-              </View>
-              <View
-                style={{
-                  flex: 1
-                }}
-              >
-                <ScrollView
-                  ref={view => (this.day_scroll = view)}
-                  onLayout={() => this.day__onlayout()}
-                  style={{
-                    flex: 1
-                  }}
-                  showsVerticalScrollIndicator={false}
-                >
-                  {this.create_day_item()}
-                </ScrollView>
-              </View>
-            </View>
-          </View>
-        </View>
-      </Modal>
-    );
-  }
+	render() {
+		return (
+			<Modal
+				animationType="slide"
+				transparent={true}
+				visible={this.state.modalVisible}
+				onRequestClose={() => {
+					this.setState({ modalVisible: false });
+				}}
+			>
+				<View
+					style={{
+						flex: 1,
+						flexDirection: 'column'
+					}}
+				>
+					<TouchableOpacity
+						style={{
+							flex: 3.2,
+							backgroundColor: 'rgba(0, 0, 0, 0.5)',
+							width: '100%'
+						}}
+						activeOpacity={1}
+						onPress={() =>
+							this.setState({
+								modalVisible: false
+							})}
+					/>
+					<View
+						style={{
+							flex: 2,
+							backgroundColor: 'white',
+							flexDirection: 'column',
+							justifyContent: 'center',
+							alignItems: 'center',
+							width: '100%'
+						}}
+					>
+						<View
+							style={{
+								flex: 1,
+								flexDirection: 'row',
+								alignItems: 'center',
+								justifyContent: 'center'
+							}}
+						>
+							<TouchableOpacity
+								style={{
+									flex: 1
+								}}
+								activeOpacity={1}
+								onPress={() => this.cancel()}
+							>
+								<View
+									style={{
+										flex: 1,
+										alignItems: 'center',
+										justifyContent: 'center'
+									}}
+								>
+									<Text
+										style={{
+											fontSize: 20,
+											color: 'rgba(59, 59, 59, 1)',
+											textAlignVertical: 'center'
+										}}
+									>
+										取消
+									</Text>
+								</View>
+							</TouchableOpacity>
+							<View style={{ flex: 3.5 }} />
+							<TouchableOpacity
+								style={{
+									flex: 1
+								}}
+								activeOpacity={1}
+								onPress={() => this.commit()}
+							>
+								<View
+									style={{
+										flex: 1,
+										alignItems: 'center',
+										justifyContent: 'center'
+									}}
+								>
+									<Text
+										style={{
+											fontSize: 20,
+											color: 'rgba(59, 59, 59, 1)',
+											textAlignVertical: 'center'
+										}}
+									>
+										完成
+									</Text>
+								</View>
+							</TouchableOpacity>
+						</View>
+						<View
+							style={{
+								flex: 0.05,
+								width: '90%',
+								backgroundColor: 'rgba(246, 247, 248, 1)'
+							}}
+						/>
+						<View
+							style={{
+								flex: 5,
+								flexDirection: 'row'
+							}}
+						>
+							<View
+								style={{
+									flex: 1
+								}}
+							>
+								<ScrollView
+									style={{
+										flex: 1
+									}}
+									ref={(view) => (this.year_scroll = view)}
+									onLayout={() => this.year_onlayout()}
+									showsVerticalScrollIndicator={false}
+								>
+									{this.create_year_item()}
+								</ScrollView>
+							</View>
+							<View
+								style={{
+									flex: 1
+								}}
+							>
+								<ScrollView
+									ref={(view) => (this.month_scroll = view)}
+									onLayout={() => this.month_onlayout()}
+									style={{
+										flex: 1
+									}}
+									showsVerticalScrollIndicator={false}
+								>
+									{this.create_month_item()}
+								</ScrollView>
+							</View>
+							<View
+								style={{
+									flex: 1
+								}}
+							>
+								<ScrollView
+									ref={(view) => (this.day_scroll = view)}
+									onLayout={() => this.day__onlayout()}
+									style={{
+										flex: 1
+									}}
+									showsVerticalScrollIndicator={false}
+								>
+									{this.create_day_item()}
+								</ScrollView>
+							</View>
+						</View>
+					</View>
+				</View>
+			</Modal>
+		);
+	}
 
-  componentWillMount() {
-    var date = new Date();
-    var year = parseInt(this.props.year);
-    if (this.state.year_array.length == 0) {
-      let position = 0;
-      for (
-        let index = parseInt(year - 50);
-        index < parseInt(year + 10);
-        index++
-      ) {
-        if (parseInt(year) == index) {
-          this.setState({
-            year_array_views_index: position
-          });
-        }
+	componentWillMount() {
+		var date = new Date();
+		var year = parseInt(this.props.year);
+		if (this.state.year_array.length == 0) {
+			let position = 0;
+			for (let index = parseInt(year - 50); index < parseInt(year + 10); index++) {
+				if (parseInt(year) == index) {
+					this.setState({
+						year_array_views_index: position
+					});
+				}
 
-        this.state.year_array.push(index);
-        position++;
-      }
-    }
-    console.log(parseInt(date.getDate()));
-    this.setState({
-      month_array_views_indexs: parseInt(this.props.month) - 1,
-      day_array_views_index: parseInt(this.props.day) - 1
-    });
+				this.state.year_array.push(index);
+				position++;
+			}
+		}
+		console.log(parseInt(date.getDate()));
+		this.setState({
+			month_array_views_indexs: parseInt(this.props.month),
+			day_array_views_index: parseInt(this.props.day)
+		});
 
-    // var hour = date.getHours().toString();
-    // var minute = date.getMinutes().toString();
-  }
+		// var hour = date.getHours().toString();
+		// var minute = date.getMinutes().toString();
+	}
 
-  year_onlayout() {
-    if (this.state.year_array_views_index != -1) {
-      this.year_scroll.scrollTo({
-        x: 0,
-        y: (this.state.text_height + 20) * this.state.year_array_views_index,
-        duration: 500
-      });
-    }
-  }
+	year_onlayout() {
+		if (this.state.year_array_views_index != -1) {
+			this.year_scroll.scrollTo({
+				x: 0,
+				y: (this.state.text_height + 20) * this.state.year_array_views_index,
+				duration: 500
+			});
+		}
+	}
 
-  month_onlayout() {
-    if (this.state.month_array_views_indexs != -1) {
-      this.month_scroll.scrollTo({
-        x: 0,
-        y: (this.state.text_height + 20) * this.state.month_array_views_indexs,
-        duration: 500
-      });
-    }
-  }
+	month_onlayout() {
+		if (this.state.month_array_views_indexs != -1) {
+			this.month_scroll.scrollTo({
+				x: 0,
+				y: (this.state.text_height + 20) * this.state.month_array_views_indexs,
+				duration: 500
+			});
+		}
+	}
 
-  day__onlayout() {
-    if (this.state.day_array_views_index != -1) {
-      this.day_scroll.scrollTo({
-        x: 0,
-        y: (this.state.text_height + 20) * this.state.day_array_views_index,
-        duration: 500
-      });
-    }
-  }
+	day__onlayout() {
+		if (this.state.day_array_views_index != -1) {
+			this.day_scroll.scrollTo({
+				x: 0,
+				y: (this.state.text_height + 20) * this.state.day_array_views_index,
+				duration: 500
+			});
+		}
+	}
 
-  create_year_item() {
-    this.state.year_array_views = [];
-    for (var i = 0; i < this.state.year_array.length; i++) {
-      let index = i;
-      let textstyle = null;
-      if (this.state.year_array_views_index == i) {
-        textstyle = styles.item_text_click;
-      } else {
-        textstyle = styles.item_text;
-      }
-      this.state.year_array_views.push(
-        <Text
-          style={textstyle}
-          key={i}
-          onPress={() => this.click_year_item(index)}
-          onLayout={event => this.text_onLayout(event)}
-        >
-          {this.state.year_array[i]}年
-        </Text>
-      );
-    }
-    return this.state.year_array_views;
-  }
+	create_year_item() {
+		this.state.year_array_views = [];
+		for (var i = 0; i < this.state.year_array.length; i++) {
+			let index = i;
+			let textstyle = null;
+			if (this.state.year_array_views_index == i) {
+				textstyle = styles.item_text_click;
+			} else {
+				textstyle = styles.item_text;
+			}
+			this.state.year_array_views.push(
+				<Text
+					style={textstyle}
+					key={i}
+					onPress={() => this.click_year_item(index)}
+					onLayout={(event) => this.text_onLayout(event)}
+				>
+					{this.state.year_array[i]}年
+				</Text>
+			);
+		}
+		return this.state.year_array_views;
+	}
 
-  click_year_item(index) {
-    this.setState({
-      year_array_views_index: index,
-      year_type: this.getRunYear(this.state.year_array[index])
-    });
-  }
+	click_year_item(index) {
+		this.setState({
+			year_array_views_index: index,
+			year_type: this.getRunYear(this.state.year_array[index])
+		});
+	}
 
-  create_month_item() {
-    this.state.month_array_views = [];
-    for (var i = 0; i < this.state.month_array.length; i++) {
-      let index = i;
-      let textstyle = null;
-      if (this.state.month_array_views_indexs == i) {
-        textstyle = styles.item_text_click;
-      } else {
-        textstyle = styles.item_text;
-      }
-      this.state.month_array_views.push(
-        <Text
-          style={textstyle}
-          key={i}
-          onPress={() => this.click_month_item(index)}
-        >
-          {this.state.month_array[i]}月
-        </Text>
-      );
-    }
-    return this.state.month_array_views;
-  }
+	create_month_item() {
+		this.state.month_array_views = [];
+		for (var i = 0; i < this.state.month_array.length; i++) {
+			let index = i;
+			let textstyle = null;
+			if (this.state.month_array_views_indexs == i) {
+				textstyle = styles.item_text_click;
+			} else {
+				textstyle = styles.item_text;
+			}
+			this.state.month_array_views.push(
+				<Text style={textstyle} key={i} onPress={() => this.click_month_item(index)}>
+					{this.state.month_array[i]}月
+				</Text>
+			);
+		}
+		return this.state.month_array_views;
+	}
 
-  click_month_item(index) {
-    this.setState({
-      month_array_views_indexs: index
-    });
-  }
+	click_month_item(index) {
+		this.setState({
+			month_array_views_indexs: index
+		});
+	}
 
-  create_day_item() {
-    this.state.day_array_views = [];
-    var forNum = 0;
-    //获取月份
-    var month_index = this.state.month_array_views_indexs;
-    switch (month_index + 1) {
-      case 1:
-      case 3:
-      case 5:
-      case 7:
-      case 8:
-      case 10:
-      case 12:
-        //31天
-        forNum = 31;
-        break;
-      case 4:
-      case 6:
-      case 9:
-      case 11:
-        //30天
-        forNum = 30;
-        break;
-      case 2:
-        //2月判断平年闰年
-        if (
-          this.getRunYear(
-            this.state.year_array[this.state.year_array_views_index]
-          )
-        ) {
-          //闰年2月29
-          forNum = 29;
-        } else {
-          //平年2月28
-          forNum = 28;
-        }
-        break;
-    }
+	create_day_item() {
+		this.state.day_array_views = [];
+		var forNum = 0;
+		//获取月份
+		var month_index = this.state.month_array_views_indexs;
+		switch (month_index + 1) {
+			case 1:
+			case 3:
+			case 5:
+			case 7:
+			case 8:
+			case 10:
+			case 12:
+				//31天
+				forNum = 31;
+				break;
+			case 4:
+			case 6:
+			case 9:
+			case 11:
+				//30天
+				forNum = 30;
+				break;
+			case 2:
+				//2月判断平年闰年
+				if (this.getRunYear(this.state.year_array[this.state.year_array_views_index])) {
+					//闰年2月29
+					forNum = 29;
+				} else {
+					//平年2月28
+					forNum = 28;
+				}
+				break;
+		}
 
-    for (var i = 0; i < forNum; i++) {
-      //console.log(i);
-      let index = i;
-      let textstyle = null;
-      if (this.state.day_array_views_index == i) {
-        textstyle = styles.item_text_click;
-      } else {
-        textstyle = styles.item_text;
-      }
-      this.state.day_array_views.push(
-        <Text
-          style={textstyle}
-          key={i}
-          onPress={() => this.click_day_item(index)}
-        >
-          {this.state.day_array[i]}日
-        </Text>
-      );
-    }
+		for (var i = 0; i < forNum; i++) {
+			//console.log(i);
+			let index = i;
+			let textstyle = null;
+			if (this.state.day_array_views_index == i) {
+				textstyle = styles.item_text_click;
+			} else {
+				textstyle = styles.item_text;
+			}
+			this.state.day_array_views.push(
+				<Text style={textstyle} key={i} onPress={() => this.click_day_item(index)}>
+					{this.state.day_array[i]}日
+				</Text>
+			);
+		}
 
-    return this.state.day_array_views;
-  }
-  click_day_item(index) {
-    this.setState({
-      day_array_views_index: index
-    });
-  }
+		return this.state.day_array_views;
+	}
+	click_day_item(index) {
+		this.setState({
+			day_array_views_index: index
+		});
+	}
 
-  text_onLayout = event => {
-    if (this.state.text_height == -1) {
-      this.setState({
-        text_height: event.nativeEvent.layout.height
-      });
-    } else {
-    }
-  };
+	text_onLayout = (event) => {
+		if (this.state.text_height == -1) {
+			this.setState({
+				text_height: event.nativeEvent.layout.height
+			});
+		} else {
+		}
+	};
 
-  commit() {
-    if (
-      this.state.year_array_views_index == -1 ||
-      this.state.month_array_views_indexs == -1 ||
-      this.state.day_array_views_index == -1
-    ) {
-      alert("请选择完整日期");
-    } else {
-      var year = this.state.year_array[this.state.year_array_views_index];
+	commit() {
+		if (
+			this.state.year_array_views_index == -1 ||
+			this.state.month_array_views_indexs == -1 ||
+			this.state.day_array_views_index == -1
+		) {
+			alert('请选择完整日期');
+		} else {
+			var year = this.state.year_array[this.state.year_array_views_index];
 
-      var month = this.state.month_array[this.state.month_array_views_indexs];
+			var month = this.state.month_array[this.state.month_array_views_indexs];
 
-      var day = this.state.day_array[this.state.day_array_views_index];
+			var day = this.state.day_array[this.state.day_array_views_index];
 
-      this.props.birthdaycommit(year, month, day);
-      this.setModalVisible(false);
-    }
-  }
+			this.props.birthdaycommit(year, month, day);
+			this.setModalVisible(false);
+		}
+	}
 
-  cancel() {
-    this.setModalVisible(false);
-    // alert(this.getmyDate());
-  }
+	cancel() {
+		this.setModalVisible(false);
+		// alert(this.getmyDate());
+	}
 
-  setModalVisible(visible) {
-    this.setState({
-      modalVisible: visible
-    });
-  }
-  getmyDate() {
-    var date = new Date();
-    var year = date.getFullYear().toString();
-    var month = (date.getMonth() + 1).toString();
-    var day = date.getDate().toString();
-    var hour = date.getHours().toString();
-    var minute = date.getMinutes().toString();
+	setModalVisible(visible) {
+		this.setState({
+			modalVisible: visible
+		});
+	}
+	getmyDate() {
+		var date = new Date();
+		var year = date.getFullYear().toString();
+		var month = (date.getMonth() + 1).toString();
+		var day = date.getDate().toString();
+		var hour = date.getHours().toString();
+		var minute = date.getMinutes().toString();
 
-    return year + "年" + month + "月" + day + "日" + " " + hour + ":" + minute;
-  }
+		return year + '年' + month + '月' + day + '日' + ' ' + hour + ':' + minute;
+	}
 
-  getRunYear(year) {
-    if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) {
-      //闰年2月29
-      // console.log("闰年");
-      return true;
-    } else {
-      //平年2月28
-      // console.log("平年");
-      return false;
-    }
-  }
+	getRunYear(year) {
+		if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) {
+			//闰年2月29
+			// console.log("闰年");
+			return true;
+		} else {
+			//平年2月28
+			// console.log("平年");
+			return false;
+		}
+	}
 }
 const styles = StyleSheet.create({
-  item_text: {
-    color: "rgba(77, 77, 77, 1)",
-    fontSize: 18,
-    justifyContent: "center",
-    alignItems: "center",
-    marginTop: 20,
-    width: "100%",
-    textAlignVertical: "center",
-    textAlign: "center"
-  },
-  item_text_click: {
-    color: "rgba(59, 149, 243, 1)",
-    fontSize: 18,
-    justifyContent: "center",
-    alignItems: "center",
-    marginTop: 20,
-    width: "100%",
-    textAlignVertical: "center",
-    textAlign: "center"
-  }
+	item_text: {
+		color: 'rgba(77, 77, 77, 1)',
+		fontSize: 18,
+		justifyContent: 'center',
+		alignItems: 'center',
+		marginTop: 20,
+		width: '100%',
+		textAlignVertical: 'center',
+		textAlign: 'center'
+	},
+	item_text_click: {
+		color: 'rgba(59, 149, 243, 1)',
+		fontSize: 18,
+		justifyContent: 'center',
+		alignItems: 'center',
+		marginTop: 20,
+		width: '100%',
+		textAlignVertical: 'center',
+		textAlign: 'center'
+	}
 });

pages/components/SchoolAge.js

@@ -1,148 +0,0 @@
-/**
- * Sample React Native App
- * https://github.com/facebook/react-native
- *
- * @format
- * @flow
- */
-
-import React, { Component } from "react";
-import {
-  Platform,
-  StyleSheet,
-  Text,
-  View,
-  Image,
-  TouchableOpacity,
-  ImageBackground,
-  Button,
-  DeviceEventEmitter
-} from "react-native";
-import AndroidUtil from "../../util/AndroidUtil";
-import BasePage from "../BasePage";
-
-
-type Props = {};
-export default class SchoolAge extends BasePage {
-  render() {
-    return (
-      <ImageBackground
-        source={{
-          uri:
-            "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556277324856&di=dc1548a0c5ba10481af922e174912937&imgtype=0&src=http%3A%2F%2Fwww.51pptmoban.com%2Fd%2Ffile%2F2012%2F05%2F12%2F82c4568a90055adcf8fbb896f0841c69.jpg"
-        }}
-        style={{
-          flex: 1,
-          width: "100%",
-          height: "100%"
-        }}
-      >
-        <Text style={styles.title_text}>请选择孩子所在的学龄段</Text>
-        <View
-          style={{
-            flex: 1,
-            flexDirection: "column",
-            justifyContent: "center",
-            alignItems: "stretch"
-          }}
-        >
-          <View
-            style={{
-              flex: 1,
-              flexDirection: "row"
-            }}
-          >
-            <View style={{ flex: 1 }} />
-            <TouchableOpacity
-              activeOpacity={1}
-              style={{
-                flex: 3,
-                width: 300,
-                height: 150
-              }}
-              onPress={() => this.toNextPage("MainActivity")}
-            >
-              <Image
-                source={{
-                  uri:
-                    "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556275628062&di=ee191e8dccb7132ad39f2f11b0fb1161&imgtype=0&src=http%3A%2F%2Fc61.cnki.net%2FCJFD%2Fbig%2FXQYJ%2FXQYJ199609.jpg"
-                }}
-                style={{
-                  width: 300,
-                  height: 150,
-                  borderRadius: 50
-                }}
-              />
-            </TouchableOpacity>
-            <View style={{ flex: 1 }} />
-          </View>
-          <View
-            style={{
-              flex: 1,
-              flexDirection: "row"
-            }}
-          >
-            <View style={{ flex: 1 }} />
-            <TouchableOpacity
-              activeOpacity={1}
-              style={{
-                flex: 3,
-                width: 300,
-                height: 150
-              }}
-              onPress={() => this.toNextPage("MainPage")}
-            >
-              <Image
-                source={{
-                  uri:
-                    "https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=532481250,2026274152&fm=15&gp=0.jpg"
-                }}
-                style={{
-                  flex: 3,
-                  width: 300,
-                  height: 150,
-                  borderRadius: 50
-                }}
-              />
-            </TouchableOpacity>
-            <View style={{ flex: 1 }} />
-          </View>
-          <View
-            style={{
-              flex: 1,
-
-              flexDirection: "row"
-            }}
-          >
-            <View style={{ flex: 1 }} />
-            <Image
-              source={{
-                uri:
-                  "https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1295208965,3056573814&fm=26&gp=0.jpg"
-              }}
-              style={{
-                flex: 3,
-                width: 300,
-                height: 150,
-                borderRadius: 50
-              }}
-            />
-            <View style={{ flex: 1 }} />
-          </View>
-        </View>
-      </ImageBackground>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  title_text: {
-    justifyContent: "center",
-    alignItems: "center",
-    color: "red",
-    fontSize: 30,
-    textAlign: "center",
-    marginTop: 30,
-    marginBottom: 50
-  }
-});

pages/services/user.js

@@ -13,19 +13,33 @@ export default class user {
 			method: 'get'
 		});
 	}
+
+	//更新个人信息
 	static update_UserInfo(opts) {
 		return request(APIConfig.getUserUrl(``), opts);
 	}
 
+	//绑定微信
 	static bind_wechat(opts) {
 		return request(APIConfig.getUserUrl(`/wechatBind`), opts);
 	}
 
+	//获取验证码
 	static getVerificationCode(phone) {
 		return request(APIConfig.getUserUrl(`/sendCode?mobile=` + phone));
 	}
-
+	//绑定手机号
 	static bind_phone(opts) {
 		return request(APIConfig.getUserUrl(`/mobileBind`), opts);
 	}
+
+	//手机号登陆注册
+	static mobileLoginAndReg(opts) {
+		return request(APIConfig.getUserUrl(`/mobileLoginAndReg`), opts);
+	}
+
+	//微信登陆
+	static wechatLogin(opts) {
+		return request(APIConfig.getUserUrl(``), opts);
+	}
 }

pages/utils/commonutil.js

@@ -10,4 +10,5 @@ export default class commonutil {
 			return true;
 		}
 	}
+
 }