From 47ee20af77ef1a3a3d5dd7329d5654b0428c09eb Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 15 Jan 2024 15:41:26 +0800
Subject: [PATCH] fix

---
 src/api/index.js                              |   3 +
 .../miniProgramMg/index/banner/add/index.vue  |   2 +-
 .../miniProgramMg/index/banner/list/index.vue |   4 +-
 .../miniProgramMg/index/hot/add/index.vue     |   4 +-
 .../miniProgramMg/index/hot/list/index.vue    |   4 +-
 src/pages/miniProgramMg/index/inlet/index.vue |  84 +-
 src/pages/setting/list/index.vue              | 192 +++--
 src/pages/setting/list/info.vue               | 791 ++++++++++--------
 src/pages/user/detail/index.vue               |   4 +-
 9 files changed, 623 insertions(+), 465 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index ad7954d..e8a9f78 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -8,6 +8,9 @@ export default {
   verification: `${host}users/users/user/captcha`,
 
 	sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,
+	queryUserInfoDetails: `users/users/userAccount/queryUserInfoDetails`,
+	updatePersonCenter: `users/users/userAccount/updatePersonCenter`,
+	updateUserAvatars: `${host}users/users/userAccount/updateUserAvatars`,
 
 	queryProvince: `nakadai/nakadai/province/queryProvince`,
 	queryCity: `nakadai/nakadai/city/queryCity`,
diff --git a/src/pages/miniProgramMg/index/banner/add/index.vue b/src/pages/miniProgramMg/index/banner/add/index.vue
index 82f125f..d2746f1 100644
--- a/src/pages/miniProgramMg/index/banner/add/index.vue
+++ b/src/pages/miniProgramMg/index/banner/add/index.vue
@@ -79,7 +79,7 @@
       <el-button @click="save(0)">保存</el-button>
       <el-button type="primary"
                  @click="save(1)">发布</el-button>
-      <el-button @click="$router.back()">取消</el-button>
+      <el-button @click="$emit('closeDia')">取消</el-button>
     </div>
   </div>
 </template>
diff --git a/src/pages/miniProgramMg/index/banner/list/index.vue b/src/pages/miniProgramMg/index/banner/list/index.vue
index d0718b4..cff791d 100644
--- a/src/pages/miniProgramMg/index/banner/list/index.vue
+++ b/src/pages/miniProgramMg/index/banner/list/index.vue
@@ -83,11 +83,11 @@ export default {
     this.$store.commit('user/setCrumbs', [
       {
         name: '小程序管理',
-        path: '/miniProgramMg/index'
+        route: '/miniProgramMg'
       },
       {
         name: '首页设置',
-        path: '/miniProgramMg/banner'
+        route: '/miniProgramMg'
       },
       {
         name: '设置banner',
diff --git a/src/pages/miniProgramMg/index/hot/add/index.vue b/src/pages/miniProgramMg/index/hot/add/index.vue
index fac4314..44ccd18 100644
--- a/src/pages/miniProgramMg/index/hot/add/index.vue
+++ b/src/pages/miniProgramMg/index/hot/add/index.vue
@@ -93,7 +93,7 @@
       <el-button @click="save(0)">保存</el-button>
       <el-button type="primary"
                  @click="save(1)">发布</el-button>
-      <el-button @click="$router.back()">取消</el-button>
+      <el-button @click="$emit('closeDia')">取消</el-button>
     </div>
   </div>
 </template>
@@ -237,7 +237,7 @@ export default {
     beforeRemove (file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
-    handleRemove () {
+    handleRemove (file, fileList) {
       Oss.del(file.url)
       this.pics = fileList
     },
diff --git a/src/pages/miniProgramMg/index/hot/list/index.vue b/src/pages/miniProgramMg/index/hot/list/index.vue
index 1ab7637..b55187d 100644
--- a/src/pages/miniProgramMg/index/hot/list/index.vue
+++ b/src/pages/miniProgramMg/index/hot/list/index.vue
@@ -105,11 +105,11 @@ export default {
     this.$store.commit('user/setCrumbs', [
       {
         name: '小程序管理',
-        path: '/miniProgramMg/index'
+        route: '/miniProgramMg'
       },
       {
         name: '首页设置',
-        path: '/miniProgramMg/hot'
+        route: '/miniProgramMg'
       },
       {
         name: '设置爆款',
diff --git a/src/pages/miniProgramMg/index/inlet/index.vue b/src/pages/miniProgramMg/index/inlet/index.vue
index 4a18b86..b2b982b 100644
--- a/src/pages/miniProgramMg/index/inlet/index.vue
+++ b/src/pages/miniProgramMg/index/inlet/index.vue
@@ -15,15 +15,67 @@
       <div class="cover"
            @click="toSet(0)">设置爆款</div>
     </div>
+
+    <div class="activity">
+      <h6>活动速递</h6>
+
+      <el-tabs v-model="active">
+        <el-tab-pane v-for="(item, i) in tabs"
+                     :key="i"
+                     :label="item.name"
+                     :name="item.id"></el-tab-pane>
+      </el-tabs>
+      <ul class="list">
+        <li>
+          <img class="pic"
+               src="http://124.71.79.122/images/miniProgram/supplier-banner.jpg"
+               alt="">
+          <div class="texts">
+            <p class="name">中国幼教年会西部峰会</p>
+            <p class="meta">报名时间：2024-01-11 23:00</p>
+            <p class="meta">主办方：中国幼教</p>
+          </div>
+        </li>
+      </ul>
+    </div>
   </div>
 </template>
 
 <script>
-import Setting from "@/setting";
 export default {
   data () {
     return {
-
+      tabs: [
+        {
+          id: '',
+          name: '全部'
+        },
+        {
+          id: 1,
+          name: '会议'
+        },
+        {
+          id: 2,
+          name: '论坛'
+        },
+        {
+          id: 3,
+          name: '讲座'
+        },
+        {
+          id: 4,
+          name: '展会'
+        },
+        // {
+        //   id: 5,
+        //   name: '培训'
+        // },
+        // {
+        //   id: 6,
+        //   name: '大赛'
+        // },
+      ],
+      active: '',
     };
   },
   mounted () {
@@ -49,6 +101,34 @@ export default {
 @import '../../../../styles/page/page.scss';
 .page {
     width: 400px;
+    height: 560px;
+    min-height: 580px !important;
     margin: 0 auto;
 }
+.activity {
+    margin-top: 20px;
+    h6 {
+        font-size: 20px;
+    }
+    .list {
+        li {
+            display: flex;
+        }
+        .pic {
+            width: 140px;
+            height: 90px;
+            margin-right: 10px;
+            border-radius: 8px;
+        }
+        .name {
+            font-size: 16px;
+            font-weight: 600;
+        }
+        .meta {
+            margin: 5px 0;
+            font-size: 12px;
+            color: #999;
+        }
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/setting/list/index.vue b/src/pages/setting/list/index.vue
index 271c0f4..78117ae 100644
--- a/src/pages/setting/list/index.vue
+++ b/src/pages/setting/list/index.vue
@@ -3,20 +3,32 @@
     <div class="left">
       <div class="inner">
         <div class="text-center">
-          <img :src="avatar" class="avatar" />
-          <el-upload :action="this.api.updateUserAvatars" name="file" :data="{ userId }" :limit="10" :show-file-list="false" :headers="headers" :on-success="changeAvatar">
-            <el-button type="text" size="small">点击更换头像</el-button>
+          <img :src="avatar"
+               class="avatar" />
+          <el-upload :action="this.api.updateUserAvatars"
+                     name="file"
+                     :limit="10"
+                     :show-file-list="false"
+                     :headers="headers"
+                     :on-success="changeAvatar">
+            <el-button type="text"
+                       size="small">点击更换头像</el-button>
           </el-upload>
         </div>
 
         <ul class="menu">
-          <li v-for="item in typeList" :key="item.index" :class="{active: item.index == active}">
+          <li v-for="item in typeList"
+              :key="item.index"
+              :class="{active: item.index == active}">
             {{ item.title }}
           </li>
         </ul>
       </div>
     </div>
-    <info class="flex-1" ref="info" @updateStatus="updateStatus" @back="back"></info>
+    <info class="flex-1"
+          ref="info"
+          @updateStatus="updateStatus"
+          @back="back"></info>
   </div>
 </template>
 
@@ -26,106 +38,106 @@ import Setting from '@/setting'
 import util from '@/libs/util'
 import info from './info'
 export default {
-    data() {
-      return {
-        headers: {
-          token: util.local.get(Setting.tokenKey)
-        },
-        typeList: [
-          {
-            index: '1',
-            title: '用户信息'
-          }
-        ],
-        active: '1',
-        edited: false
-      };
+  data () {
+    return {
+      headers: {
+        token: util.local.get(Setting.tokenKey)
+      },
+      typeList: [
+        {
+          index: '1',
+          title: '用户信息'
+        }
+      ],
+      active: '1',
+      edited: false
+    };
+  },
+  components: { info },
+  computed: {
+    ...mapState('user', [
+      'avatar'
+    ]),
+  },
+  // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
+  beforeRouteLeave (to, from, next) {
+    if (this.edited) {
+      this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.$refs.info.submit()
+        next()
+      }).catch(() => {
+        next()
+      })
+    } else {
+      next()
+    }
+  },
+  mounted () {
+
+  },
+  methods: {
+    ...mapMutations('user', [
+      'setAvatar'
+    ]),
+    changeAvatar (res) {
+      this.setAvatar(res.message)
     },
-    components: { info },
-    computed: {
-      ...mapState('user', [
-        'avatar', 'userId'
-      ]),
+    updateStatus (status) {
+      this.edited = status
     },
-    // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
-    beforeRouteLeave(to, from, next) {
-      if(this.edited){
+    // 返回
+    back () {
+      if (this.edited) {
+        this.edited = false
         this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
           type: 'warning'
         }).then(() => {
           this.$refs.info.submit()
-          next()
+          this.$router.back()
         }).catch(() => {
-          next()
-        })
-      }else{
-        next()
-      }
-    },
-    mounted() {
-        
-    },
-    methods: {
-      ...mapMutations('user', [
-        'setAvatar'
-      ]),
-      changeAvatar(res) {
-        this.setAvatar(res.data)
-      },
-      updateStatus(status){
-        this.edited = status
-      },
-      // 返回
-      back() {
-        if(this.edited){
-          this.edited = false
-          this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.$refs.info.submit()
-            this.$router.back()
-          }).catch(() => {
-            this.$router.back()
-          })
-        }else{
           this.$router.back()
-        }
+        })
+      } else {
+        this.$router.back()
       }
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-.main{
-  display: flex;
-  margin: 0 auto;
-  .left{
-    margin-right: 12px;
-    background-color: #fff;
-    box-shadow: 2px 0px 6px 0px #EEEEEE;
-    .inner{
-      width: 170px;
-      padding: 20px 0;
-    }
-    .avatar{
-      width: 80px;
-      height: 80px;
-      border-radius: 50%;
-    }
-    .menu{
-      margin-top: 32px;
-      li{
-        padding: 0 20px;
-        color: #303133;
-        font-size: 14px;
-        line-height: 38px;
-        cursor: pointer;
-        &.active{
-          color: #fff;
-          background-color: $main-color;
+.main {
+    display: flex;
+    margin: 0 auto;
+    .left {
+        margin-right: 12px;
+        background-color: #fff;
+        box-shadow: 2px 0px 6px 0px #eeeeee;
+        .inner {
+            width: 170px;
+            padding: 20px 0;
+        }
+        .avatar {
+            width: 80px;
+            height: 80px;
+            border-radius: 50%;
+        }
+        .menu {
+            margin-top: 32px;
+            li {
+                padding: 0 20px;
+                color: #303133;
+                font-size: 14px;
+                line-height: 38px;
+                cursor: pointer;
+                &.active {
+                    color: #fff;
+                    background-color: $main-color;
+                }
+            }
         }
-      }
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/setting/list/info.vue b/src/pages/setting/list/info.vue
index 8bafe29..b3846a3 100644
--- a/src/pages/setting/list/info.vue
+++ b/src/pages/setting/list/info.vue
@@ -1,127 +1,195 @@
 <template>
-  <div class="relative" v-loading="loading">
+  <div class="relative"
+       v-loading="loading">
     <div class="page">
-      <h6 class="l-title"><img src="@/assets/images/info1.png" alt=""> 基本信息</h6>
+      <h6 class="l-title"><img src="@/assets/images/info1.png"
+             alt=""> 基本信息</h6>
       <div class="page-content">
         <ul class="list">
           <li>
             <label>姓名：</label>
-            <el-input placeholder="请输入姓名" type="text" v-model="form.realName" />
+            <el-input placeholder="请输入姓名"
+                      type="text"
+                      v-model="form.hrUserInfo.userName" />
           </li>
           <li>
             <label>性别：</label>
-            <el-select size="small" v-model="form.sex">
-              <el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"></el-option>
+            <el-select size="small"
+                       v-model="form.hrUserInfo.sex">
+              <el-option v-for="item in sexList"
+                         :key="item.value"
+                         :label="item.name"
+                         :value="item.value"></el-option>
             </el-select>
           </li>
           <li>
             <label>账号：</label>
-            <el-input class="m-r-10" type="text" size="small" v-model="form.username"></el-input>
+            <el-input class="m-r-10"
+                      type="text"
+                      size="small"
+                      v-model="form.userAccount.account"></el-input>
             <!-- <el-button type="text" size="small" @click="showAccount">修改</el-button> -->
           </li>
           <li>
             <label>工号：</label>
-            <el-input size="small" v-model="form.jobNumber" clearable></el-input>
+            <el-input size="small"
+                      v-model="form.userAccount.workNumber"
+                      clearable></el-input>
           </li>
           <li>
             <label>邮箱：</label>
-            <el-input class="m-r-10" size="small" v-model="form.email"></el-input>
+            <el-input class="m-r-10"
+                      size="small"
+                      v-model="form.hrUserInfo.email"></el-input>
             <!-- <el-button v-if="form.email" type="text" size="small" @click="bindEmail">更换</el-button>
             <el-button v-else type="text" size="small" @click="bindEmail">添加</el-button> -->
           </li>
           <li>
             <label>手机号：</label>
-            <el-input class="m-r-10" type="text" size="small" maxlength="11" v-model="form.phone"></el-input>
+            <el-input class="m-r-10"
+                      type="text"
+                      size="small"
+                      maxlength="11"
+                      v-model="form.hrUserInfo.phone"></el-input>
             <!-- <el-button type="text" size="small" @click="bindPhone">{{ form.phone ? '更换' : '绑定' }}</el-button>
             <el-button v-if="form.phone" type="text" size="small" @click="unbind">解绑</el-button> -->
           </li>
           <li>
             <label>密码：</label>
-            <el-input class="m-r-10" size="small" value="******" disabled></el-input>
-            <el-button type="text" size="small" @click="bindPassword">修改</el-button>
+            <el-input class="m-r-10"
+                      size="small"
+                      value="******"
+                      disabled></el-input>
+            <el-button type="text"
+                       size="small"
+                       @click="bindPassword">修改</el-button>
           </li>
         </ul>
       </div>
       <div class="btn-wrap">
-        <el-button size="small" v-throttle @click="$emit('back')">取消</el-button>
-        <el-button type="primary" size="small" v-throttle @click="submit">更新</el-button>
+        <el-button size="small"
+                   v-throttle
+                   @click="$emit('back')">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   v-throttle
+                   @click="submit">更新</el-button>
       </div>
     </div>
-    <el-dialog
-      :title="form.email ? '更换邮箱' : '绑定邮箱'"
-      :visible.sync="emailVisible"
-      :close-on-click-modal="false"
-      @close="closeEmail"
-      width="30%">
-      <el-form ref="form" :model="form" label-width="60px">
+    <el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'"
+               :visible.sync="emailVisible"
+               :close-on-click-modal="false"
+               @close="closeEmail"
+               width="30%">
+      <el-form ref="form"
+               :model="form"
+               label-width="60px">
         <el-form-item label="邮箱">
-          <el-input placeholder="请输入邮箱" v-model="email"></el-input>
+          <el-input placeholder="请输入邮箱"
+                    v-model="email"></el-input>
         </el-form-item>
         <el-form-item label="验证码">
           <div class="flex-between">
-            <el-input v-model="emailCode" placeholder="请输入验证码" maxlength="6"></el-input>
-            <el-button style="margin-left: 10px" type="text" @click="sendEmailCode" :disabled="emailDisabled">{{ emailBtnText }}</el-button>
+            <el-input v-model="emailCode"
+                      placeholder="请输入验证码"
+                      maxlength="6"></el-input>
+            <el-button style="margin-left: 10px"
+                       type="text"
+                       @click="sendEmailCode"
+                       :disabled="emailDisabled">{{ emailBtnText }}</el-button>
           </div>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="emailVisible = false">取 消</el-button>
-        <el-button type="primary" @click="emailSubmit">确 定</el-button>
+        <el-button type="primary"
+                   @click="emailSubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      :title="form.phone ? '更换手机号' : '绑定手机号'"
-      :visible.sync="phoneVisible"
-      :close-on-click-modal="false"
-      @close="closePhone"
-      width="30%">
-      <el-form ref="form" :model="form" label-width="60px">
+    <el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'"
+               :visible.sync="phoneVisible"
+               :close-on-click-modal="false"
+               @close="closePhone"
+               width="30%">
+      <el-form ref="form"
+               :model="form"
+               label-width="60px">
         <el-form-item label="手机号">
-          <el-input style="width: 404px;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
+          <el-input style="width: 404px;"
+                    placeholder="请输入手机号"
+                    v-model="phone"
+                    maxlength="11"></el-input>
         </el-form-item>
         <el-form-item label="验证码">
           <div class="flex-between">
-            <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
-            <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
+            <el-input v-model="phoneCode"
+                      placeholder="请输入验证码"
+                      maxlength="6"></el-input>
+            <el-button style="margin-left: 10px"
+                       type="text"
+                       @click="sendPhoneCode"
+                       :disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
           </div>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="phoneVisible = false">取 消</el-button>
-        <el-button type="primary" @click="phoneSubmit">确 定</el-button>
+        <el-button type="primary"
+                   @click="phoneSubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="更换密码"
-      :visible.sync="pwdVisible"
-      :close-on-click-modal="false"
-      @close="closePassword"
-      width="30%">
-      <el-form ref="pwdForm" :model="form" label-width="60px">
+    <el-dialog title="更换密码"
+               :visible.sync="pwdVisible"
+               :close-on-click-modal="false"
+               @close="closePassword"
+               width="30%">
+      <el-form ref="pwdForm"
+               :model="form"
+               label-width="60px">
         <el-form-item label="原密码">
-          <el-input type="password" v-model="pwdForm.password" placeholder="请输入原密码"></el-input>
+          <el-input type="password"
+                    v-model="pwdForm.password"
+                    placeholder="请输入原密码"></el-input>
         </el-form-item>
         <el-form-item label="新密码">
-          <el-input type="password" v-model="pwdForm.newPassword" placeholder="请输入新密码" @keyup.enter.native="editPassword"></el-input>
+          <el-input type="password"
+                    v-model="pwdForm.newPassword"
+                    placeholder="请输入新密码"
+                    @keyup.enter.native="editPassword"></el-input>
         </el-form-item>
         <el-form-item label="新密码">
-          <el-input type="password" v-model="pwdForm.reNewPassword" placeholder="请确认新密码" @keyup.enter.native="editPassword"></el-input>
+          <el-input type="password"
+                    v-model="pwdForm.reNewPassword"
+                    placeholder="请确认新密码"
+                    @keyup.enter.native="editPassword"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="pwdVisible = false">取 消</el-button>
-        <el-button type="primary" @click="editPassword">确 定</el-button>
+        <el-button type="primary"
+                   @click="editPassword">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="修改账号" :visible.sync="accountVisible" :close-on-click-modal="false" width="30%">
+    <el-dialog title="修改账号"
+               :visible.sync="accountVisible"
+               :close-on-click-modal="false"
+               width="30%">
       <el-form label-width="70px">
         <el-form-item label="账号">
-          <el-input v-model="editUsername" placeholder="请输入账号"></el-input>
+          <el-input v-model="editUsername"
+                    placeholder="请输入账号"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="accountVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="confirmAccount">确 定</el-button>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="small"
+                   @click="accountVisible = false">取 消</el-button>
+        <el-button size="small"
+                   type="primary"
+                   @click="confirmAccount">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -132,341 +200,336 @@ import Setting from '@/setting'
 import util from '@/libs/util'
 import { mapState, mapMutations } from 'vuex'
 export default {
-    data() {
-      return {
-        loading: false,
-        editUsername: '',
-        accountVisible: false,
-        updateTime: 0,
-        token: util.local.get(Setting.tokenKey),
-        form: {
-          userName: "",
-          name: "",
-          jobNumber: "",
-          password: "",
-          phone: "",
-          email: "",
-          sex: 1,
-        },
-        emailVisible: false,
-        pwdVisible: false,
-        phoneVisible: false,
-        showArch: false,
-        pwdForm: {
-          password: "",
-          newPassword: "",
-          reNewPassword: ""
-        },
-        sexList: [
-          {
-            name: "男",
-            value: 1
-          },
-          {
-            name: "女",
-            value: 2
-          }
-        ],
-        email: "",
-        emailBtnText: "发送验证码",
-        emailCode: "",
-        emailDisabled: false,
-        emailTimer: null,
+  data () {
+    return {
+      loading: false,
+      editUsername: '',
+      accountVisible: false,
+      updateTime: 0,
+      token: util.local.get(Setting.tokenKey),
+      form: {
+        hrUserInfo: {},
+        userAccount: {},
+        userName: "",
+        name: "",
+        jobNumber: "",
+        password: "",
         phone: "",
-        phoneBtnText: "发送验证码",
-        phoneCode: "",
-        phoneDisabled: false,
-        phoneTimer: null,
-        emailOpener: "",
-        phoneOpener: "",
-        originAccount: "",
-        accountReapeat: false
-      };
+        email: "",
+        sex: 1,
+      },
+      emailVisible: false,
+      pwdVisible: false,
+      phoneVisible: false,
+      showArch: false,
+      pwdForm: {
+        password: "",
+        newPassword: "",
+        reNewPassword: ""
+      },
+      sexList: [
+        {
+          name: "男",
+          value: 1
+        },
+        {
+          name: "女",
+          value: 2
+        }
+      ],
+      email: "",
+      emailBtnText: "发送验证码",
+      emailCode: "",
+      emailDisabled: false,
+      emailTimer: null,
+      phone: "",
+      phoneBtnText: "发送验证码",
+      phoneCode: "",
+      phoneDisabled: false,
+      phoneTimer: null,
+      emailOpener: "",
+      phoneOpener: "",
+      originAccount: "",
+      accountReapeat: false
+    };
+  },
+  computed: {
+    ...mapState("user", [
+      "userId", "avatar"
+    ])
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler () {
+        this.updateTime++
+        if (this.updateTime > 1) this.$emit('updateStatus', this.updateTime > 1)
+      },
+      deep: true
+    }
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    ...mapMutations('user', [
+      'setUserName'
+    ]),
+    // 获取用户信息
+    getData () {
+      this.loading = true
+      this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
+        this.form = result
+        this.loading = false
+      }).catch(err => { })
     },
-    computed: {
-      ...mapState("user", [
-          "userId", "avatar"
-      ])
+    // 显示修改账号弹框
+    showAccount () {
+      this.accountVisible = true
     },
-    watch: {
-      // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-      form: {
-        handler(){
-          this.updateTime++
-          if(this.updateTime > 1) this.$emit('updateStatus', this.updateTime > 1)
-        },
-        deep:true
+    // 修改账号
+    confirmAccount () {
+      if (this.editUsername) {
+        form.username = this.editUsername
+        this.accountVisible = false
+        const { form } = this
+        this.$put(this.api.user, form).then(res => {
+          this.setUserName(form.username)
+          this.$message.success("提交成功！")
+        }).catch(res => { })
+      } else {
+        util.errorMsg('请输入账号')
       }
     },
-    mounted() {
-      this.getData()
+    bindEmail () {
+      this.email = this.form.email
+      this.emailVisible = true
     },
-    methods: {
-        ...mapMutations('user', [
-          'setUserName'
-        ]),
-        // 获取用户信息
-        getData() {
-          this.loading = true
-          this.$get(`${this.api.user}/${this.userId}`).then(({ data }) => {
-            this.form = data
-            this.loading = false
-          }).catch(err => {})
-        },
-        // 显示修改账号弹框
-        showAccount() {
-          this.accountVisible = true
-        },
-        // 修改账号
-        confirmAccount() {
-          if (this.editUsername) {
-            form.username = this.editUsername
-            this.accountVisible = false
-            const { form } = this
-            this.$put(this.api.user, form).then(res => {
-              this.setUserName(form.username)
-              this.$message.success("提交成功！")
-            }).catch(res => {})
+    bindPhone () {
+      this.phone = this.form.phone
+      this.phoneVisible = true
+    },
+    // 解绑手机号
+    unbind () {
+      this.$confirm('确定要解绑该手机号吗？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.$get(this.api.unbindMobilePhone).then(res => {
+          this.$message.success('解绑成功')
+          this.getData()
+        }).catch(res => { })
+      }).catch(() => { })
+    },
+    bindPassword () {
+      this.pwdVisible = true
+    },
+    editPassword () {
+      const data = this.pwdForm
+      if (!data.password) return util.warningMsg("请输入原密码")
+      if (!data.newPassword) return util.warningMsg("请输入新密码")
+      if (!data.reNewPassword) return util.warningMsg("请确认新密码")
+      if (data.newPassword.length < 6 || data.reNewPassword.length < 6) return util.warningMsg("请输入6位数以上的密码")
+      if (data.newPassword !== data.reNewPassword) return util.warningMsg("输入的新密码不一致，请重新确认")
+      if (data.password === data.newPassword) return util.warningMsg("原密码跟新密码不能一致")
+      this.$put(this.api.pwd, {
+        id: this.form.id,
+        oldPwd: data.password,
+        newPwd: data.newPassword
+      }).then(res => {
+        util.successMsg("更换成功")
+        this.pwdVisible = false
+      }).catch(err => { })
+    },
+    closePassword () {
+      this.pwdForm = {
+        password: "",
+        newPassword: "",
+        reNewPassword: ""
+      }
+    },
+    submit () {
+      const { form } = this
+      this.$post(this.api.updatePersonCenter, this.form).then(res => {
+        this.$emit('updateStatus', false)
+        this.setUserName(form.hrUserInfo.userName)
+        this.$message.success("提交成功！")
+      }).catch(res => { })
+    },
+    emailCountdown () {
+      let count = 60;
+      if (!this.emailTimer) {
+        this.emailDisabled = true;
+        this.emailTimer = setInterval(() => {
+          console.log("倒计时中");
+          if (count > 0) {
+            count--;
+            this.emailBtnText = `${count}秒后重试`;
           } else {
-            util.errorMsg('请输入账号')
+            this.emailDisabled = false;
+            clearInterval(this.emailTimer);
+            this.emailTimer = null;
+            this.emailBtnText = `发送验证码`;
           }
-        },
-        bindEmail() {
-          this.email = this.form.email
-          this.emailVisible = true
-        },
-        bindPhone() {
-          this.phone = this.form.phone
-          this.phoneVisible = true
-        },
-        // 解绑手机号
-        unbind() {
-          this.$confirm('确定要解绑该手机号吗？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.$get(this.api.unbindMobilePhone).then(res => {
-              this.$message.success('解绑成功')
-              this.getData()
-            }).catch(res => {})
-          }).catch(() => {})
-        },
-        bindPassword() {
-          this.pwdVisible = true
-        },
-        editPassword() {
-          const data = this.pwdForm
-          if (!data.password) return util.warningMsg("请输入原密码")
-          if (!data.newPassword) return util.warningMsg("请输入新密码")
-          if (!data.reNewPassword) return util.warningMsg("请确认新密码")
-          if (data.newPassword.length < 6 || data.reNewPassword.length < 6) return util.warningMsg("请输入6位数以上的密码")
-          if (data.newPassword !== data.reNewPassword) return util.warningMsg("输入的新密码不一致，请重新确认")
-          if (data.password === data.newPassword) return util.warningMsg("原密码跟新密码不能一致")
-          this.$put(this.api.pwd, {
-            id: this.form.id,
-            oldPwd: data.password,
-            newPwd: data.newPassword
-          }).then(res => {
-            util.successMsg("更换成功")
-            this.pwdVisible = false
-          }).catch(err => {})
-        },
-        closePassword() {
-          this.pwdForm = {
-            password: "",
-            newPassword: "",
-            reNewPassword: ""
+        }, 1000);
+      }
+    },
+    phoneCountdown () {
+      let count = 60;
+      if (!this.phoneTimer) {
+        this.phoneDisabled = true;
+        this.phoneTimer = setInterval(() => {
+          console.log("倒计时中");
+          if (count > 0) {
+            count--;
+            this.phoneBtnText = `${count}秒后重试`;
+          } else {
+            this.phoneDisabled = false;
+            clearInterval(this.phoneTimer);
+            this.phoneTimer = null;
+            this.phoneBtnText = `发送验证码`;
           }
-        },
-        submit() {
-          const { form } = this
-          this.$put(this.api.user, {
-            id: form.id,
-            jobNumber: form.jobNumber,
-            phone: form.phone,
-            realName: form.realName,
-            username: form.username,
-            email: form.email,
-            sex: form.sex,
-          }).then(res => {
-            this.$emit('updateStatus', false)
-            this.setUserName(form.realName)
-            this.$message.success("提交成功！")
-          }).catch(res => {})
-        },
-        emailCountdown() {
-            let count = 60;
-            if (!this.emailTimer) {
-                this.emailDisabled = true;
-                this.emailTimer = setInterval(() => {
-                    console.log("倒计时中");
-                    if (count > 0) {
-                        count--;
-                        this.emailBtnText = `${count}秒后重试`;
-                    } else {
-                        this.emailDisabled = false;
-                        clearInterval(this.emailTimer);
-                        this.emailTimer = null;
-                        this.emailBtnText = `发送验证码`;
-                    }
-                }, 1000);
-            }
-        },
-        phoneCountdown() {
-            let count = 60;
-            if (!this.phoneTimer) {
-                this.phoneDisabled = true;
-                this.phoneTimer = setInterval(() => {
-                    console.log("倒计时中");
-                    if (count > 0) {
-                        count--;
-                        this.phoneBtnText = `${count}秒后重试`;
-                    } else {
-                        this.phoneDisabled = false;
-                        clearInterval(this.phoneTimer);
-                        this.phoneTimer = null;
-                        this.phoneBtnText = `发送验证码`;
-                    }
-                }, 1000);
-            }
-        },
-        closeEmail() {
-            if (!this.emailDisabled) {
-                this.emailCode = "";
-            }
-        },
-        sendEmailCode() {
-          if (!this.email) return util.warningMsg("请输入邮箱")
-          if (!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return util.warningMsg("请输入正确的邮箱")
-          this.$post(this.api.sendPhoneOrEmailCode, {
-            email: this.email,
-            types: 1
-          }).then(res => {
-            if (res.message.opener) {
-              this.emailCountdown();
-              this.emailOpener = res.message.opener;
-            } else {
-              util.errorMsg(res.message);
-            }
-          }).catch(res => {})
-        },
-        emailSubmit() {
-          if (!this.email) return util.warningMsg("请输入邮箱")
-          if (!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return util.warningMsg("请输入正确的邮箱")
-          if (!this.emailCode) return util.warningMsg("请输入验证码")
-          this.$put(this.api.bindPhoneOrEmail, {
-            userId: this.userId,
-            email: this.email,
-            types: 1,
-            code: this.emailCode,
-            opener: this.emailOpener
-          }).then(res => {
-            util.successMsg("绑定成功")
-            this.form.email = this.email
-            this.emailVisible = false
-          }).catch(res => {})
-        },
-        closePhone() {
-            if (!this.emailDisabled) {
-                this.emailCode = "";
-            }
-        },
-        sendPhoneCode() {
-            if (!this.phone) return util.warningMsg("请输入手机号");
-            if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
-            let data = {
-                userId: this.userId,
-                phone: this.phone,
-                types: 2
-            };
-            this.$post(this.api.sendPhoneOrEmailCode, data).then(res => {
-                if (res.message.opener) {
-                    this.phoneCountdown();
-                    this.phoneOpener = res.message.opener;
-                } else {
-                    util.errorMsg(res.message);
-                }
-            }).catch(res => {
-            });
-        },
-        phoneSubmit() {
-            if (!this.phone) return util.warningMsg("请输入手机号");
-            if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
-            if (!this.phoneCode) return util.warningMsg("请输入验证码");
-            let data = {
-                userId: this.userId,
-                phone: this.phone,
-                types: 2,
-                code: this.phoneCode,
-                opener: this.phoneOpener
-            };
-            this.$post(this.api.bindPhoneOrEmail, data).then(res => {
-                util.successMsg("绑定成功");
-                this.form.phone = this.phone;
-                this.phoneVisible = false;
-            }).catch(res => {
-            });
+        }, 1000);
+      }
+    },
+    closeEmail () {
+      if (!this.emailDisabled) {
+        this.emailCode = "";
+      }
+    },
+    sendEmailCode () {
+      if (!this.email) return util.warningMsg("请输入邮箱")
+      if (!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return util.warningMsg("请输入正确的邮箱")
+      this.$post(this.api.sendPhoneOrEmailCode, {
+        email: this.email,
+        types: 1
+      }).then(res => {
+        if (res.message.opener) {
+          this.emailCountdown();
+          this.emailOpener = res.message.opener;
+        } else {
+          util.errorMsg(res.message);
         }
+      }).catch(res => { })
+    },
+    emailSubmit () {
+      if (!this.email) return util.warningMsg("请输入邮箱")
+      if (!/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(this.email)) return util.warningMsg("请输入正确的邮箱")
+      if (!this.emailCode) return util.warningMsg("请输入验证码")
+      this.$put(this.api.bindPhoneOrEmail, {
+        userId: this.userId,
+        email: this.email,
+        types: 1,
+        code: this.emailCode,
+        opener: this.emailOpener
+      }).then(res => {
+        util.successMsg("绑定成功")
+        this.form.email = this.email
+        this.emailVisible = false
+      }).catch(res => { })
+    },
+    closePhone () {
+      if (!this.emailDisabled) {
+        this.emailCode = "";
+      }
+    },
+    sendPhoneCode () {
+      if (!this.phone) return util.warningMsg("请输入手机号");
+      if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
+      let data = {
+        userId: this.userId,
+        phone: this.phone,
+        types: 2
+      };
+      this.$post(this.api.sendPhoneOrEmailCode, data).then(res => {
+        if (res.message.opener) {
+          this.phoneCountdown();
+          this.phoneOpener = res.message.opener;
+        } else {
+          util.errorMsg(res.message);
+        }
+      }).catch(res => {
+      });
+    },
+    phoneSubmit () {
+      if (!this.phone) return util.warningMsg("请输入手机号");
+      if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
+      if (!this.phoneCode) return util.warningMsg("请输入验证码");
+      let data = {
+        userId: this.userId,
+        phone: this.phone,
+        types: 2,
+        code: this.phoneCode,
+        opener: this.phoneOpener
+      };
+      this.$post(this.api.bindPhoneOrEmail, data).then(res => {
+        util.successMsg("绑定成功");
+        this.form.phone = this.phone;
+        this.phoneVisible = false;
+      }).catch(res => {
+      });
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .page {
-  min-height: 100%;
+    min-height: 100%;
 }
 .l-title {
-  display: flex;
-  align-items: center;
-  margin-bottom: 12px;
-  font-size: 14px;
-  color: #333;
-  img {
-    margin-right: 5px;
-  }
-}
-.list{
-  .line {
-    display: flex;
-    margin-bottom: 24px;
-  }
-  .el-input, .el-select {
-    width: 220px;
-    .el-input__inner{
-      border-color: #CACFDB;
-    }
-  }
-  li {
     display: flex;
     align-items: center;
-    margin-bottom: 20px;
-    &>label {
-        width: 100px;
+    margin-bottom: 12px;
+    font-size: 14px;
+    color: #333;
+    img {
         margin-right: 5px;
-        text-align: right;
-        font-size: 14px;
-        color: #4c4c4c;
-        white-space: nowrap;
     }
-    .el-select .el-input.is-disabled .el-input__inner {
-      border-color: #ddd;
+}
+.list {
+    .line {
+        display: flex;
+        margin-bottom: 24px;
+    }
+    .el-input,
+    .el-select {
+        width: 220px;
+        .el-input__inner {
+            border-color: #cacfdb;
+        }
     }
-    .val {
-      margin-right: 15px;
-      color: #606266;
-      font-size: 14px;
+    li {
+        display: flex;
+        align-items: center;
+        margin-bottom: 20px;
+        & > label {
+            width: 100px;
+            margin-right: 5px;
+            text-align: right;
+            font-size: 14px;
+            color: #4c4c4c;
+            white-space: nowrap;
+        }
+        .el-select .el-input.is-disabled .el-input__inner {
+            border-color: #ddd;
+        }
+        .val {
+            margin-right: 15px;
+            color: #606266;
+            font-size: 14px;
+        }
     }
-  }
 }
 .btn-wrap {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  padding: 12px 0;
-  text-align: center;
-  background-color: #fff;
-  .el-button{
-    width: 80px;
-  }
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    padding: 12px 0;
+    text-align: center;
+    background-color: #fff;
+    .el-button {
+        width: 80px;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/user/detail/index.vue b/src/pages/user/detail/index.vue
index b3889d0..60ffa3b 100644
--- a/src/pages/user/detail/index.vue
+++ b/src/pages/user/detail/index.vue
@@ -20,7 +20,7 @@
                       maxlength="11"></el-input>
           </el-form-item>
         </div>
-        <el-form-item label="用户名称">
+        <el-form-item label="组织名称">
           <el-input v-model="item.account"
                     placeholder="请输入用户名称"></el-input>
         </el-form-item>
@@ -71,7 +71,7 @@
     </div>
 
     <div class="page">
-      <p class="l-title">已绑定的平台和用户信息</p>
+      <p class="l-title">已绑定的组织信息</p>
       <el-table :data="platformList"
                 class="table"
                 stripe