From be4c17512fe93511c21939d594c843b9594b1549 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 22:51:39 +0800
Subject: [PATCH] 修改成昵称登录了
---
ruoyi-ui/src/store/modules/user.js | 4 ++--
ruoyi-ui/src/api/login.js | 5 +++--
ruoyi-ui/vue.config.js | 4 ++--
ruoyi-ui/src/views/system/family/index.vue | 3 ++-
ruoyi-ui/src/views/system/user/index.vue | 8 ++++----
ruoyi-ui/src/api/system/family.js | 4 ++--
ruoyi-ui/src/views/login.vue | 29 +++++++++++++++--------------
7 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index a08507b..3363f05 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -1,9 +1,10 @@
import request from '@/utils/request'
// 鐧诲綍鏂规硶
-export function login(username, password, code, uuid) {
+export function login(nickname, password, code, uuid) {
+ alert(nickname)
const data = {
- username,
+ nickname,
password,
code,
uuid
diff --git a/ruoyi-ui/src/api/system/family.js b/ruoyi-ui/src/api/system/family.js
index 58b52f2..0ab2dc1 100644
--- a/ruoyi-ui/src/api/system/family.js
+++ b/ruoyi-ui/src/api/system/family.js
@@ -27,9 +27,9 @@
data:data
})
}
-export function findByFname(name){
+export function findByFname(name, clanId){
return request({
- url:'/family/findByFname/'+name,
+ url:'/family/findByFname/'+name+"/"+clanId,
method: 'get',
})
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 7428be4..045498d 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -36,7 +36,7 @@
// 鐧诲綍
Login({ commit }, userInfo) {
- const username = userInfo.username.trim()
+ const nickname = userInfo.nickName.trim()
const password = userInfo.password
const code = userInfo.code
@@ -44,7 +44,7 @@
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
+ login(nickname, password, code, uuid).then(res => {
setToken(res.data.token)
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 0e1fd66..6923687 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -37,9 +37,9 @@
</div></div>
<div class="yonghuming" style="">鐢ㄦ埛鍚�</div>
- <el-form-item prop="username" style="width: 380px; height: 48px; ">
+ <el-form-item prop="nickName" style="width: 380px; height: 48px; ">
<el-input
- v-model="loginForm.username"
+ v-model="loginForm.nickName"
type="text"
auto-complete="off"
placeholder="璇疯緭鍏ョ敤鎴峰悕"
@@ -150,8 +150,8 @@
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">鏂扮敤鎴锋敞鍐�</h3>
- <el-form-item prop="username">
- <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
+ <el-form-item prop="nickName">
+ <el-input v-model="registerForm.nickName" type="text" auto-complete="off" placeholder="璐﹀彿">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
@@ -242,14 +242,14 @@
loginForm: {
// username: "admin",
// password: "admin123",
- username: "",
+ nickName: "",
password: "",
rememberMe: false,
code: "",
uuid: ""
},
loginRules: {
- username: [
+ nickName: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" }
],
password: [
@@ -268,14 +268,14 @@
registerForm: {
- username: "",
+ nickName: "",
password: "",
confirmPassword: "",
code: "",
uuid: ""
},
registerRules: {
- username: [
+ nickName: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
{ min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
],
@@ -310,8 +310,8 @@
if (valid) {
this.loading = true;
register(this.registerForm).then(res => {
- const username = this.registerForm.username;
- this.$alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + username + " 娉ㄥ唽鎴愬姛锛�</font>", '绯荤粺鎻愮ず', {
+ const nickName = this.registerForm.nickName;
+ this.$alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + nickName + " 娉ㄥ唽鎴愬姛锛�</font>", '绯荤粺鎻愮ず', {
dangerouslyUseHTMLString: true,
type: 'success'
}).then(() => {
@@ -344,11 +344,11 @@
});
},
getCookie() {
- const username = Cookies.get("username");
+ const nickName = Cookies.get("nickName");
const password = Cookies.get("password");
const rememberMe = Cookies.get('rememberMe')
this.loginForm = {
- username: username === undefined ? this.loginForm.username : username,
+ nickName: nickName === undefined ? this.loginForm.nickName : nickName,
password: password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
};
@@ -358,14 +358,15 @@
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
- Cookies.set("username", this.loginForm.username, { expires: 30 });
+ Cookies.set("nickName", this.loginForm.nickName, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
} else {
- Cookies.remove("username");
+ Cookies.remove("nickName");
Cookies.remove("password");
Cookies.remove('rememberMe');
}
+ alert(this.loginForm.nickName)
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
diff --git a/ruoyi-ui/src/views/system/family/index.vue b/ruoyi-ui/src/views/system/family/index.vue
index 1d5db73..d3738a0 100644
--- a/ruoyi-ui/src/views/system/family/index.vue
+++ b/ruoyi-ui/src/views/system/family/index.vue
@@ -233,8 +233,9 @@
methods: {
chongf(){
//alert(2)
+ let clanId = this.$store.state.user.clanId
if(this.form.name!=""){
- findByFname(this.form.name).then(response => {
+ findByFname(this.form.name, clanId).then(response => {
console.log(response.data)
// alert(response.data!=null)
if(response.data!=null)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 89eccb6..9d6c767 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -183,13 +183,13 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
- <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
- <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
+ <el-form-item label="鐢ㄦ埛鍚嶇О" prop="nickName">
+ <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
+ <el-form-item label="鐢ㄦ埛濮撳悕" prop="userName">
+ <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰鍚�" maxlength="30" />
</el-form-item>
</el-col>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 493ca4b..12eaf95 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,8 +37,8 @@
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://10.39.18.174:8080/`,
- target: `https://10.39.18.174:8080/`,
- // target: 'https://www.bendudu.com:8080/',
+ // target: `https://192.168.1.3:8080/`,
+ target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.1