diff --git a/src/project/wuxi/AppMine/userInfo.vue b/src/project/wuxi/AppMine/userInfo.vue
index 79ebe2a..6f3e219 100644
--- a/src/project/wuxi/AppMine/userInfo.vue
+++ b/src/project/wuxi/AppMine/userInfo.vue
@@ -4,32 +4,66 @@
       <div class="item-content mar-b8">
         <div class="item solid">
           <p class="mar-t22">头像</p>
-          <button class="user-img-div" open-type="chooseAvatar" @chooseavatar="handleWeixinSync">
-            <img v-if="user.avatarUrl" :src="user.avatarUrl" class="user-img">
-            <img v-else src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" class="user-img">
+          <button class="user-img-div" v-if="editAvatarUrl" open-type="chooseAvatar" @chooseavatar="handleWeixinSync">
+            <img v-if="user.avatarUrl && !avatar" :src="user.avatarUrl" class="user-img">
+            <img v-if="avatar" :src="avatar" alt="" class="user-img">
+            <img v-if="!user.avatarUrl && !avatar" src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" class="user-img">
           </button>
+          <div class="user-img-div" v-else>
+            <img v-if="user.avatarUrl && !avatar" :src="user.avatarUrl" class="user-img">
+            <img v-else src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="" class="user-img">
+          </div>
         </div>
         <div class="item">
           <p>用户昵称</p>
-          <div class="item-right" v-if="!editNickName" @click="editNickName=true, userName= user.nickName">
+          <div class="item-right" v-if="!editNickName">
             <p class="name">{{ user.nickName }}</p>
           </div>
-          <input class="item-right" v-else type="text" v-model="userName" @blur="handleWeixinSync">
+          <input class="item-right" v-else type="text" v-model="userName">
         </div>
       </div>
       <div class="item-content mar-b8">
         <div class="item">
           <p>手机号</p>
-          <div class="item-right" v-if="!!!editPhone" @click="editPhone=true, userPhone= user.phone">
+          <div class="item-right" v-if="!!!editPhone">
             <p class="name">{{ user.phone || ''}}</p>
           </div>
-          <input class="item-right" v-else type="number" v-model="userPhone" @blur="handleWeixin" maxlength="11">
+          <input class="item-right" v-else type="number" v-model="userPhone" maxlength="11">
         </div>
       </div>
-      <div class="item-content" @click="onLogout">
-        <div class="item">
-          <b class="login-out">退出登录</b>
+
+      <div class="item-content mar-b8">
+        <div class="item solid">
+          <p>姓名</p>
+          <div class="item-right" v-if="!editRealName">
+            <p class="name">{{ user.realName || '' }}</p>
+          </div>
+          <input class="item-right" v-else type="text" v-model="userRealName" @input="idNumberInput">
         </div>
+        <div class="item solid">
+          <p>身份证号</p>
+          <div class="item-right" v-if="!editIdNumber">
+            <p class="name">{{ user.idNumber || '' }}</p>
+          </div>
+          <input class="item-right" v-else type="idNumber" v-model="userIdNumber" maxlength="18" @input="idNumberInput">
+        </div>
+        <div class="item">
+          <p>地区</p>
+          <div class="item-right" v-if="!editArea">
+            <p class="name">{{ user.areaName || '' }}</p>
+          </div>
+          <AiAreaPicker class="item-right" :areaId="$areaId" v-model="userAreaId" :fullName.sync="userAreaName" v-else>
+            <div class="ai-area__wrapper">
+              <span class="label" v-if="userAreaName">{{ userAreaName }}</span>
+              <i v-else>请选择</i>
+              <u-icon name="arrow-right" color="#ddd"/>
+            </div>
+          </AiAreaPicker>
+        </div>
+        
+      </div>
+      <div class="btn-wrapper btn-edit">
+        <b class="btn" @click="btnText? submit(): editBtn()">{{ btnText? '提交': '修改' }}</b>
       </div>
     </div>
   </div>
@@ -39,55 +73,106 @@ import {mapActions, mapState} from 'vuex'
 
 export default {
   name: "userInfo",
-  appName: "个人中心",
   computed: {
     ...mapState(['user', 'token']),
-    nickName: {
-      set(v) {
-        this.userName = v
-      },
-      get() {
-        const {nickName} = this.user
-        return nickName
-      }
-    },
-    phone: {
-      set(v) {
-        this.userPhone = v
-      },
-      get() {
-        const { phone } = this.user
-        return phone
-      }
-    }
   },
-  onLoad() {
-    this.getUserInfo()
-    
+  onLoad(o) {
+    this.isFromTabbar = o.isFromTabbar
+    this.path = o.path
+    this.getUserInfo('qujing') 
+    uni.setNavigationBarTitle({
+      title: '个人中心'
+    })
   },
   data() {
     return {
+      editAvatarUrl: false,
       editNickName: false,
       editPhone: false,
+      editRealName: false,
+      editIdNumber: false,
+      editArea: false,
       avatar: '',
       userName: '',
-      userPhone: ''
+      userPhone: '',
+      userRealName: '',
+      userIdNumber: '',
+      userAreaId: '',
+      userAreaName: '',
+      btnText: false,
+      isFromTabbar: '',
+      path: '',
     }
   },
   methods: {
     ...mapActions(['getUserInfo', 'autoLogin']),
-    updateInfo() {
-      this.$instance.post(`/app/appwechatuser/update-nickName`,null,{
-        params: {
-          id: this.user.id,
-          nickName: this.userName? this.userName : this.user.nickName,
-          avatarUrl: this.avatar? this.avatar : this.user.avatarUrl,
-          phone: this.userPhone ? this.userPhone : this.user.phone,
-        }
+    editBtn() {
+      this.btnText = true
+      this.editAvatarUrl = true;
+      this.avatar = this.user.avatarUrl
+      this.editNickName = true;
+      this.userName = this.user.nickName
+      this.editPhone = true;
+      this.userPhone = this.user.phone
+      this.editRealName = true;
+      this.userRealName = this.user.realName
+      this.editIdNumber = true;
+      this.userIdNumber = this.user.idNumber
+      this.editArea = true
+      this.userAreaId = this.user.areaId
+      this.userAreaName = this.user.areaName
+    },
+    submit() {
+      if(this.flag) return
+      // if(!this.avatar) {
+      //   return this.$u.toast('请上传头像')
+      // }
+      // if (!this.userName) {
+      //   return this.$u.toast('请输入用户昵称')
+      // }
+      // if (this.userName == '微信用户') {
+      //   return this.$u.toast('请修改用户昵称')
+      // }
+      // if (!this.userPhone) {
+      //   return this.$u.toast('请输入手机号')
+      // }
+      if (!this.userRealName) {
+        return this.$u.toast('请输入姓名')
+      }
+      if (!this.userIdNumber) {
+        return this.$u.toast('请输入身份证号')
+      }
+      if (!this.$idCardNoUtil.checkIdCardNo(this.userIdNumber)) {
+        return this.$u.toast('请输入正确的身份证号码')
+      }
+      if (!this.userAreaId) {
+        return this.$u.toast('请选择地区')
+      }
+
+      this.flag = true
+      this.$instance.post(`/app/appwechatuserqujing/idNumberEdit`, {
+        avatarUrl: this.avatar,
+        nickName: this.userName,
+        phone: this.userPhone,
+        name: this.userRealName,
+        idNumber: this.userIdNumber,
+        areaId: this.userAreaId,
+        areaName: this.userAreaName
       }).then(res=> {
         if(res?.code==0) {
-          this.$u.toast('修改成功')
+          this.$u.toast('提交成功')
+          this.autoLogin({ loginWay:'qujing'})
+          uni.$emit('auth')
+          setTimeout(() => {
+            if (this.isFromTabbar == 1) {
+              uni.switchTab({ url: this.path })
+            } else {
+              uni.navigateBack()
+            }
+          }, 600);
         }
+      }).catch(err=> {
+        this.$u.toast(err.msg)
       })
     },
     upLoad(img) {
@@ -110,39 +195,29 @@ export default {
         })
       })
     },
-    onLogout() {
-      uni.showModal({
-        title: '提示',
-        content: "是否要退出登录",
-        success: res => {
-          if (res.confirm) {
-            this.$store.commit('logout')
-            this.$toast('退出成功');
-            setTimeout(() => {
-              uni.switchTab({
-                url: '/pages/AppMine/AppMine'
-              })
-            }, 500)
-          }
-        }
-      })
-    },
-    handleWeixin({ detail }) {
-      if(detail.value) {
-        this.phone = detail.value
-        this.updateInfo()
-      }
-    },
     handleWeixinSync({detail}) {
-      const { value: nickName, avatarUrl } = detail
-      this.autoLogin({ nickName, avatarUrl })
+      const { avatarUrl } = detail
       if(avatarUrl?.length) {
-        this.upLoad(avatarUrl).then(() => {
-          this.updateInfo()
-        })
+        this.upLoad(avatarUrl)
       }
-      if(nickName) {
-        this.updateInfo()
+    },
+    handleSelectArea(v) {
+      this.userAreaName = v.areaName
+      this.userAreaId = v.id
+    },
+    idNumberInput() {
+      if(this.userIdNumber.length == 18 && this.userRealName) {
+        if(!this.userAreaId) {
+          this.$instance.post(`/app/appresidentapplet/queryDetailByIdNumberAndName`,{
+            name: this.userRealName,
+            idNumber: this.userIdNumber
+          }).then(res=> {
+            if(res.data && res.data.id) {
+              this.userAreaId = res.data.id
+              this.userAreaName = res.data.areaName
+            }
+          })
+        }
       }
     }
   }
@@ -191,6 +266,31 @@ export default {
         p {
           width: 100%;
         }
+
+        .ai-area__wrapper {
+          display: flex;
+          align-items: center;
+          padding-left: 100px;
+
+          span {
+            color: #333;
+            font-size: 30px;
+          }
+
+          i {
+            color: #999;
+            font-size: 30px;
+          }
+
+          image {
+            width: 16px;
+            height: 8px;
+          }
+        }
+      }
+
+      ::v-deep .AiAreaPicker {
+        float: right;
       }
 
       .user-img-div {
@@ -274,9 +374,8 @@ export default {
     color: #197DF0;
   }
 
-  // .editNickName {
-  //   text-align: right;
-  //   font-size: 28px;
-  // }
+  .btn-edit {
+    background: #FFF;
+  }
 }
 </style>