diff --git a/api/market.js b/api/market.js
index 25c98f5..867318d 100644
--- a/api/market.js
+++ b/api/market.js
@@ -3,7 +3,7 @@ import http from '../common/axios.js'
 //销售相关接口
 export default {
 	//获取销售人员详情
-	member(data) {
+	member(data={}) {
 		let url = '/member/member'
 		return http.get(url,data).then(res => {
 			return res;
@@ -11,7 +11,7 @@ export default {
 	},
 
 	//修改销售人员详情
-	memberEdit(data) {
+	memberEdit(data={}) {
 		let url = '/member/member_edit'
 		return http.post(url,data).then(res => {
 			return res;
@@ -19,7 +19,7 @@ export default {
 	},
 
 	//线索列表
-	salesList(data) {
+	salesList(data={}) {
 		let url = '/member/sales_list'
 		return http.get(url,data).then(res => {
 			return res;
@@ -27,7 +27,7 @@ export default {
 	},
 
 	//线索列表
-	createTask(data) {
+	createTask(data={}) {
 		let url = '/member/create_task'
 		return http.get(url,data).then(res => {
 			return res;
@@ -35,7 +35,7 @@ export default {
 	},
 
 	//写新跟进
-	createFollow(data) {
+	createFollow(data={}) {
 		let url = '/member/create_follow'
 		return http.post(url,data).then(res => {
 			return res;
@@ -44,7 +44,7 @@ export default {
 
 
 	//小区列表
-	getCampusesList(data) {
+	getCampusesList(data={}) {
 		let url = '/member/get_campuses_list'
 		return http.get(url,data).then(res => {
 			return res;
@@ -52,7 +52,7 @@ export default {
 	},
 
 	//添加线索
-	setSales(data) {
+	setSales(data={}) {
 		let url = '/member/set_sales'
 		return http.post(url,data).then(res => {
 			return res;
diff --git a/pages/market/my/index.vue b/pages/market/my/index.vue
index d07a7fc..7d23394 100644
--- a/pages/market/my/index.vue
+++ b/pages/market/my/index.vue
@@ -1,4 +1,4 @@
-<!--我的-首页-->
+<!--销售我的-首页-->
 <template>
   <view class="main_box">
     <!--自定义导航栏-->
@@ -11,8 +11,8 @@
       <view class="user_section">
         <view class="box">
           <view class="left" @click="openViewMyInfo()">
-            <image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>
-            <view class="name">包子皮</view>
+            <image class="pic" :src="$util.img(userInfo.headimg)"></image>
+            <view class="name">{{userInfo.nickname ? userInfo.nickname:userInfo.username}}</view>
           </view>
           <view class="right">
             <view class="btn"></view>
@@ -92,7 +92,10 @@
 </template>
 
 <script>
-// import user from '@/api/user.js';
+import marketApi from '@/api/market.js';
+import {
+  Api_url
+} from "@/common/config.js";
 import AQTabber from "@/components/AQ/AQTabber.vue"
 
 
@@ -103,11 +106,38 @@ export default {
   data() {
     return {
       formData:{},
+      userInfo:{},//用户信息
+      //上传图片APi路径
+      uploadUrl: `${Api_url}/file/image`,
     }
   },
   onLoad() {
   },
+  onShow() {
+    this.init();
+  },
   methods: {
+
+    //初始化
+    async init(){
+      await this.getUserInfo()//获取用户详情
+    },
+
+    //获取用户详情
+    async getUserInfo(){
+      let data = {}
+      let res = await marketApi.member(data);
+      if (res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+      this.userInfo = res.data
+    },
+
+
     //打开到课率统计
     openViewArrivalStatistics(){
       uni.navigateTo({
diff --git a/pages/market/my/info.vue b/pages/market/my/info.vue
index a7aff26..d2b3cd0 100644
--- a/pages/market/my/info.vue
+++ b/pages/market/my/info.vue
@@ -1,11 +1,16 @@
-<!--授课统计-详情-->
+<!--销售-个人资料-详情-->
 <template>
   <view class="main_box">
 
     <view class="main_section">
       <view class="section">
         <view class="item">
-          <image @click="changeAvatar()" class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>
+          <image
+              @click="changeAvatar()"
+              class="pic"
+              :src="$util.img(formData.header)"
+          ></image>
+
           <view class="btn" @click="changeAvatar()">修改头像</view>
         </view>
       </view>
@@ -25,7 +30,7 @@
             账号 <text class="required"></text>
           </view>
           <view class="input">
-            <input disabled placeholder="暂无" />
+            <input v-model="formData.username" disabled placeholder="暂无" />
           </view>
         </view>
 
@@ -43,7 +48,7 @@
             等级 <text class="required"></text>
           </view>
           <view class="input">
-            <input disabled placeholder="暂无" />
+            <input v-model="formData.member_level_name" disabled placeholder="暂无" />
           </view>
         </view>
       </view>
@@ -54,7 +59,7 @@
             性别 <text class="required">*</text>
           </view>
           <view class="input">
-            <input placeholder="请选择性别" v-model="sex_name" @click="picker_show_sex=true"/>
+            <input placeholder="请选择性别" v-model="formData.gender" @click="picker_show_sex=true"/>
             <fui-picker
                 layer="1"
                 :linkage="true"
@@ -97,7 +102,7 @@
             手机 <text class="required">*</text>
           </view>
           <view class="input">
-            <input v-model="formData.tel" placeholder="请输入手机" />
+            <input v-model="formData.phone" placeholder="请输入手机" />
           </view>
         </view>
 
@@ -111,14 +116,16 @@
         </view>
       </view>
 
-      <view class="submet_btn">提交</view>
+      <view class="submet_btn" @click="submit">提交</view>
     </view>
   </view>
 </template>
 
 <script>
-// import user from '@/api/user.js';
-import {Api_url} from "@/common/config.js";
+import marketApi from '@/api/market.js';
+import {
+  Api_url
+} from "@/common/config.js";
 import AQTabber from "@/components/AQ/AQTabber"
 
 
@@ -129,30 +136,43 @@ export default {
   data() {
     return {
       formData:{
-        images_arr:[],
+        header:'',//头像地址
         name:'',//姓名
-        email:'',//邮箱
-        tel:'',//手机
-        wx:'',//微信
-        sex:'',//性别
+        username:'',//账号
+        address:'',//住址
+        gender:'',//性别|男,女
         birthday:'',//生日
+        email:'',//邮箱
+        phone:'',//手机
+        wx:'',//微信号
       },
 
+      userInfo: {},
+
       //上传图片APi路径
-      uploadUrl: `${Api_url}/salesmanapi/common/uploadFile`,
+      uploadUrl: `${Api_url}/file/image`,
 
       //性别选择器 相关
       picker_show_sex: false,
       sex_name:'请选择',
-      options_sex_arr:[
-        { value: 1, text: '男' },
-        { value: 2, text: '女' },
+      options_sex_arr: [
+        {
+          value: 1,
+          text: '男'
+        },
+        {
+          value: 2,
+          text: '女'
+        },
       ],
 
       //生日选择器相关
-      minDate:'',
-      maxDate:'',
-      picker_show_birthday:false,
+      minDate: '',
+      maxDate: '',
+      picker_show_birthday: false,
+      upload_type: 1,
+      uploadHeadimg: '',
+      editHeadimg: '',
     }
   },
   onLoad() {
@@ -163,7 +183,36 @@ export default {
   methods: {
 
     async init(){
-      this.getBirthday()
+      // this.getBirthday()
+      await this.getUserInfo()
+    },
+
+    //获取用户详情
+    async getUserInfo(){
+      let res = await marketApi.member({})
+      if (res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+
+      //用户表单
+      this.formData = {
+        header: res.data.headimg,//头像地址
+        name: res.data.name,//姓名
+        username: res.data.username,//账号
+        address: res.data.address,//住址
+        gender: res.data.gender,//性别|男,女
+        birthday: res.data.birthday,//生日
+        email: res.data.email,//邮箱
+        phone: res.data.phone,//手机
+        wx: res.data.wx || '',//微信号
+        member_level_name: res.data.member_level_name || '',//等级名称
+      }
+      console.log(123,this.formData);
+
     },
 
     // 修改头像按钮
@@ -179,33 +228,30 @@ export default {
         }
       })
     },
-    async uploadFilePromise(url) {
-      console.log('AQ',this.uploadUrl,url)
-      return new Promise((resolve, reject) => {
-        let a = uni.uploadFile({
-          url: this.uploadUrl, // 仅为示例，非真实的接口地址
-          filePath: url,
-          name: "file",
-          formData: {
-            token: this.$store.state.token,
-          },
-          success: (e) => {
-            console.log('上传成功1',e)
-            let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}")
-            console.log('上传成功2',res)
-            if (res.code >= 0){
-              this.userInfo.pic = res.data.pic_path
-              this.editPic(res.data.pic_path)
-            }else{
-              this.$util.showToast({
-                title: res.message
-              });
-            }
-            setTimeout(() => {
-              resolve(res.data.data);
-            }, 1000);
-          },
-        });
+    uploadFilePromise(url) {
+      let token = uni.getStorageSync('token') || ''
+      let a = uni.uploadFile({
+        url: this.uploadUrl, //仅为示例，非真实的接口地址
+        filePath: url,
+        name: 'file',
+        header: {
+          'token': `${token}`, //请求头设置token
+        },
+        success: (e) => {
+          let res = JSON.parse(e.data.replace(/\ufeff/g, "") || "{}")
+          console.log('上传成功2', res)
+          if (res.code == 1) {
+            this.upload_type = 2
+            this.formData.header = res.data.path
+            // this.editHeadimg = res.data.path
+            // this.uploadHeadimg = res.data.url
+          } else {
+            uni.showToast({
+              title: res.msg,
+              icon: 'none'
+            })
+          }
+        },
       });
     },
     //修改头像Api
@@ -223,16 +269,15 @@ export default {
     },
 
     //性别选择相关
-    changePickerSex(e){
-      console.log('监听选择',e)
-      this.sex_name = e.text
-      this.formData.sex = e.value
+    changePickerSex(e) {
+      console.log('监听选择', e)
+      this.formData.gender = e.text
       this.picker_show_sex = false
     },
 
     //生日选择相关
     //获取当前年月日+获取30年前的日期
-    getBirthday(){
+    getBirthday() {
       let date = new Date();
       let year = date.getFullYear();
       let month = date.getMonth() + 1;
@@ -265,18 +310,88 @@ export default {
         year_30 = year_30 + 1;
       }
       let minDate = year_30 + "-" + month_30 + "-" + day_30
-      let maxDate =  year + "-" + month + "-" + day
+      let maxDate = year + "-" + month + "-" + day
       this.minDate = minDate
       this.maxDate = maxDate
     },
 
     //监听生日选择
-    changePickerBirthday(e){
-      console.log('监听生日选择',e)
+    changePickerBirthday(e) {
+      console.log('监听生日选择', e)
       this.formData.birthday = e.result
       this.picker_show_birthday = false
     },
 
+    //提交信息
+    async submit() {
+      let data = {...this.formData}
+
+      if(!data.header){
+        uni.showToast({
+          title: '请上传头像',
+          icon: 'none'
+        })
+        return
+      }
+
+      if(!data.name){
+        uni.showToast({
+          title: '请填写',
+          icon: 'none'
+        })
+        return
+      }
+
+      if(!data.gender){
+        uni.showToast({
+          title: '请选择性别',
+          icon: 'none'
+        })
+        return
+      }
+
+      if(!data.birthday){
+        uni.showToast({
+          title: '请选择生日',
+          icon: 'none'
+        })
+        return
+      }
+
+      if(!data.email){
+        uni.showToast({
+          title: '请填写邮箱',
+          icon: 'none'
+        })
+        return
+      }
+
+      if(!data.phone){
+        uni.showToast({
+          title: '请填写手机',
+          icon: 'none'
+        })
+        return
+      }
+
+
+      let res = await marketApi.memberEdit(data)
+      if(res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+      uni.showToast({
+        title: res.msg,
+        icon: 'success'
+      })
+
+      this.getUserInfo()
+    },
+
+
   }
 }
 </script>