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

@@ -155,19 +155,16 @@ export default class UploadProgress extends React.Component {
             );
         }
     }
-
-
 }
 
 let {width, height} = Dimensions.get('window');
 let styles = StyleSheet.create({
     container: {
-        flex:1,
+        // flex:1,
         flexDirection: 'row',
         height: 40,
         backgroundColor: 'white',
         alignItems: 'center',
-
     },
 
     tips: {
@@ -184,8 +181,6 @@ let styles = StyleSheet.create({
 
     bar: {
         height: 1,
-        // marginTop: 20,
-
     },
 
     complete: {