Update logo及首页调整

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/amActivity/service/impl/AmActivityApplyServiceImpl.java

@@ -108,6 +108,7 @@ public class AmActivityApplyServiceImpl implements IAmActivityApplyService {
         lqw.eq(bo.getAuditUser() != null, AmActivityApply::getAuditUser, bo.getAuditUser());
         lqw.eq(bo.getAuditTime() != null, AmActivityApply::getAuditTime, bo.getAuditTime());
         lqw.eq(bo.getCost() != null, AmActivityApply::getCost, bo.getCost());
+        lqw.eq(bo.getIsAttend() != null, AmActivityApply::getIsAttend, bo.getIsAttend());
         lqw.eq(StringUtils.isNotBlank(bo.getCostStatus()), AmActivityApply::getCostStatus, bo.getCostStatus());
         lqw.eq(bo.getCostAuditUser() != null, AmActivityApply::getCostAuditUser, bo.getCostAuditUser());
         lqw.eq(bo.getCostTime() != null, AmActivityApply::getCostTime, bo.getCostTime());

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/system/controller/system/SysMenuController.java

@@ -38,6 +38,7 @@ public class SysMenuController extends BaseController {
     @SaCheckPermission(PermissionName.SystemMenu)
     @GetMapping("/list")
     public R<List<SysMenu>> list(SysMenu menu) {
+
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
         return R.ok(menus);
     }

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/system/mapper/SysMenuMapper.java

@@ -75,6 +75,7 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, Sy
         LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<SysMenu>()
                 .in(SysMenu::getMenuType, UserConstants.TYPE_DIR, UserConstants.TYPE_MENU)
                 .eq(SysMenu::getStatus, UserConstants.MENU_NORMAL)
+                .eq(SysMenu::getVisible, "0")
                 .orderByAsc(SysMenu::getParentId)
                 .orderByAsc(SysMenu::getOrderNum);
         return this.selectList(lqw);

SERVER/YanZhongXYH/xyh-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -79,6 +79,7 @@
                  left join sys_user u on sur.user_id = u.user_id
         where u.user_id = #{userId}
           and m.menu_type in ('M', 'C')
+          and m.visible = '0'
           and m.status = '0'
           and ro.status = '0'
         order by m.parent_id, m.order_num

UI/XYH.VUE/index.html

@@ -24,8 +24,9 @@
 		</script>
 		<div id="app"></div>
 		<div id="splash-screen" class="splash-screen">
-			<img src="/media/logos/logo-dark.svg" class="dark-logo" alt="Vap dark logo" />
-			<img src="/media/logos/logo.svg" class="light-logo" alt="Vap light logo" />
+			<!-- <img src="/media/logos/logo-dark.svg" class="dark-logo" alt="Vap dark logo" />
+			<img src="/media/logos/logo.svg" class="light-logo" alt="Vap light logo" /> -->
+			<img src="/media/logos/logo.png" class="light-logo" alt="Vap light logo" />
 			<span>加载中 ...</span>
 		</div>
 		<script type="module" src="/src/main.ts"></script>

UI/XYH.VUE/src/layouts/main/sidebar/_SidebarLogo.vue

@@ -35,10 +35,10 @@ onMounted(() => {
 </script>
 
 <template>
-	<div class="app-sidebar-logo px-6 justify-content-center" id="vb_app_sidebar_logo">
-		<router-link to="/">
+	<div class="app-sidebar-logo px-6 justify-content-start" id="vb_app_sidebar_logo">
+		<router-link to="/" class="d-flex align-items-center">
 			<transition-group name="vb-fade">
-				<img
+				<!-- <img
 					v-if="layout === 'dark-sidebar' || (themeMode === 'dark' && layout === 'light-sidebar')"
 					alt="Logo"
 					:src="getAssetPath('media/logos/logo-dark.svg')"
@@ -54,6 +54,28 @@ onMounted(() => {
 					alt="Logo"
 					:src="getAssetPath('media/logos/logo-small.svg')"
 					class="h-35px app-sidebar-logo-minimize"
+					key="vb_app_sidebar_logo_min" /> -->
+				<img
+					v-if="layout === 'dark-sidebar' || (themeMode === 'dark' && layout === 'light-sidebar')"
+					alt="Logo"
+					:src="getAssetPath('media/logos/logo.png')"
+					class="h-55px app-sidebar-logo-default"
+					key="vb_app_sidebar_logo_dark" />
+				<img
+					v-if="themeMode === 'light' && layout === 'light-sidebar'"
+					alt="Logo"
+					:src="getAssetPath('media/logos/logo.png')"
+					class="h-55px app-sidebar-logo-default"
+					key="vb_app_sidebar_logo" />
+				<span
+					class="app-sidebar-logo-default ms-5 fs-1 text-white fw-bold"
+					style="letter-spacing: 2px">
+					盐中校友会
+				</span>
+				<img
+					alt="Logo"
+					:src="getAssetPath('media/logos/logo-small.png')"
+					class="h-35px app-sidebar-logo-minimize"
 					key="vb_app_sidebar_logo_min" />
 			</transition-group>
 		</router-link>

UI/XYH.VUE/src/views/home.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const name = ref("中科轼峰")
+const name = ref("盐中校友会")
 onMounted(() => {
 	document.querySelector("body")?.classList.add("is-home")
 })