Skip to content

V
vipSupplier
Commit 8104504a by 初志鑫
Options

修改userName为username

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