cxc/yg-point-mall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove tenant

Browse Source
This commit is contained in:
quantulr
2023-08-10 13:54:19 +08:00
parent 22a9b5696c
commit 4d928cb019
4 changed files with 70 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/login_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 58 KiB

6
src/plugins/download.js
View File

@ -22,7 +22,7 @@ export default {
responseType: "blob", responseType: "blob",
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
tenant: useUserStore().tenant, // tenant: useUserStore().tenant,
}, },
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);
@ -45,7 +45,7 @@ export default {
responseType: "blob", responseType: "blob",
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
tenant: useUserStore().tenant, // tenant: useUserStore().tenant,
}, },
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);
@ -65,7 +65,7 @@ export default {
responseType: "blob", responseType: "blob",
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
tenant: useUserStore().tenant, // tenant: useUserStore().tenant,
}, },
}).then((res) => { }).then((res) => {
const isBlob = blobValidate(res.data); const isBlob = blobValidate(res.data);

8
src/utils/request.js
View File

@ -35,13 +35,13 @@ service.interceptors.request.use(
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
} }
// if (useUserStore().tenant) {
if (config.url === "/captchaImage") { /*if (config.url === "/captchaImage") {
config.headers["tenant"] = useUserStore().tempTenant; config.headers["tenant"] = useUserStore().tempTenant;
} else { } else {
config.headers["tenant"] = useUserStore().tenant; config.headers["tenant"] = useUserStore().tenant;
} }*/
// }
// get请求映射params参数 // get请求映射params参数
if (config.method === "get" && config.params) { if (config.method === "get" && config.params) {
let url = config.url + "?" + tansParams(config.params); let url = config.url + "?" + tansParams(config.params);

177
src/views/login.vue
View File

@ -6,105 +6,84 @@
<h2 class="title">若依后台管理系统</h2> <h2 class="title">若依后台管理系统</h2>
<!-- 副标题 --> <!-- 副标题 -->
<p class="sub-title">前后端分离的后台管理系统架构</p> <p class="sub-title">前后端分离的后台管理系统架构</p>
<el-image class="banner-image" :src="loginLeftBanner" /> <el-image class="banner-image" :src="loginLeftBanner"/>
</div> </div>
<el-form <el-form
ref="loginRef" ref="loginRef"
:model="loginForm" :model="loginForm"
:rules="loginRules" :rules="loginRules"
class="login-form" class="login-form"
> >
<h3 class="title">若依后台管理系统</h3> <h3 class="title">若依后台管理系统</h3>
<el-form-item prop="tenant">
<paged-select
v-model="loginForm.tenant"
:default-label="defaultTenantNamt"
:prop="{
label: 'companyName',
value: 'tenantId',
}"
:query="{
page: 'pageNum',
size: 'pageSize',
searchKey: 'companyName',
}"
:remote-method="loadTenantOptions"
:width="350"
prefix-icon="OfficeBuilding"
size="large"
@change="handleTenantChange"
@confirm="handleTenantConfirm"
/>
</el-form-item>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
auto-complete="off" auto-complete="off"
placeholder="账号" placeholder="账号"
size="large" size="large"
type="text" type="text"
> >
<template #prefix> <template #prefix>
<svg-icon class="el-input__icon input-icon" icon-class="user" /> <svg-icon class="el-input__icon input-icon" icon-class="user"/>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input <el-input
v-model="loginForm.password" v-model="loginForm.password"
auto-complete="off" auto-complete="off"
placeholder="密码" placeholder="密码"
size="large" size="large"
type="password" type="password"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
<template #prefix> <template #prefix>
<svg-icon <svg-icon
class="el-input__icon input-icon" class="el-input__icon input-icon"
icon-class="password" icon-class="password"
/> />
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="captchaEnabled && loginForm.tenant" prop="code"> <el-form-item v-if="captchaEnabled" prop="code">
<el-input <el-input
v-model="loginForm.code" v-model="loginForm.code"
auto-complete="off" auto-complete="off"
placeholder="验证码" placeholder="验证码"
size="large" size="large"
style="width: 63%" style="width: 63%"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
<template #prefix> <template #prefix>
<svg-icon <svg-icon
class="el-input__icon input-icon" class="el-input__icon input-icon"
icon-class="validCode" icon-class="validCode"
/> />
</template> </template>
</el-input> </el-input>
<div class="login-code"> <div class="login-code">
<img :src="codeUrl" class="login-code-img" @click="getCode" /> <img :src="codeUrl" class="login-code-img" @click="getCode"/>
</div> </div>
</el-form-item> </el-form-item>
<el-checkbox <el-checkbox
v-model="loginForm.rememberMe" v-model="loginForm.rememberMe"
style="margin: 0px 0px 25px 0px" style="margin: 0px 0px 25px 0px"
>记住密码 >记住密码
</el-checkbox> </el-checkbox>
<el-form-item style="width: 100%"> <el-form-item style="width: 100%">
<el-button <el-button
:loading="loading" :loading="loading"
size="large" size="large"
style="width: 100%" style="width: 100%"
type="primary" type="primary"
@click.prevent="handleLogin" @click.prevent="handleLogin"
> >
<span v-if="!loading">登 录</span> <span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
</el-button> </el-button>
<div v-if="register" style="float: right"> <div v-if="register" style="float: right">
<router-link :to="'/register'" class="link-type" <router-link :to="'/register'" class="link-type"
>立即注册 >立即注册
</router-link> </router-link>
</div> </div>
</el-form-item> </el-form-item>
@ -120,19 +99,18 @@
<script setup> <script setup>
import loginLeftBanner from "@/assets/images/login-left-banner.png"; import loginLeftBanner from "@/assets/images/login-left-banner.png";
import { getCodeImg, getTenantNormalList } from "@/api/login"; import {getCodeImg, getTenantNormalList} from "@/api/login";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import { decrypt, encrypt } from "@/utils/jsencrypt"; import {decrypt, encrypt} from "@/utils/jsencrypt";
import useUserStore from "@/store/modules/user"; import useUserStore from "@/store/modules/user";
import PagedSelect from "@/components/InfiniteSelect"; import PagedSelect from "@/components/InfiniteSelect";
import { getCurrentInstance, ref, watchEffect } from "vue"; import {getCurrentInstance, ref, watchEffect} from "vue";
const userStore = useUserStore(); const userStore = useUserStore();
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const {proxy} = getCurrentInstance();
const loginForm = ref({ const loginForm = ref({
tenant: "",
username: "admin", username: "admin",
password: "admin123", password: "admin123",
rememberMe: false, rememberMe: false,
@ -141,12 +119,10 @@ const loginForm = ref({
}); });
const loginRules = { const loginRules = {
tenant: [{ required: true, trigger: "change", message: "请选择租户" }], username: [{required: true, trigger: "blur", message: "请输入您的账号"}],
username: [{ required: true, trigger: "blur", message: "请输入您的账号" }], password: [{required: true, trigger: "blur", message: "请输入您的密码"}],
password: [{ required: true, trigger: "blur", message: "请输入您的密码" }], code: [{required: true, trigger: "change", message: "请输入验证码"}],
code: [{ required: true, trigger: "change", message: "请输入验证码" }],
}; };
const defaultTenantNamt = ref("");
const codeUrl = ref(""); const codeUrl = ref("");
const loading = ref(false); const loading = ref(false);
// 验证码开关 // 验证码开关
@ -161,32 +137,30 @@ function handleLogin() {
loading.value = true; loading.value = true;
// 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码 // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
if (loginForm.value.rememberMe) { if (loginForm.value.rememberMe) {
Cookies.set("tenant", loginForm.value.tenant, { expires: 30 }); Cookies.set("username", loginForm.value.username, {expires: 30});
Cookies.set("username", loginForm.value.username, { expires: 30 });
Cookies.set("password", encrypt(loginForm.value.password), { Cookies.set("password", encrypt(loginForm.value.password), {
expires: 30, expires: 30,
}); });
Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 }); Cookies.set("rememberMe", loginForm.value.rememberMe, {expires: 30});
} else { } else {
// 否则移除 // 否则移除
Cookies.remove("tenant");
Cookies.remove("username"); Cookies.remove("username");
Cookies.remove("password"); Cookies.remove("password");
Cookies.remove("rememberMe"); Cookies.remove("rememberMe");
} }
// 调用action的登录方法 // 调用action的登录方法
userStore userStore
.login(loginForm.value) .login(loginForm.value)
.then(() => { .then(() => {
router.push({ path: redirect.value || "/" }); router.push({path: redirect.value || "/"});
}) })
.catch(() => { .catch(() => {
loading.value = false; loading.value = false;
// 重新获取验证码 // 重新获取验证码
if (captchaEnabled.value) { if (captchaEnabled.value) {
getCode(); getCode();
} }
}); });
} }
}); });
} }
@ -194,7 +168,7 @@ function handleLogin() {
function getCode() { function getCode() {
getCodeImg().then((res) => { getCodeImg().then((res) => {
captchaEnabled.value = captchaEnabled.value =
res.captchaEnabled === undefined ? true : res.captchaEnabled; res.captchaEnabled === undefined ? true : res.captchaEnabled;
register.value = res.register === undefined ? true : res.register; register.value = res.register === undefined ? true : res.register;
if (captchaEnabled.value) { if (captchaEnabled.value) {
codeUrl.value = "data:image/gif;base64," + res.img; codeUrl.value = "data:image/gif;base64," + res.img;
@ -210,38 +184,14 @@ function getCookie() {
loginForm.value = { loginForm.value = {
username: username === undefined ? loginForm.value.username : username, username: username === undefined ? loginForm.value.username : username,
password: password:
password === undefined ? loginForm.value.password : decrypt(password), password === undefined ? loginForm.value.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe), rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
tenant: useUserStore().tempTenant ?? "",
}; };
} }
const loadTenantOptions = (query) =>
getTenantNormalList(query).then((resp) => resp.rows);
const handleTenantChange = (value) => { getCode()
console.log(value);
if (!value) {
useUserStore().setTempTenant({
tenantId: null,
companyName: null,
});
}
// useUserStore().setTempTenant(value)
};
const handleTenantConfirm = (option) => {
useUserStore().setTempTenant(option);
};
watchEffect(() => {
console.log(loginForm.value.tenant);
if (loginForm.value.tenant) {
console.log("getcode");
getCode();
}
});
getCookie(); getCookie();
defaultTenantNamt.value = useUserStore().tempTenantName;
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -250,8 +200,7 @@ defaultTenantNamt.value = useUserStore().tempTenantName;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
background-image: url("https://php.likeadmin.cn/admin/assets/login_bg.2f630cea.png"); background-image: url("../assets/images/login_bg.png");
//background-image: url("../assets/images/login-background.jpg");
background-size: cover; background-size: cover;
} }
@ -267,7 +216,7 @@ defaultTenantNamt.value = useUserStore().tempTenantName;
display: flex; display: flex;
overflow: hidden; overflow: hidden;
box-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1), box-shadow: 0 20px 25px -5px rgb(0 0 0 / 0.1),
0 8px 10px -6px rgb(0 0 0 / 0.1); 0 8px 10px -6px rgb(0 0 0 / 0.1);
.login-banner { .login-banner {
padding: 0 20px 0; padding: 0 20px 0;