个人中心-修改密码联调完成

weimeng · weimeng · commit c49c2a6124e7 · 2017-01-18T00:28:31.000+08:00
diff --git a/app/domain/api/apidoc.md b/app/domain/api/apidoc.md
@@ -232,7 +232,10 @@ orderId : 订单编号
 **成功返回**
 ```
 {
-    code : 0
+    code : 0,
+    data : {
+        name : '张三'
+    }
 }
 ```
 
diff --git a/app/domain/api/apis.js b/app/domain/api/apis.js
@@ -116,6 +116,7 @@ export const login = (data) => {
 
   console.log("@login")
   return http_get("/user/identity", data)
+  
 }
 
 /**
diff --git a/app/domain/page/Login.js b/app/domain/page/Login.js
@@ -80,8 +80,13 @@ export class Login extends Component {
     this.setState({busy : true})
     const {mobile,password} = data
     const result = await login({mobile, password})
-    this.setState({busy : false})
 
+    this.setState({busy : false})
+    
+    store.dispatch({
+      type : "LOGIN_SUCCESS",
+      name : result.name 
+    })
     if(this.props.route.from) {
       this.props.navigator.pop()
     }
@@ -125,11 +130,18 @@ const LoginForm = ({form, fields, submit, busy, navigator}) => {
     <View>
       <ZInput placeholder="手机号" keyboardType="phone-pad" {...mobile} />
       <ZInput placeholder="密码"  {...password} secureTextEntry={true} />
-      <TouchableOpacity 
-        onPress={() => navigator.push({...Routes.Register})}
-        style={{paddingLeft : 20}}>
-        <Text style={{color : COLOR_PRIMARY, marginTop : 10}}>没有账号?马上注册</Text>
-      </TouchableOpacity>
+      <View style={{justifyContent : "space-between", flexDirection : 'row'}}>
+        <TouchableOpacity
+          onPress={() => navigator.push({...Routes.Register})}
+          style={{paddingLeft : 20}}>
+          <Text style={{color : COLOR_PRIMARY, marginTop : 10}}>没有账号?马上注册</Text>
+        </TouchableOpacity>
+        <TouchableOpacity
+          onPress={() => navigator.push({...Routes.ResetPassword})}
+          style={{paddingRight : 20}}>
+          <Text style={{color : COLOR_PRIMARY, marginTop : 10}}>忘记密码</Text>
+        </TouchableOpacity>
+      </View>
       <View style={{...flexCenter, marginTop : 20}}>
         <ZButton onPress={submit} loading={busy}>登录</ZButton>
       </View>
diff --git a/app/domain/page/Tabs.js b/app/domain/page/Tabs.js
@@ -44,12 +44,12 @@ export class Tabs extends Component{
         <Tabbar.Item 
           name="mycourse"
           title="我的课程" activeIcon={require("./images/my-course.png")} icon={require("./images/my-course-gray.png")}>
-          <MyCourse />
+          <MyCourse  navigator={this.props.navigator} route={this.props.route} />
         </Tabbar.Item>
         <Tabbar.Item 
           name="usercenter"
           title="个人中心" activeIcon={require("./images/user-center.png")} icon={require("./images/user-center-gray.png")}>
-          <UserCenter />
+          <UserCenter  navigator={this.props.navigator} route={this.props.route} />
         </Tabbar.Item>
       </Tabbar>
     )
diff --git a/app/domain/page/UserCenter.js b/app/domain/page/UserCenter.js
@@ -39,25 +39,42 @@ const {width, height} = Dimensions.get('window')
 const sliderItemStyle = {width, height : width * 0.6}
 
 import {Routes} from "domain/page"
-export class UserCenter extends Component{
+import {connect} from 'react-redux'
+class _UserCenter extends Component{
 
   _about(){
     this.props.navigator.push({...Routes.About})
   }
   
+  _reset(){
+    this.props.navigator.push({...Routes.ResetPassword})
+  }
+  
+  _logout(){
+    
+    store.dispatch({type : "LOGOUT"})
+    
+    this.props.switch_to("home")
+  }
+  
+  
+  
   render(){
     return (
       <ScrollView style={{backgroundColor : "white"}}>
         <View>
           <Image source={require("./images/usercenter.png")} style={sliderItemStyle} >
           </Image>
+          <View style={{position : "absolute", top : sliderItemStyle.height * 0.7, backgroundColor: "rgba(0,0,0,0)", width : Dimensions.get("window").width, alignItems : 'center'}}>
+            <Text style={{color : 'white', fontSize : 16}}>{this.props.name}</Text>
+          </View>
         </View>
 
         <View style={{marginTop : 10}}>
           {/*<StripedButton icon={require("./images/uc/question.png")}>常见问题</StripedButton>*/}
           <StripedButton onPress={this._about.bind(this)} icon={require("./images/uc/user.png")}>关于《珠峰课堂》</StripedButton>
