diff --git a/common/js/utils.js b/common/js/utils.js
index 097b719..283bf2e 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -349,6 +349,20 @@ function pageLogin(url,callback){
    
        }
 
+// 接口获取更新后的用户信息
+ function getUpdateUserInfo(token){
+	 return new Promise((resolve, reject) => {
+		 sandBox.get({
+		 	api: 'api/user',
+		 	header: {
+		 		Authorization: token
+		 	}
+		 }).then(res => {
+		 	cookieStorage.set('user_info', res.data);
+			resolve(res.data);
+		 }).catch(err => reject(err));
+	 })
+}
 
 
 module.exports = {
@@ -364,6 +378,7 @@ module.exports = {
 	GetUrl:GetUrl,
 	
 	// #ifdef MP-WEIXIN
-	autoLogin:autoLogin
+	autoLogin:autoLogin,
 	// #endif
+	getUpdateUserInfo: getUpdateUserInfo
 }
\ No newline at end of file
diff --git a/components/lf-nav/lf-nav.vue b/components/lf-nav/lf-nav.vue
index 084b1a5..4bad0f0 100644
--- a/components/lf-nav/lf-nav.vue
+++ b/components/lf-nav/lf-nav.vue
@@ -64,6 +64,13 @@
 				type: Boolean, // 点击返回按钮后是否弹出询问弹窗，showIcon为true时生效
 				default: false
 			},
+			backDiy: {
+				type: Boolean, // 点击返回按钮后是否执行自定义方法，优先级低于backInquiry
+				default: false
+			},
+			backCallback: {
+				type: Function // 返回执行的自定义方法
+			},
 			boderBottom: {
 				type: Boolean, // 是否显示底部边框线
 				default: false
@@ -98,7 +105,11 @@
 						}
 					})
 				}else{
-					this.$back();
+					if(this.backDiy){
+						this.$emit('backCallback');
+					}else{
+						this.$back();
+					}
 				}
 			},
 			$back(){
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index 76f1336..2a33342 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -100,7 +100,7 @@
 
 <script>
 	import lfTabbar from '@/components/lf-tabbar/lf-tabbar.vue'
-	import { getUrl } from '@/common/js/utils.js';
+	import { getUrl, getUpdateUserInfo } from '@/common/js/utils.js';
 	export default {
 		components: {
 			lfTabbar
@@ -210,17 +210,6 @@
 					this.centerInfo = res.data.data;
 				})
 			},
