Merge branch 'local' into develop

@@ -41,11 +41,11 @@ export default class SectionHeader extends React.Component {
             <Image style={[styles.container, this.props.style]} source={{uri}} resizeMode={'cover'}>
             <Image style={[styles.container, this.props.style]} source={{uri}} resizeMode={'cover'}>
                 <Text style={styles.desc}>{desc}</Text>
                 <Text style={styles.desc}>{desc}</Text>
                 <View style={styles.stats}>
                 <View style={styles.stats}>
-                    <Text style={[styles.content, {flex: 0.3}]} numberOfLines={1}>{post}</Text>
+                    <Text style={[styles.content, {flex: 0.3}]} numberOfLines={1}>{'帖子' + post}</Text>
                     <Text style={styles.content}>|</Text>
                     <Text style={styles.content}>|</Text>
-                    <Text style={[styles.content, {flex: 0.3}]} numberOfLines={1}>{comment}</Text>
+                    <Text style={[styles.content, {flex: 0.3}]} numberOfLines={1}>{'回复' + comment}</Text>
                     <Text style={styles.content}>|</Text>
                     <Text style={styles.content}>|</Text>
-                    <Text style={[styles.content, {flex: 0.3}]} numberOfLines={1}>{like}</Text>
+                    <Text style={[styles.content, {flex: 0.3}]} numberOfLines={1}>{'赞' + like}</Text>
                 </View>
                 </View>
 
 
             </Image>
             </Image>

@@ -99,7 +99,7 @@ let styles = StyleSheet.create({
         justifyContent: 'center',
         justifyContent: 'center',
         alignItems: 'center',
         alignItems: 'center',
         width,
         width,
-        height:containerHieght,
+        height: containerHieght,
     },
     },
 
 
     avatarImage: {
     avatarImage: {

@@ -49,9 +49,10 @@ let InitialState = Record({
     bgUploading: false,
     bgUploading: false,
     bgUploadError: null,
     bgUploadError: null,
     setting: new (Record({
     setting: new (Record({
-        nickName: null,
-        signature: null,
+        isFetching: false,
         error: null,
         error: null,
+        nickName: '',
+        signature: '',
         success: false,
         success: false,
     })),
     })),
 });
 });

@@ -242,18 +242,21 @@ export default function user(state = initialState, action) {
         }
         }
 
 
         case SETTING_SAVE_REQUEST:
         case SETTING_SAVE_REQUEST:
-        return state.setIn(['setting', 'error'], null)
+        return state.setIn(['setting', 'isFetching'], true)
+        .setIn(['setting', 'error'], null)
         .setIn(['setting','success'], false);
         .setIn(['setting','success'], false);
 
 
         case SETTING_SAVE_SUCCESS: {
         case SETTING_SAVE_SUCCESS: {
-            return state.setIn(['setting', 'error'], null)
+            return state.setIn(['setting', 'isFetching'], false)
+            .setIn(['setting', 'error'], null)
             .setIn(['profile','nickName'], state.setting.nickName)
             .setIn(['profile','nickName'], state.setting.nickName)
             .setIn(['profile','sign'], state.setting.signature)
             .setIn(['profile','sign'], state.setting.signature)
             .setIn(['setting','success'], true);
             .setIn(['setting','success'], true);
         }
         }
 
 
         case SETTING_SAVE_FAILURE:
         case SETTING_SAVE_FAILURE:
-        return state.setIn(['setting', 'error'], action.payload)
+        return state.setIn(['setting', 'isFetching'], false)
+        .setIn(['setting', 'error'], action.payload)
         .setIn(['setting','success'], false);
         .setIn(['setting','success'], false);
 
 
         case SETTING_MODI_NICKNAME:
         case SETTING_MODI_NICKNAME: