同步6/16

src/layout/components/AppMain.vue

@@ -1,13 +1,15 @@
 <template>
   <section class="app-main">
-    <router-view v-slot="{ Component, route }" :key="$route.fullPath">
-      <transition :enter-active-class="animate" mode="out-in">
-        <keep-alive :include="tagsViewStore.cachedViews">
-          <component :is="Component" v-if="!route.meta.link" :key="route.path" />
-        </keep-alive>
-      </transition>
-    </router-view>
-    <iframe-toggle />
+    <div style="background-color: #f2f1f6; height: 100%">
+      <router-view v-slot="{ Component, route }" :key="$route.fullPath">
+        <transition :enter-active-class="animate" mode="out-in">
+          <keep-alive :include="tagsViewStore.cachedViews">
+            <component :is="Component" v-if="!route.meta.link" :key="route.path" />
+          </keep-alive>
+        </transition>
+      </router-view>
+      <iframe-toggle />
+    </div>
   </section>
 </template>
 
@@ -54,13 +56,14 @@ function addIframe() {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  // min-height: calc(100vh - 50px);
   flex: 1;
   width: 100%;
   position: relative;
   overflow: hidden;
   overflow-y: auto;
   background-color: #f2f1f6;
+  background-color: #dfedff;
 }
 
 .fixed-header + .app-main {

src/layout/components/Navbar.vue

@@ -13,7 +13,7 @@
       <template v-if="appStore.device !== 'mobile'">
         <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
           <div>
-            <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
+            <el-popover placement="bottom-end" trigger="click" transition="el-zoom-in-top" :width="400" :persistent="false">
               <template #reference>
                 <el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">
                   <div class="right-menu-item hover-effect" style="display: block"><svg-icon icon-class="message" /></div>
@@ -37,7 +37,7 @@
               <el-dropdown-item divided command="changecommunity">
                 <span>{{ proxy.$t('navbar.community') }}</span>
               </el-dropdown-item>
-              <router-link to="/user/profile">
+              <router-link to="/system/user/profile">
                 <el-dropdown-item>{{ proxy.$t('navbar.personalCenter') }}</el-dropdown-item>
               </router-link>
               <el-dropdown-item divided command="logout">
@@ -67,7 +67,6 @@ const props = defineProps({
     default: true
   }
 });
-console.log(props.Showhamburger);
 
 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -160,6 +159,7 @@ watch(
   overflow: hidden;
   position: relative;
   background: #dfedff;
+  background: transparent;
   border-bottom: 1px solid #dfedff;
 
   color: #c0c4cc;
@@ -233,6 +233,7 @@ watch(
 
       .avatar-wrapper {
         margin-top: 5px;
+        // margin-left: 20px;
         position: relative;
 
         .user-avatar {

src/layout/components/Sidebar/index.vue

@@ -50,7 +50,8 @@ const activeMenu = computed(() => {
   }
   return path;
 });
-const bgColor = '#eaf2ff';
+// const bgColor = '#eaf2ff';
+const bgColor = '#dfedff';
 // const bgColor = computed(() => (sideTheme.value === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground));
 const textColor = computed(() => (sideTheme.value === 'theme-dark' ? variables.menuColor : variables.menuLightColor));
 </script>

src/layout/components/notice/index.vue

@@ -19,13 +19,14 @@
       </template>
       <el-empty v-else :description="'消息为空'"></el-empty>
     </div>
-    <div v-if="newsList.length > 0" class="foot-box" @click="onGoToGiteeClick">前往gitee</div>
   </div>
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUserNews">
 import { useNoticeStore } from '@/store/modules/notice';
 
+const router = useRouter();
+
 const noticeStore = useNoticeStore();
 const { readAll } = useNoticeStore();
 
@@ -48,13 +49,10 @@ const getTableData = async () => {
 //点击消息，写入已读
 const onNewsClick = (item: any) => {
   newsList.value[item].read = true;
-  //并且写入pinia
   noticeStore.state.notices = newsList.value;
-};
-
-// 前往通知中心点击
-const onGoToGiteeClick = () => {
-  window.open('https://gitee.com/dromara/RuoYi-Vue-Plus/tree/5.X/');
+  router.push({
+    path: '/system/notice'
+  });
 };
 
 onMounted(() => {
@@ -85,7 +83,8 @@ onMounted(() => {
     }
   }
   .content-box {
-    height: 300px;
+    height: 400px;
+
     overflow: auto;
     font-size: 13px;
     .content-box-item {