Merge branch 'dev' of http://110.42.96.65:19890/GoCo/OL-LearnPlatform-Backend into dev
merge
This commit is contained in:
commit
50e127c505
@ -2,10 +2,10 @@
|
|||||||
VITE_PORT = 3100
|
VITE_PORT = 3100
|
||||||
|
|
||||||
# 网站标题
|
# 网站标题
|
||||||
VITE_GLOB_APP_TITLE = JeecgBoot 企业级低代码平台
|
VITE_GLOB_APP_TITLE = 云岭智教管理后台
|
||||||
|
|
||||||
# 简称,此变量只能是字符/下划线
|
# 简称,此变量只能是字符/下划线
|
||||||
VITE_GLOB_APP_SHORT_NAME = JeecgBoot_Pro
|
VITE_GLOB_APP_SHORT_NAME = 云岭智教
|
||||||
|
|
||||||
# 单点登录服务端地址
|
# 单点登录服务端地址
|
||||||
VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
|
VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
|
||||||
|
@ -157,7 +157,7 @@
|
|||||||
</style>
|
</style>
|
||||||
<div class="app-loading">
|
<div class="app-loading">
|
||||||
<div class="app-loading-wrap">
|
<div class="app-loading-wrap">
|
||||||
<img src="<%= basePublicPath %>/resource/img/logo.png" class="app-loading-logo" alt="Logo" />
|
<img src="<%= basePublicPath %>/logo.png" class="app-loading-logo" alt="Logo" />
|
||||||
<div class="app-loading-dots">
|
<div class="app-loading-dots">
|
||||||
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
|
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
|
||||||
</div>
|
</div>
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 54 KiB |
@ -4,7 +4,7 @@
|
|||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<div class="anticon" :class="getAppLogoClass" @click="goHome">
|
<div class="anticon" :class="getAppLogoClass" @click="goHome">
|
||||||
<img src="../../../assets/images/logo.png" />
|
<img src="/logo.png" />
|
||||||
<div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
|
<div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
|
||||||
{{ shortTitle }}
|
{{ shortTitle }}
|
||||||
</div>
|
</div>
|
||||||
@ -60,7 +60,8 @@
|
|||||||
.@{prefix-cls} {
|
.@{prefix-cls} {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding-left: 7px;
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: all 0.2s ease;
|
transition: all 0.2s ease;
|
||||||
//左侧菜单模式和左侧菜单混合模式加渐变背景色
|
//左侧菜单模式和左侧菜单混合模式加渐变背景色
|
||||||
@ -72,7 +73,8 @@
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
&.collapsed-show-title {
|
&.collapsed-show-title {
|
||||||
padding-left: 20px;
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.light &__title {
|
&.light &__title {
|
||||||
|
@ -162,8 +162,9 @@
|
|||||||
import MiniForgotpad from './MiniForgotpad.vue';
|
import MiniForgotpad from './MiniForgotpad.vue';
|
||||||
import MiniRegister from './MiniRegister.vue';
|
import MiniRegister from './MiniRegister.vue';
|
||||||
import MiniCodelogin from './MiniCodelogin.vue';
|
import MiniCodelogin from './MiniCodelogin.vue';
|
||||||
import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
|
// 使用public目录下的logo.png替换原来的两张图片
|
||||||
import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
|
const logoImg = '/logo.png';
|
||||||
|
const adTextImg = '/logo.png';
|
||||||
import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
|
import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
|
||||||
import { useLocaleStore } from '/@/store/modules/locale';
|
import { useLocaleStore } from '/@/store/modules/locale';
|
||||||
import { useDesign } from "/@/hooks/web/useDesign";
|
import { useDesign } from "/@/hooks/web/useDesign";
|
||||||
@ -487,6 +488,25 @@
|
|||||||
.top-3{
|
.top-3{
|
||||||
top: 0.45rem;
|
top: 0.45rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 让aui-image-text中的图片居中展示 */
|
||||||
|
.aui-image-text {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.aui-image-text img {
|
||||||
|
max-width: 100%;
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 将logo.png缩小一半 */
|
||||||
|
.aui-logo img, .aui-phone-logo img, .aui-image-text img {
|
||||||
|
width: 50%;
|
||||||
|
height: 50%;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style lang="less">
|
<style lang="less">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user