diff --git a/main.js b/main.js
index 111564f..d270879 100644
--- a/main.js
+++ b/main.js
@@ -14,10 +14,24 @@ $http.beforeRequest = function (options) {
     title: '数据加载中'
   })
   if (options.url.indexOf('/my/') !== -1) {
-    options.header = {
-      Authorization: store.state.address.token
-    }
-    console.log(options.header)
+	  if (options.url.indexOf('/getByUserId') !== -1){
+		  options.header = {
+				'gs-token': uni.getStorageSync('Gs-Token')
+		  }
+	  } else if (options.url.indexOf('/info/update') !== -1){
+		  options.header = {
+				'gs-token': uni.getStorageSync('Gs-Token')
+		  }
+	  }else if (options.url.indexOf('info/recover') !== -1){
+		  options.header = {
+		  				'gs-token': uni.getStorageSync('Gs-Token')
+		  }
+	  }else {
+		  options.header = {
+		    Authorization: store.state.address.token
+		  }
+		  console.log(options.header)
+	  }
   }
   if (options.url.indexOf('/getLoginInfo') !== -1) {
     options.header = {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0362985..34ec232 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -75,14 +75,31 @@
 					uni.showLoading({title:'努力登录中...', mask:true});
 					
 					if (res.data.code === 200) {
+						
 						//localStorage保存token
 						if (res.data.data){
 							uni.setStorageSync('Gs-Token', res.data.data)
 							uni.$http.get('/gunshiApp/xfflood/getLoginInfo').then(res=>{
 								uni.setStorageSync('value', res.data.data)
+								console.log('-----value------',res.data.data);
+							})
+							
+							//获取userId并获取头像
+							uni.$http.get('/gunshiApp/xfflood/my/info/getByUserId').then(res=>{
+								console.log('-----avatar1------',res.data);
+								if (res.data.data) {
+									let url = '/gunshiApp/xfflood/bzProjectManipulationRecord/file/get/'
+									url = url + res.data.data.fileId
+									uni.$http.get(url).then(res=>{
+										uni.setStorageSync('avatar','http://223.75.53.141:9102/test.by-lyf.tmp'+res.data.data.filePath)
+										console.log('-----avatar------',uni.getStorageSync('avatar'));
+									})
+								} else {
+									uni.setStorageSync('avatar','../../static/tabs/头像_icon@2x.png')
+								}
 							})
 						}
-
+						
 						//登录成功后跳转界面
 						setTimeout(
 							function(){
diff --git a/pages/mypage/mypage.vue b/pages/mypage/mypage.vue
index 355d14b..6cebcfc 100644
--- a/pages/mypage/mypage.vue
+++ b/pages/mypage/mypage.vue
@@ -3,9 +3,10 @@
 		<view class="userInfo">
 			<div class="icon">
 			  <image
+				class="image-left"
 			    style="width: 100%; height: 100%"
-			    src="../../static/tabs/头像_icon@2x.png"
-			    mode="aspectFit"
+			    :src="default_src"
+			    mode="aspectFill"
 			  ></image>
 			</div>
 			<div class="user">
@@ -51,7 +52,6 @@
 	]
 	
 	const userList = uni.getStorageSync('value')
-	console.log(userList);
 	
 	export default {
 		
@@ -62,8 +62,13 @@
 				userresponse:'防汛办',
 				version:'011.14.23',
 				func: func,
+				default_src: uni.getStorageSync('avatar'),
 			}
 		},
+		mounted() {
+			this.default_src = uni.getStorageSync('avatar')
+			console.log('----mypageAvatar',this.default_src);
+		},
 		methods: {
 			navigateToSubPage(index){
 				
@@ -117,6 +122,11 @@
 		color: #007afd;
 		line-height: 50px;
 	}
+	.image-left{
+		width: 80px;
+		height: 80px;
+		border-radius: 50%;
+	}
 	.user{
 		display: flex;
 		flex-direction: column;
diff --git a/pages/personInfo/personInfo.vue b/pages/personInfo/personInfo.vue
index 5640c54..d8c0595 100644
--- a/pages/personInfo/personInfo.vue
+++ b/pages/personInfo/personInfo.vue
@@ -15,10 +15,10 @@
 				show-arrow="true"
 				clickable
 				class="listContainer"
-				@click="showActionSheet()"
+				@click="showActionSheet(default_src)"
 			>
 				<template v-slot:footer >
-					<image class="slot-image" src='../../static/tabs/头像_icon@2x.png' mode="aspectFit"></image>
+					<image class="slot-image" :src="default_src" mode="aspectFill"></image>
 				</template>
 			</uni-list-item>
 			<uni-list-item 
@@ -27,16 +27,19 @@
 				clickable
 				:title="item.name"
 				class="listContainer"
+				@click="modifyValue(item)"
 			>
 				<template v-slot:footer >
-					<div @click="modifyValue(item)" @click.stop="over(item)">
+					<div class="item"  @click.stop="changeItemInfo(item,index)">
 						<text >{{item.info}}</text>
 					</div>
 				</template>
 			</uni-list-item>
 		</uni-list>
-		<button type="primary" class="button">保存</button>
+		<button type="primary" class="button" @click="save">保存</button>
 	</view>
+	
+	
 </template>
 
 <script>
@@ -45,33 +48,60 @@
 	
 	//访问数据
 	const userList = uni.getStorageSync('value')
-	const userListShow = [
+	let userListShow = [
 		{name: '手机号码', info: userList.phone},
 	]
 	
-	const default_src = '../../static/tabs/头像_icon@2x.png'
-	
 	export default {
 		data() {
 			return {
 				userList: userList,
 				userListShow:userListShow,
-				modify: modify
+				modify: modify,
+				default_src: uni.getStorageSync('avatar'),
+				fileId: '',
+				phone: userList.phone,
+				reset: false,
 			}
 		},
+		mounted() { //挂载时重新获取一次Storage数据
+			this.userList = uni.getStorageSync('value')
+			this.userListShow[0].info = this.userList.phone
+		},
 		methods: {
 			goBack(){
 				uni.navigateBack()
 			},
-			showActionSheet(){
+			showActionSheet(default_src){ //修改头像
 				uni.showActionSheet({
 					itemList: ['拍照/上传照片', '恢复默认头像'],
 					success: (res) => {
 						console.log('选择了第' + (res.tapIndex + 1) + '个选项');
 						if (res.tapIndex === 0) { //拍照上传照片
-							
+							uni.chooseImage({
+								count: 1,
+								sizeType: ['origin','compressed'],
+								sourceType: ['camera', 'album'],
+								success: (res) => {
+									const tempFilePaths = res.tempFilePaths;
+									console.log('--------拍照上传照片--------',res);
+									this.default_src = tempFilePaths[0]
+									uni.uploadFile({
+										url: uni.$http.baseUrl+'/gunshiApp/xfflood/my/info/file/upload/singleSimple',
+										fileType: 'image',
+										filePath: tempFilePaths[0],
+										name: 'file',
+										success: (res) => {
+											this.fileId = JSON.parse(res.data).data.fileId
+										},
+									})
+									
+								}
+							})
 						} else if(res.tapIndex === 1) { //恢复默认头像
-							
+							console.log('click');
+							this.reset = true
+							this.default_src = '../../static/tabs/头像_icon@2x.png'
 						}
 					},
 					fail: (err) => {
@@ -82,6 +112,90 @@
 			modifyValue(item){
 				console.log(item);
 				
+			},
+			changeItemInfo(item,index){ //修改电话
+				uni.showModal({
+					title:"修改"+item.name,
+					editable:true,
+					placeholderText:item.info,
+					confirmText:"确认",
+					cancelText:"取消",
+					success: (res) => {
+						const phoneReg = /^[1][3-9]\d{9}$/;
+						if (res.confirm){
+							if (phoneReg.test(res.content) ){
+								this.userListShow[index].info = res.content
+								this.phone = res.content
+								uni.showToast({
+									title:"修改成功，请保存",
+									icon: "none",
+									duration: 1000,
+								})
+							} else {
+								uni.showToast({
+									title:"请输入正确手机号码",
+									icon: "none",
+									duration: 1000,
+								})
+							}
+						}
+						
+					},
+					fail: (err) => {
+						console.log('取消');
+					}
+				})
+			},
+			save(){
+				if (this.fileId == ''){ //图片无修改或重置时
+					if (this.reset) { //重置头像
+						//调接口清空返回图片路径的data
+						uni.$http.get('/gunshiApp/xfflood/my/info/recover').then(res=>{
+							uni.setStorageSync('avatar','../../static/tabs/头像_icon@2x.png')
+						})
+						console.log('重置头像');
+					}
+					
+					let params = {
+						"phone": this.phone,
+					}
+					
+					uni.$http.post('/gunshiApp/xfflood/my/info/update',params).then(res=>{
+						console.log('-----修改图片1-----',res);
+						let new_userList = uni.getStorageSync('value')
+						new_userList.phone = this.phone
+						uni.setStorageSync('value', new_userList)
+						uni.reLaunch({
+							url:'/pages/mypage/mypage'
+						})
+					},err=>{
+						console.log('----err----',err);
+					})
+					
+				} else { //修改图片后
+					let params = {
+						"phone": this.phone,
+						"attach": {
+							"fileId": this.fileId,
+						},
+					}
+					uni.$http.post('/gunshiApp/xfflood/my/info/update',params).then(res=>{
+						console.log('-----修改图片2-----',res);
+						if (res.data.code == 200){
+							console.log('---修改图片3---',res);
+							let url = '/gunshiApp/xfflood/bzProjectManipulationRecord/file/get/'+this.fileId
+							uni.$http.get(url).then(res=>{
+								uni.setStorageSync('avatar','http://223.75.53.141:9102/test.by-lyf.tmp'+res.data.data.filePath)
+								console.log('-----modifiedAvatar------',uni.getStorageSync('avatar'));
+							})
+							uni.reLaunch({
+								url:'/pages/mypage/mypage'
+							})
+
+						}
+					})
+				}
+				
 			}
 		}
 	}
@@ -135,7 +249,9 @@
 		background-color: #007afd;
 	}
 	.slot-image{
-		width: 8vw;
-		height: 8vh;
+		margin-top: 12px;
+		width: 40px;
+		height: 40px;
+		border-radius: 50%;
 	}
 </style>