From 8104504a7a8e17391125cb239addec2bb0361731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=9D=E5=BF=97=E9=91=AB?= <1204505056@qq.com>
Date: Tue, 14 Jul 2020 15:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9userName=E4=B8=BAusername?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/controller/user.js                            | 14 +++++++-------
 mock/controller/userManagement.js                  |  6 +++---
 package.json                                       |  2 +-
 src/components/VabProfile/index.vue                |  4 ++--
 src/store/modules/user.js                          | 14 +++++++-------
 src/views/login/index.vue                          | 14 +++++++-------
 .../components/UserManagementEdit.vue              |  8 ++++----
 .../personnelManagement/userManagement/index.vue   |  6 +++---
 src/views/register/index.vue                       | 14 +++++++-------
 src/views/vab/permissions/index.vue                |  4 ++--
 10 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/mock/controller/user.js b/mock/controller/user.js
index 61e3034..97a0bb9 100644
--- a/mock/controller/user.js
+++ b/mock/controller/user.js
@@ -23,8 +23,8 @@ export default [
     url: "/login",
     type: "post",
     response: (config) => {
-      const { userName } = config.body;
-      const accessToken = accessTokens[userName];
+      const { username } = config.body;
+      const accessToken = accessTokens[username];
       if (!accessToken) {
         return {
           code: 500,
@@ -54,25 +54,25 @@ export default [
     response: (config) => {
       const { accessToken } = config.body;
       let permissions = ["admin"];
-      let userName = "admin";
+      let username = "admin";
       if ("admin-accessToken" === accessToken) {
         permissions = ["admin"];
-        userName = "admin";
+        username = "admin";
       }
       if ("editor-accessToken" === accessToken) {
         permissions = ["editor"];
-        userName = "editor";
+        username = "editor";
       }
       if ("test-accessToken" === accessToken) {
         permissions = ["admin", "editor"];
-        userName = "test";
+        username = "test";
       }
       return {
         code: 200,
         msg: "success",
         data: {
           permissions,
-          userName,
+          username,
           "avatar|1": [
             "https://i.gtimg.cn/club/item/face/img/2/15922_100.gif",
             "https://i.gtimg.cn/club/item/face/img/8/15918_100.gif",
diff --git a/mock/controller/userManagement.js b/mock/controller/userManagement.js
index 999332a..2af7a46 100644
--- a/mock/controller/userManagement.js
+++ b/mock/controller/userManagement.js
@@ -2,7 +2,7 @@ const totalCount = 3;
 const List = [
   {
     id: "@id",
-    userName: "admin",
+    username: "admin",
     password: "admin",
     email: "@email",
     permissions: ["admin"],
@@ -10,7 +10,7 @@ const List = [
   },
   {
     id: "@id",
-    userName: "editor",
+    username: "editor",
     password: "editor",
     email: "@email",
     permissions: ["editor"],
@@ -18,7 +18,7 @@ const List = [
   },
   {
     id: "@id",
-    userName: "test",
+    username: "test",
     password: "test",
     email: "@email",
     permissions: ["admin", "editor"],
diff --git a/package.json b/package.json
index 15c40af..fd28f20 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "zx-count": "^0.3.7",
     "zx-icon": "^1.1.6",
     "zx-keel": "^0.9.4",
-    "zx-layouts": "^0.5.9",
+    "zx-layouts": "^0.6.0",
     "zx-magnifie": "^0.4.0",
     "zx-markdown-editor": "^0.0.2",
     "zx-player": "^0.9.6",
diff --git a/src/components/VabProfile/index.vue b/src/components/VabProfile/index.vue
index 0091cb8..f91e881 100644
--- a/src/components/VabProfile/index.vue
+++ b/src/components/VabProfile/index.vue
@@ -8,7 +8,7 @@
     </div>
     <div class="card-content">
       <el-image :src="avatar" class="avatar"></el-image>
-      <div class="username">{{ userName }}</div>
+      <div class="username">{{ username }}</div>
       <div class="social-icons">
         <a
           v-for="(item, index) in iconArray"
@@ -34,7 +34,7 @@ export default {
         return {};
       },
     },
-    userName: {
+    username: {
       type: String,
       default: "",
     },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index f7421f2..be85cf1 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -15,13 +15,13 @@ import { title, tokenName } from "@/config/settings";
 
 const state = {
   accessToken: getAccessToken(),
-  userName: "",
+  username: "",
   avatar: "",
   permissions: [],
 };
 const getters = {
   accessToken: (state) => state.accessToken,
-  userName: (state) => state.userName,
+  username: (state) => state.username,
   avatar: (state) => state.avatar,
   permissions: (state) => state.permissions,
 };
@@ -30,8 +30,8 @@ const mutations = {
     state.accessToken = accessToken;
     setAccessToken(accessToken);
   },
-  setUserName(state, userName) {
-    state.userName = userName;
+  setusername(state, username) {
+    state.username = username;
   },
   setAvatar(state, avatar) {
     state.avatar = avatar;
@@ -74,10 +74,10 @@ const actions = {
       Vue.prototype.$baseMessage("验证失败，请重新登录...", "error");
       return false;
     }
-    let { permissions, userName, avatar } = data;
-    if (permissions && userName) {
+    let { permissions, username, avatar } = data;
+    if (permissions && username) {
       commit("setPermissions", permissions);
-      commit("setUserName", userName);
+      commit("setusername", username);
       commit("setAvatar", avatar);
       return permissions;
     } else {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 628b939..c78daa3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -23,12 +23,12 @@
             hello !
           </div>
           <div class="title-tips">欢迎来到{{ title }}！</div>
-          <el-form-item style="margin-top: 40px;" prop="userName">
+          <el-form-item style="margin-top: 40px;" prop="username">
             <span class="svg-container svg-container-admin">
               <vab-icon :icon="['fas', 'user']" />
             </span>
             <el-input
-              v-model.trim="form.userName"
+              v-model.trim="form.username"
               v-focus
               placeholder="请输入用户名"
               tabindex="1"
@@ -88,7 +88,7 @@ export default {
     },
   },
   data() {
-    const validateUserName = (rule, value, callback) => {
+    const validateusername = (rule, value, callback) => {
       if ("" == value) {
         callback(new Error("用户名不能为空"));
       } else {
@@ -106,15 +106,15 @@ export default {
       nodeEnv: process.env.NODE_ENV,
       title: this.$baseTitle,
       form: {
-        userName: "",
+        username: "",
         password: "",
       },
       rules: {
-        userName: [
+        username: [
           {
             required: true,
             trigger: "blur",
-            validator: validateUserName,
+            validator: validateusername,
           },
         ],
         password: [
@@ -140,7 +140,7 @@ export default {
   },
   mounted() {
     if ("production" !== process.env.NODE_ENV) {
-      this.form.userName = "admin";
+      this.form.username = "admin";
       this.form.password = "123456";
     }
   },
diff --git a/src/views/personnelManagement/userManagement/components/UserManagementEdit.vue b/src/views/personnelManagement/userManagement/components/UserManagementEdit.vue
index 8afa766..b1bdfb7 100644
--- a/src/views/personnelManagement/userManagement/components/UserManagementEdit.vue
+++ b/src/views/personnelManagement/userManagement/components/UserManagementEdit.vue
@@ -6,8 +6,8 @@
     @close="close"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="用户名" prop="userName">
-        <el-input v-model.trim="form.userName" autocomplete="off"></el-input>
+      <el-form-item label="用户名" prop="username">
+        <el-input v-model.trim="form.username" autocomplete="off"></el-input>
       </el-form-item>
       <el-form-item label="密码" prop="password">
         <el-input
@@ -41,13 +41,13 @@ export default {
   data() {
     return {
       form: {
-        userName: "",
+        username: "",
         password: "",
         email: "",
         permissions: [],
       },
       rules: {
-        userName: [
+        username: [
           { required: true, trigger: "blur", message: "请输入用户名" },
         ],
         password: [{ required: true, trigger: "blur", message: "请输入密码" }],
diff --git a/src/views/personnelManagement/userManagement/index.vue b/src/views/personnelManagement/userManagement/index.vue
index 8dd6a54..f803db6 100644
--- a/src/views/personnelManagement/userManagement/index.vue
+++ b/src/views/personnelManagement/userManagement/index.vue
@@ -13,7 +13,7 @@
         <el-form :inline="true" :model="queryForm" @submit.native.prevent>
           <el-form-item>
             <el-input
-              v-model.trim="queryForm.userName"
+              v-model.trim="queryForm.username"
               placeholder="请输入用户名"
               clearable
             />
@@ -41,7 +41,7 @@
       ></el-table-column>
       <el-table-column
         show-overflow-tooltip
-        prop="userName"
+        prop="username"
         label="用户名"
       ></el-table-column>
       <el-table-column
@@ -111,7 +111,7 @@ export default {
       queryForm: {
         pageNo: 1,
         pageSize: 10,
-        userName: "",
+        username: "",
       },
     };
   },
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index cfc1994..c33a9c5 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -19,9 +19,9 @@
           :rules="registerRules"
           size="mini"
         >
-          <el-form-item prop="userName">
+          <el-form-item prop="username">
             <el-input
-              v-model.trim="form.userName"
+              v-model.trim="form.username"
               v-focus
               style="margin-top: 20px;"
               type="text"
@@ -91,7 +91,7 @@
 import { isPassword, isPhone } from "@/utils/validate";
 import { register } from "@/api/user";
 export default {
-  userName: "Register",
+  username: "Register",
   directives: {
     focus: {
       inserted(el) {
@@ -100,7 +100,7 @@ export default {
     },
   },
   data() {
-    const validateUserName = (rule, value, callback) => {
+    const validateusername = (rule, value, callback) => {
       if ("" == value) {
         callback(new Error("用户名不能为空"));
       } else {
@@ -130,10 +130,10 @@ export default {
       title: this.$baseTitle,
       form: {},
       registerRules: {
-        userName: [
+        username: [
           { required: true, trigger: "blur", message: "请输入用户名" },
           { max: 20, trigger: "blur", message: "最多不能超过20个字" },
-          { validator: validateUserName, trigger: "blur" },
+          { validator: validateusername, trigger: "blur" },
         ],
         phone: [
           { required: true, trigger: "blur", message: "请输入手机号码" },
@@ -177,7 +177,7 @@ export default {
       this.$refs["registerForm"].validate(async (valid) => {
         if (valid) {
           const param = {
-            userName: this.form.userName,
+            username: this.form.username,
             phone: this.form.phone,
             password: this.form.password,
             phoneCode: this.form.phoneCode,
diff --git a/src/views/vab/permissions/index.vue b/src/views/vab/permissions/index.vue
index d0d7379..ba87dbf 100644
--- a/src/views/vab/permissions/index.vue
+++ b/src/views/vab/permissions/index.vue
@@ -140,7 +140,7 @@ export default {
   },
   computed: {
     ...mapGetters({
-      userName: "user/userName",
+      username: "user/username",
       permissions: "user/permissions",
     }),
   },
@@ -148,7 +148,7 @@ export default {
     this.fetchData();
   },
   mounted() {
-    this.form.account = this.userName;
+    this.form.account = this.username;
   },
   methods: {
     handleChangePermission() {