diff --git a/api/apiRoute.js b/api/apiRoute.js
index 497e388..03e095f 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -31,6 +31,13 @@ export default {
             return res;
         })
     },
+    //教师/销售端详情
+    editPersonnelInfo(data = {}) {
+        let url = '/personnel/edit'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
 
 
 
diff --git a/pages/market/my/info.vue b/pages/market/my/info.vue
index 442951b..71b27de 100644
--- a/pages/market/my/info.vue
+++ b/pages/market/my/info.vue
@@ -8,7 +8,7 @@
           <image
               @click="changeAvatar()"
               class="pic"
-              :src="$util.img(formData.header)"
+              :src="$util.img(formData.head_img)"
           ></image>
 
           <view class="btn" @click="changeAvatar()">修改头像</view>
@@ -39,7 +39,7 @@
             部门 <text class="required"></text>
           </view>
           <view class="input">
-            <input disabled placeholder="暂无" />
+            <input disabled :placeholder="formData.department_name_str" />
           </view>
         </view>
 
@@ -59,7 +59,7 @@
             性别 <text class="required">*</text>
           </view>
           <view class="input">
-            <input placeholder="请选择性别" v-model="formData.gender" @click="picker_show_sex=true"/>
+            <input placeholder="请选择性别" v-model="formData.gender_str" @click="picker_show_sex=true"/>
             <fui-picker
                 layer="1"
                 :linkage="true"
@@ -122,6 +122,7 @@
 </template>
 
 <script>
+import apiRoute from '@/api/apiRoute.js';
 import marketApi from '@/api/market.js';
 import {
   Api_url
@@ -136,11 +137,12 @@ export default {
   data() {
     return {
       formData:{
-        header:'',//头像地址
+        head_img:'',//头像地址
         name:'',//姓名
         username:'',//账号
         address:'',//住址
-        gender:'',//性别|男,女
+        gender:'',//性别|1男,2女
+        gender_str:'',
         birthday:'',//生日
         email:'',//邮箱
         phone:'',//手机
@@ -150,7 +152,7 @@ export default {
       userInfo: {},
 
       //上传图片APi路径
-      uploadUrl: `${Api_url}/file/image`,
+      uploadUrl: `${Api_url}/uploadImage`,
 
       //性别选择器 相关
       picker_show_sex: false,
@@ -197,7 +199,7 @@ export default {
 
     //获取用户详情
     async getUserInfo(){
-      let res = await marketApi.member({})
+      let res = await apiRoute.getPersonnelInfo({})
       if (res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -206,21 +208,28 @@ export default {
         return
       }
 
+      let gender_str = ''
+      if(res.data.gender == 1){
+        gender_str = '男'
+      }else if(res.data.gender == 2){
+        gender_str = '女'
+      }
+
       //用户表单
       this.formData = {
-        header: res.data.headimg,//头像地址
+        head_img: res.data.head_img,//头像地址
         name: res.data.name,//姓名
-        username: res.data.username,//账号
+        username: res.data.phone,//账号
         address: res.data.address,//住址
-        gender: res.data.gender,//性别|男,女
+        gender: res.data.gender,//性别|1男,2女
+        gender_str:gender_str,
         birthday: res.data.birthday,//生日
-        email: res.data.email,//邮箱
+        email: res.data.email || '',//邮箱
         phone: res.data.phone,//手机
         wx: res.data.wx || '',//微信号
         member_level_name: res.data.member_level_name || '',//等级名称
+        department_name_str:res.data.department_name_str || '暂无',//部门名称
       }
-      console.log(123,this.formData);
-
     },
 
     // 修改头像按钮
@@ -250,7 +259,7 @@ export default {
           console.log('上传成功2', res)
           if (res.code == 1) {
             this.upload_type = 2
-            this.formData.header = res.data.path
+            this.formData.head_img = res.data.url
             // this.editHeadimg = res.data.path
             // this.uploadHeadimg = res.data.url
           } else {
@@ -262,24 +271,12 @@ export default {
         },
       });
     },
-    //修改头像Api
-    async editPic(pic) {
-      let res = await salesmanApi.editPic({pic: pic})
-      if (res.code >= 0) {
-        this.$util.showToast({
-          title: '修改成功'
-        })
-      } else {
-        this.$util.showToast({
-          title: res.message
-        })
-      }
-    },
 
     //性别选择相关
     changePickerSex(e) {
       console.log('监听选择', e)
-      this.formData.gender = e.text
+      this.formData.gender = e.value
+      this.formData.gender_str = e.text
       this.picker_show_sex = false
     },
 
@@ -334,7 +331,7 @@ export default {
     async submit() {
       let data = {...this.formData}
 
-      if(!data.header){
+      if(!data.head_img){
         uni.showToast({
           title: '请上传头像',
           icon: 'none'
@@ -383,7 +380,7 @@ export default {
       }
 
 
-      let res = await marketApi.memberEdit(data)
+      let res = await apiRoute.editPersonnelInfo(data)
       if(res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -395,8 +392,10 @@ export default {
         title: res.msg,
         icon: 'success'
       })
-
-      this.getUserInfo()
+      //延迟1s执行
+      setTimeout(() => {
+        this.getUserInfo()
+      }, 1000)
     },
 
 
diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue
index fc467ef..1b4880a 100644
--- a/pages/student/login/login.vue
+++ b/pages/student/login/login.vue
@@ -81,6 +81,7 @@ export default {
 		  }
 		  res = await apiRoute.personnelLogin(params)		  
       }else if(this.loginType == 2){
+
         //销售
         let params = {
           'phone': this.user,