From 82892af0b74f02df34eb2f9833da0d4c373e59b8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 23:11:15 +0800
Subject: [PATCH] 家庭号可以重复了
---
ruoyi-ui/src/api/login.js | 2 +-
ruoyi-ui/vue.config.js | 2 +-
ruoyi-ui/src/views/system/family/index.vue | 5 ++++-
ruoyi-ui/src/views/login.vue | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 3363f05..ef64053 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -2,7 +2,7 @@
// 鐧诲綍鏂规硶
export function login(nickname, password, code, uuid) {
- alert(nickname)
+
const data = {
nickname,
password,
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 6923687..e27dce1 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -366,7 +366,7 @@
Cookies.remove("password");
Cookies.remove('rememberMe');
}
- alert(this.loginForm.nickName)
+ // 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 d3738a0..300cdf8 100644
--- a/ruoyi-ui/src/views/system/family/index.vue
+++ b/ruoyi-ui/src/views/system/family/index.vue
@@ -207,7 +207,8 @@
id: undefined,
name: undefined,
mid: undefined,
- fid: undefined
+ fid: undefined,
+ clanId: undefined
},
defaultProps: {
children: "children",
@@ -486,6 +487,8 @@
/** 鎻愪氦鎸夐挳 */
submitForm: function() {
let _this = this
+ let clanId = this.$store.state.user.clanId
+ this.form.clanId = clanId
this.$refs["form"].validate(valid => {
if (valid) {
// alert(this.form.id)
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 12eaf95..ff976d1 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,7 +37,7 @@
// 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://192.168.1.3:8080/`,
+ // target: `https://192.168.1.3:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1