Merge branch 'dev' of http://110.42.96.65:19890/GoCo/OL-LearnPlatform-Backend into dev

merge

jeecgboot-vue3/.env

@@ -2,10 +2,10 @@
 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

jeecgboot-vue3/index.html

@@ -157,7 +157,7 @@
       </style>
       <div class="app-loading">
         <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">
             <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
           </div>

jeecgboot-vue3/src/components/Application/src/AppLogo.vue

@@ -4,7 +4,7 @@
 -->
 <template>
   <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">
       {{ shortTitle }}
     </div>
@@ -60,7 +60,8 @@
   .@{prefix-cls} {
     display: flex;
     align-items: center;
-    padding-left: 7px;
+    justify-content: center;
+    padding: 0;
     cursor: pointer;
     transition: all 0.2s ease;
     //左侧菜单模式和左侧菜单混合模式加渐变背景色
@@ -72,7 +73,8 @@
     // }
 
     &.collapsed-show-title {
-      padding-left: 20px;
+      justify-content: center;
+      padding: 0;
     }
 
     &.light &__title {

jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue

@@ -162,8 +162,9 @@
   import MiniForgotpad from './MiniForgotpad.vue';
   import MiniRegister from './MiniRegister.vue';
   import MiniCodelogin from './MiniCodelogin.vue';
-  import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
-  import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
+  // 使用public目录下的logo.png替换原来的两张图片
+  const logoImg = '/logo.png';
+  const adTextImg = '/logo.png';
   import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
   import { useLocaleStore } from '/@/store/modules/locale';
   import { useDesign } from "/@/hooks/web/useDesign";
@@ -487,6 +488,25 @@
   .top-3{
     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 lang="less">