mirror of
https://gitee.com/chu1204505056/vue-admin-beautiful.git
synced 2025-11-04 21:32:09 +08:00
修改userName为username
This commit is contained in:
初志鑫
parent
a87740fc23
commit
8104504a7a
@ -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",
|
||||
|
||||
@ -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"],
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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: "",
|
||||
},
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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";
|
||||
}
|
||||
},
|
||||
|
||||
@ -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: "请输入密码" }],
|
||||
|
||||
@ -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: "",
|
||||
},
|
||||
};
|
||||
},
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user