-          <StripedButton icon={require("./images/uc/password.png")}>修改密码</StripedButton>
-          <StripedButton icon={require("./images/uc/password.png")}>登出</StripedButton>
+          <StripedButton onPress={this._reset.bind(this)} icon={require("./images/uc/password.png")}>修改密码</StripedButton>
+          <StripedButton onPress={this._logout.bind(this)} icon={require("./images/uc/password.png")}>登出</StripedButton>
         </View>
       </ScrollView>
     )
@@ -97,4 +114,14 @@ const styles = StyleSheet.create({
     marginRight : 20
   }
   
-})
+})
+
+const map = (state) => {
+  
+  return {
+    name : state.user.name
+  }
+  
+}
+
+export let UserCenter = connect(map)(_UserCenter)
diff --git a/app/domain/redux/reducers/user.js b/app/domain/redux/reducers/user.js
@@ -24,13 +24,20 @@
  */
 
 const initialState = {
-  token : null  
+  token : null  ,
+  name : ""
 }
 export const user = (state = initialState, action) => {
   
   switch(action.type) {
     case "SET_TOKEN" : 
       return {token : action.token}
+    case "LOGOUT" :
+      
+      return {token : null, name : ""}
+    case "LOGIN_SUCCESS" : {
+      return {...state, name : action.name}
+    }
   }
   return state
   
diff --git a/ios/zhufengketang.xcodeproj/project.pbxproj b/ios/zhufengketang.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 		5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
+		6B6646481E2E76E200CB6CD8 /* RCTPay.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B6646461E2E76E200CB6CD8 /* RCTPay.m */; };
 		6F61E8CE0416407B96FEFC61 /* libRCTToast.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 08257537934F4384882B25DF /* libRCTToast.a */; };
 		7789623E084B469C9E6D73D4 /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E3A57583A0469FB30CDFDB /* libSplashScreen.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
@@ -212,6 +213,13 @@
 			remoteGlobalIDString = 3D7682761D8E76B80014119E;
 			remoteInfo = SplashScreen;
 		};
+		6B6646421E2E750B00CB6CD8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 310D1F0F14C844BCBA898994 /* RNFetchBlob.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A15C300E1CD25C330074CB35;
+			remoteInfo = RNFetchBlob;
+		};
 		78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@@ -252,6 +260,8 @@
 		310D1F0F14C844BCBA898994 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFetchBlob.xcodeproj; path = "../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; };
 		3C87663139074CC9842435A8 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = "<group>"; };
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
+		6B6646451E2E76E200CB6CD8 /* RCTPay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTPay.h; path = zhufengketang/RCTPay.h; sourceTree = "<group>"; };
+		6B6646461E2E76E200CB6CD8 /* RCTPay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTPay.m; path = zhufengketang/RCTPay.m; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 		83E3A57583A0469FB30CDFDB /* libSplashScreen.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libSplashScreen.a; sourceTree = "<group>"; };
@@ -372,6 +382,8 @@
 		13B07FAE1A68108700A75B9A /* zhufengketang */ = {
 			isa = PBXGroup;
 			children = (
+				6B6646451E2E76E200CB6CD8 /* RCTPay.h */,
+				6B6646461E2E76E200CB6CD8 /* RCTPay.m */,
 				008F07F21AC5B25A0029DE68 /* main.jsbundle */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
@@ -423,6 +435,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		6B6646251E2E750B00CB6CD8 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6B6646431E2E750B00CB6CD8 /* libRNFetchBlob.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		78C398B11ACF4ADC00677621 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -535,6 +555,9 @@
 						CreatedOnToolsVersion = 6.2;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
+					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = D9D59BE76S;
+					};
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "zhufengketang" */;
@@ -597,6 +620,10 @@
 					ProductGroup = 146834001AC3E56700842450 /* Products */;
 					ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
 				},
+				{
+					ProductGroup = 6B6646251E2E750B00CB6CD8 /* Products */;
+					ProjectRef = 310D1F0F14C844BCBA898994 /* RNFetchBlob.xcodeproj */;
+				},
 				{
 					ProductGroup = 6B6645F91E2E3D6B00CB6CD8 /* Products */;
 					ProjectRef = B3FF7D3FE9994B4097F1D3B2 /* SplashScreen.xcodeproj */;
@@ -786,6 +813,13 @@
 			remoteRef = 6B6646161E2E3D6B00CB6CD8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		6B6646431E2E750B00CB6CD8 /* libRNFetchBlob.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRNFetchBlob.a;
+			remoteRef = 6B6646421E2E750B00CB6CD8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -853,6 +887,7 @@
 			files = (
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
+				6B6646481E2E76E200CB6CD8 /* RCTPay.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -924,15 +959,24 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = splash;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
+				DEVELOPMENT_TEAM = D9D59BE76S;
+				FRAMEWORK_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../node_modules/react-native/ReactCommon/**",
+					"$(SRCROOT)/../node_modules/react-native/React/**",
+					"$(SRCROOT)/../node_modules/react-native-splash-screen/ios",
+				);
 				INFOPLIST_FILE = zhufengketang/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.zhufengketang.app;
 				PRODUCT_NAME = zhufengketang;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -942,14 +986,23 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = splash;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = D9D59BE76S;
+				FRAMEWORK_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../node_modules/react-native/ReactCommon/**",
+					"$(SRCROOT)/../node_modules/react-native/React/**",
+					"$(SRCROOT)/../node_modules/react-native-splash-screen/ios",
+				);
 				INFOPLIST_FILE = zhufengketang/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.zhufengketang.app;
 				PRODUCT_NAME = zhufengketang;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -958,7 +1011,7 @@
 		83CBBA201A601CBA00E9B192 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -999,7 +1052,7 @@
 		83CBBA211A601CBA00E9B192 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
diff --git a/ios/zhufengketang/AppDelegate.m b/ios/zhufengketang/AppDelegate.m
@@ -11,6 +11,8 @@
 
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
+#import "SplashScreen.h"
+
 
 @implementation AppDelegate
 
@@ -31,6 +33,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   rootViewController.view = rootView;
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
+  [SplashScreen show];
   return YES;
 }
 
diff --git a/ios/zhufengketang/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/zhufengketang/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,33 +1,51 @@
 {
   "images" : [
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "40*40.png",
       "scale" : "2x"
     },
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "60*60.png",
       "scale" : "3x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "58*58.png",
       "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "87*87.png",
       "scale" : "3x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "80*80.png",
       "scale" : "2x"
     },
     {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "120*120-1.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
       "idiom" : "iphone",
+      "filename" : "120*120.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "180*180.png",
       "scale" : "3x"
     }
   ],
diff --git a/ios/zhufengketang/Info.plist b/ios/zhufengketang/Info.plist

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,10 @@ orderId : 订单编号`
`232`	`232`	`成功返回`
`233`	`233`	```
`234`	`234`	`{`
`235`		`- code : 0`
	`235`	`+ code : 0,`
	`236`	`+ data : {`
	`237`	`+ name : '张三'`
	`238`	`+ }`
`236`	`239`	`}`
`237`	`240`	```
`238`	`241`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ export const login = (data) => {`
`116`	`116`
`117`	`117`	`console.log("@login")`
`118`	`118`	`return http_get("/user/identity", data)`
	`119`	`+`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`/**`