个人中心模块

src/views/system/user/index.vue

@@ -536,10 +536,10 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        userId: undefined,
+        id: undefined,
         orgId: undefined,
-        userName: undefined,
-        nickName: undefined,
+        username: undefined,
+        name: undefined,
         password: undefined,
         phone: undefined,
         email: undefined,
@@ -632,7 +632,7 @@ export default {
     },
     /** 分配角色操作 */
     handleAuthRole: function(row) {
-      const userId = row.userId;
+      const userId = row.id;
       this.$router.push("/system/user-auth/role/" + userId);
     },
     /** 提交按钮 */

src/views/system/user/profile/index.vue

@@ -13,19 +13,19 @@
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
-                <div class="pull-right">{{ user.userName }}</div>
+                <div class="pull-right">{{ user.username }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="phone" />手机号码
-                <div class="pull-right">{{ user.phonenumber }}</div>
+                <div class="pull-right">{{ user.phone }}</div>
               </li>
-              <li class="list-group-item">
+              <!-- <li class="list-group-item">
                 <svg-icon icon-class="email" />用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
-              </li>
+              </li> -->
               <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属部门
-                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+                <div class="pull-right" v-if="user.orgName">{{ user.orgName }} </div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="peoples" />所属角色
@@ -81,6 +81,7 @@ export default {
   methods: {
     getUser() {
       getUserProfile().then(res => {
+        console.log(res)
         if(!res.user) return;
         this.user = res.data;
         this.roleGroup = res.roleGroup;

src/views/system/user/profile/resetPwd.vue

@@ -41,7 +41,7 @@ export default {
         ],
         newPassword: [
           { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+          { min: 5, max: 20, message: "长度在 5 到 20 个字符", trigger: "blur" }
         ],
         confirmPassword: [
           { required: true, message: "确认密码不能为空", trigger: "blur" },

src/views/system/user/profile/userInfo.vue

@@ -1,16 +1,16 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="nickName">
-      <el-input v-model="user.nickName" maxlength="30" />
+    <el-form-item label="用户昵称" prop="name">
+      <el-input v-model="user.name" maxlength="30" />
     </el-form-item> 
-    <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="user.phonenumber" maxlength="11" />
+    <el-form-item label="手机号码" prop="phone">
+      <el-input v-model="user.phone" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
+    <!-- <el-form-item label="邮箱" prop="email">
       <el-input v-model="user.email" maxlength="50" />
-    </el-form-item>
-    <el-form-item label="性别">
-      <el-radio-group v-model="user.sex">
+    </el-form-item> -->
+    <el-form-item label="性别" >
+      <el-radio-group v-model="user.gender">
         <el-radio label="0">男</el-radio>
         <el-radio label="1">女</el-radio>
       </el-radio-group>
@@ -35,18 +35,11 @@ export default {
     return {
       // 表单校验
       rules: {
-        nickName: [
+        name: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
-        email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
+        
+        phone: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,