Merge branch '5.5.0' of http://git.yoho.cn/mobile/YH_RNComponent into 5.5.0_local

@@ -78,6 +78,7 @@ let styles = StyleSheet.create({
         marginTop: 16,
         marginTop: 16,
         marginBottom: 0,
         marginBottom: 0,
         color: '#444444',
         color: '#444444',
+        fontWeight: 'bold',
         // backgroundColor: 'red',
         // backgroundColor: 'red',
     },
     },
 
 

@@ -29,7 +29,7 @@ export default class ListBannerSwiper extends React.Component {
                 borderRadius: 3,
                 borderRadius: 3,
                 marginLeft: 3,
                 marginLeft: 3,
                 marginRight: 3,
                 marginRight: 3,
-                marginTop: (Platform.OS === 'ios')?3:23,
+                marginTop: (Platform.OS === 'ios')?0:1,
                 marginBottom: 0,
                 marginBottom: 0,
             }}
             }}
         />;
         />;
@@ -41,7 +41,7 @@ export default class ListBannerSwiper extends React.Component {
                 borderRadius: 3,
                 borderRadius: 3,
                 marginLeft: 3,
                 marginLeft: 3,
                 marginRight: 3,
                 marginRight: 3,
-                marginTop: 3,
+                marginTop: (Platform.OS === 'ios')?0:1,
                 marginBottom: 0,
                 marginBottom: 0,
             }}
             }}
         />;
         />;
@@ -62,7 +62,8 @@ export default class ListBannerSwiper extends React.Component {
                     dot={this.dot}
                     dot={this.dot}
                     activeDot={(Platform.OS === 'ios')?this.activeDot:null}
                     activeDot={(Platform.OS === 'ios')?this.activeDot:null}
                     width={width}
                     width={width}
-                    height={height}
+                    height={height-15}
+                    paginationStyle={{backgroundColor: 'rgba(0,0,0,0.2)',bottom: 10,height: 10,width: resource.length * 12,borderRadius: 5,marginLeft: (width-resource.length * 12)/2}}
                 >
                 >
                   {resource.map((item, i) => {
                   {resource.map((item, i) => {
                       return (
                       return (
@@ -94,7 +95,7 @@ let styles = StyleSheet.create({
         backgroundColor:'#f0f0f0',
         backgroundColor:'#f0f0f0',
     },
     },
     banner: {
     banner: {
-
+      backgroundColor: '#ffffff',
     },
     },
 
 
 });
 });

@@ -83,11 +83,12 @@ let styles = StyleSheet.create({
         marginTop: 20,
         marginTop: 20,
         marginBottom: 0,
         marginBottom: 0,
         color: '#444444',
         color: '#444444',
+        fontWeight: 'bold',
         // backgroundColor: 'red',
         // backgroundColor: 'red',
     },
     },
 
 
     phrase: {
     phrase: {
-        marginTop: 6,
+        marginTop: 10,
         width: width - 150 - 15,
         width: width - 150 - 15,
         fontSize: 13,
         fontSize: 13,
         color: '#b0b0b0',
         color: '#b0b0b0',

-'use strict';
-
-import React, {Component} from 'react';
-import ReactNative, {
-    View,
-    ScrollView,
-    Text,
-    NativeAppEventEmitter,
-    StyleSheet,
-} from 'react-native';
-
-export default class Student extends Component {
-
-    constructor(props) {
-        super(props);
-    }
-
-    componentDidMount() {
-
-    }
-
-    render() {
-        return (
-            <View style={styles.container}>
-                <Text>
-                    student页面
-                </Text>
-            </View>
-        );
-    }
-}
-
-let styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: '#f0f0f0',
-    },
-});

@@ -15,9 +15,7 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 import {connect} from 'react-redux';
 import {Map} from 'immutable';
 import {Map} from 'immutable';
 import * as studentActions from '../reducers/student/studentActions';
 import * as studentActions from '../reducers/student/studentActions';
-import Student from '../components/student/Student';
 import Register from '../components/student/Register';
 import Register from '../components/student/Register';
-// import Result from '../components/student/Result';
 
 
 const actions = [
 const actions = [
     studentActions,
     studentActions,