-			// 接口获取更新后的用户信息
-			getUpdateUserInfo(){
-				this.$http.get({
-					api: 'api/user',
-					header: {
-						Authorization: this.token
-					}
-				}).then(res => {
-					this.$cookieStorage.set('user_info', res.data);
-				})
-			},
 			// 用户点击了自己的头像，此时做判断，已有头像就跳转到设置页，没有则授权获取用户微信信息
 			clickAvatar(){
 				if(this.token && this.userInfo.avatar){
@@ -278,7 +267,7 @@
 						res = res.data;
 						if (res.status) {
 							// #ifdef MP-WEIXIN
-							this.getUpdateUserInfo();
+							getUpdateUserInfo(this.token);
 							// #endif 
 							uni.hideLoading();
 						} else {
diff --git a/pages/user/my/editname.vue b/pages/user/my/editname.vue
index 2f9df64..4d57a52 100644
--- a/pages/user/my/editname.vue
+++ b/pages/user/my/editname.vue
@@ -1,15 +1,15 @@
 <template>
 	<view>
-		<lf-nav :spreadOut="true" :showIcon="true" title="修改昵称"></lf-nav>
+		<lf-nav :spreadOut="true" :showIcon="true" title="修改昵称" :backDiy="true" @backCallback="backCallback"></lf-nav>
 		<view class="lf-color-black lf-font-28 lf-p-30">
 			可使用中英文、数字和下划线，字符限制1-10字符
 		</view>
 		<view class="lf-p-l-32 lf-p-r-32">
 			<view class="set-tag lf-border-bottom">
 				<view class="lf-font-28 lf-color-black">
-					<input type="text" placeholder="输入新的昵称" />
+					<input v-model="name" type="text" placeholder="起一个好听的昵称吧" />
 				</view>
-				<view class="lf-flex">
+				<view class="lf-flex" v-if="name.length" @click="clear">
 					<text class="lf-iconfont icon-cuo lf-font-24 lf-m-l-10 lf-color-777"></text>
 				</view>
 			</view>
@@ -18,6 +18,47 @@
 </template>
 
 <script>
+	export default {
+		data(){
+			return {
+				name: ''
+			}
+		},
+		methods: {
+			clear(){
+				this.name = '';
+			},
+			backCallback(){
+				if(!this.name){
+					return this.$toBack();
+				};
+				uni.showLoading({
+					title: '正在保存中'
+				})
+				let token = this.$cookieStorage.get('user_token');
+				this.$http.post({
+					api: 'api/users/update/info',
+					data: {
+						nick_name: this.name
+					},
+					header: {
+						Authorization: token,
+						Accept: 'application/json'
+					}
+				}).then(res => {
+					uni.hideLoading();
+					this.$msg('保存成功', {icon: 'success'}).then(() => {
+						this.$toBack();
+					});
+				}).catch(err => {
+					uni.hideLoading();
+					this.$msg('保存失败', {icon: 'error'}).then(() => {
+						this.$toBack();
+					});
+				})
+			}
+		}
+	}
 </script>
 
 <style scoped lang="scss">
diff --git a/pages/user/my/setting.vue b/pages/user/my/setting.vue
index 880b02c..879cdbc 100644
--- a/pages/user/my/setting.vue
+++ b/pages/user/my/setting.vue
@@ -7,12 +7,12 @@
 					昵称
 				</view>
 				<view class="lf-flex">
-					<view class="lf-font-28 lf-color-555">{{ userInfo.mobile_replace }}</view><text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
+					<view class="lf-font-28 lf-color-555">{{ userInfo.nick_name || userInfo.mobile }}</view><text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10 lf-color-777"></text>
 				</view>
 			</view>
 		</view>
 		<view class="lf-p-l-32 lf-p-r-32 lf-bg-white">
-			<view class="set-tag lf-border-bottom" @click="$msg('敬请期待')">
+			<view class="set-tag lf-border-bottom" @click="changeImage">
 				<view class="lf-font-28 lf-color-black">
 					头像
 				</view>
@@ -93,17 +93,70 @@
 </template>
 
 <script>
+	import { config, getUpdateUserInfo } from '@/common/js/utils.js';
 	export default {
 		data(){
 			return {
-				userInfo: {}
+				userInfo: {},
+				token: '',
+				shou_count: 0
 			}
 		},
 		onLoad(){
-			var userInfo = this.$cookieStorage.get('user_info');
-			this.userInfo = userInfo || {};
+			// var userInfo = this.$cookieStorage.get('user_info');
+			// this.userInfo = userInfo || {};
+			var token = this.$cookieStorage.get('user_token');
+			this.token = token;
+			this.getMeInfo();
+		},
+		onShow(){
+			this.shou_count++;
+			if(this.shou_count > 1){
+				this.getMeInfo();
+			}
 		},
 		methods: {
+			// 获取页面信息
+			getMeInfo(){
+				this.$http.get({
+					api: 'api/me',
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+					this.userInfo = res.data.data;
+				})
+			},
+			// 上传更换用户头像
+			changeImage: function() {
+				uni.chooseImage({
+					 count: 1,
+					 sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					 sourceType: ['album'], //从相册选择
+					success: res => {
+						var tempFilePaths = res.tempFilePaths;
+						this.newImage = tempFilePaths[0];
+						
+						uni.uploadFile({
+							header: {
+								Authorization: this.token
+							},
+							url: config.GLOBAL.baseUrl + 'api/users/upload/avatar',
+							filePath: tempFilePaths[0],
+							fileType: 'image',
+							name: 'avatar_file',
+							success: res => {
+								var result = JSON.parse(res.data); 
+								// this.setData({
+								// 	'userInfo.avatar': result.data.url
+								// });
+								this.userInfo.avatar = result.data.url;
+								getUpdateUserInfo(this.token);
+							}
+						})
+					}
+				});
+			},
 			signOut(){
 				this.$msg('敬请期待')
 			}