Merge branch 'local' into develop

@@ -36,7 +36,8 @@ export default class Setting extends React.Component {
     }
     }
 
 
     render() {
     render() {
-        let {nickName, sign, fetching} = this.props.setting;
+        let {nickName, signature, isFetching} = this.props.setting;
+        console.log(this.props.setting);
         return (
         return (
             <View style={styles.container}>
             <View style={styles.container}>
 
 
@@ -94,7 +95,7 @@ export default class Setting extends React.Component {
                     style={styles.sign}
                     style={styles.sign}
                     placeholder={'请输入个性签名'}
                     placeholder={'请输入个性签名'}
                     multiline={true}
                     multiline={true}
-                    value={sign}
+                    value={signature}
                     autoCapitalize={'none'}
                     autoCapitalize={'none'}
                     autoCorrect={false}
                     autoCorrect={false}
                     maxLength={50}
                     maxLength={50}
@@ -117,7 +118,7 @@ export default class Setting extends React.Component {
                 <Text style={styles.tips}>2.个性签名最多40字，请控制字数</Text>
                 <Text style={styles.tips}>2.个性签名最多40字，请控制字数</Text>
 
 
                 <LoadingIndicator
                 <LoadingIndicator
-                    isVisible={fetching}
+                    isVisible={isFetching}
                 />
                 />
             </View>
             </View>
         );
         );