From fb18eb807b3dbfacbd3b96087218f7f4f44509a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sun, 22 Sep 2024 00:18:57 +0800
Subject: [PATCH] DIIA

---
 .env.development                      |   4 +-
 src/api/cms/website/model/index.ts    |   2 +
 src/layout/index.vue                  | 156 --------------------------
 src/store/modules/tenant.ts           |   7 +-
 src/views/about/components/detail.vue |   1 -
 src/views/index/index.vue             |  14 ++-
 6 files changed, 18 insertions(+), 166 deletions(-)

diff --git a/.env.development b/.env.development
index a5953b5..c53d4ea 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
-VITE_API_URL=https://modules.gxwebsoft.com/api
+#VITE_API_URL=https://modules.gxwebsoft.com/api
 
-#VITE_API_URL=http://127.0.0.1:9001/api
+VITE_API_URL=http://127.0.0.1:9001/api
 #VITE_SOCKET_URL=ws://localhost:9191
 #VITE_API_URL=http://103.233.255.195:9300/api
diff --git a/src/api/cms/website/model/index.ts b/src/api/cms/website/model/index.ts
index eb44703..4c9f252 100644
--- a/src/api/cms/website/model/index.ts
+++ b/src/api/cms/website/model/index.ts
@@ -53,6 +53,8 @@ export interface Website {
   tenantId?: number;
   tenantName?: string;
   navigations?: Navigation[];
+  topNavs?: Navigation[];
+  bottomNavs?: Navigation[];
   categoryList?: ArrangeCategory[];
   links?: Link[];
   // 配置信息
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 1d73243..2260023 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -4,164 +4,8 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref } from 'vue';
-  import { useRouter } from 'vue-router';
-  import { storeToRefs } from 'pinia';
-  import { useI18n } from 'vue-i18n';
-  import { message } from 'ant-design-vue';
-  import {toggleFullscreen, isFullscreen} from 'ele-admin-pro';
-  import { useTenantStore } from '@/store/modules/tenant';
-  import { useThemeStore } from '@/store/modules/theme';
   import RouterLayout from '@/components/RouterLayout/index.vue';
-  import {
-    HIDE_SIDEBARS,
-    HIDE_FOOTERS,
-    REPEATABLE_TABS,
-    HOME_TITLE,
-    HOME_PATH,
-    LAYOUT_PATH,
-    REDIRECT_PATH,
-    I18N_ENABLE
-  } from '@/config/setting';
-  import {
-    addPageTab,
-    removePageTab,
-    removeAllPageTab,
-    removeLeftPageTab,
-    removeRightPageTab,
-    removeOtherPageTab,
-    reloadPageTab,
-    setHomeComponents
-  } from '@/utils/page-tab-util';
-  import type { TabCtxMenuOption } from 'ele-admin-pro/es/ele-pro-layout/types';
-  import {useUserStore} from "@/store/modules/user";
 
-  const { push } = useRouter();
-  const { t, locale } = useI18n();
-  const tenantStore = useTenantStore();
-  const themeStore = useThemeStore();
-  const userStore = useUserStore();
-  // 租户信息
-  const { menus } = storeToRefs(userStore);
-  const { siteInfo } = storeToRefs(tenantStore);
-  console.log(siteInfo.value.websiteName,'siteInfo.')
-  // 网站名称
-  const projectName = siteInfo.value?.websiteName || '网站名称';
-  // 网站LOGO
-  const logoPath =
-      siteInfo.value?.websiteLogo || 'https://www.gxwebsoft.com/ws-logo.svg';
-  // 是否全屏
-  const fullscreen = ref(false);
-  // 布局风格
-  const {
-    tabs,
-    collapse,
-    sideNavCollapse,
-    bodyFullscreen,
-    showTabs,
-    showFooter,
-    headStyle,
-    sideStyle,
-    layoutStyle,
-    sideMenuStyle,
-    tabStyle,
-    fixedHeader,
-    fixedSidebar,
-    fixedBody,
-    bodyFull,
-    logoAutoSize,
-    colorfulIcon,
-    sideUniqueOpen,
-    styleResponsive
-  } = storeToRefs(themeStore);
-
-  /* 侧栏折叠切换 */
-  const updateCollapse = (value: boolean) => {
-    themeStore.setCollapse(value);
-  };
-
-  /* 双侧栏一级折叠切换 */
-  const updateSideNavCollapse = (value: boolean) => {
-    themeStore.setSideNavCollapse(value);
-  };
-
-  /* 内容区域全屏切换 */
-  const updateBodyFullscreen = (value: boolean) => {
-    themeStore.setBodyFullscreen(value);
-  };
-
-  /* logo 点击事件 */
-  const onLogoClick = (isHome: boolean) => {
-    isHome || push(LAYOUT_PATH);
-  };
-
-  /* 监听屏幕尺寸改变 */
-  const screenSizeChange = () => {
-    themeStore.updateScreenSize();
-    fullscreen.value = isFullscreen();
-  };
-
-  /* 全屏切换 */
-  const onFullscreen = () => {
-    try {
-      fullscreen.value = toggleFullscreen();
-    } catch (e) {
-      message.error('您的浏览器不支持全屏模式');
-    }
-  };
-
-  /* 页签右键菜单点击事件 */
-  const onTabContextMenu = ({
-    key,
-    tabKey,
-    item,
-    active
-  }: TabCtxMenuOption) => {
-    switch (key) {
-      case 'reload': // 刷新
-        reloadPageTab({
-          isHome: !item,
-          fullPath: item?.fullPath ?? tabKey
-        });
-        break;
-      case 'close': // 关闭当前
-        removePageTab({
-          key: item?.fullPath ?? tabKey,
-          active
-        });
-        break;
-      case 'left': // 关闭左侧
-        removeLeftPageTab({
-          key: tabKey,
-          active
-        });
-        break;
-      case 'right': // 关闭右侧
-        removeRightPageTab({
-          key: tabKey,
-          active
-        });
-        break;
-      case 'other': // 关闭其他
-        removeOtherPageTab({
-          key: tabKey,
-          active
-        });
-        break;
-    }
-  };
-
-  /* 菜单标题国际化 */
-  const i18n = (_path: string, key?: string) => {
-    if (!I18N_ENABLE || !key) {
-      return;
-    }
-    const k = 'route.' + key + '._name';
-    const title = t(k);
-    if (title !== k) {
-      return title;
-    }
-  };
 </script>
 
 <script lang="ts">
diff --git a/src/store/modules/tenant.ts b/src/store/modules/tenant.ts
index 1aef834..cab0e6c 100644
--- a/src/store/modules/tenant.ts
+++ b/src/store/modules/tenant.ts
@@ -43,8 +43,8 @@ export const useTenantStore = defineStore({
       if (!siteInfo) {
         return {};
       }
-      const { navigations,config } = siteInfo;
       this.siteInfo = siteInfo;
+      const { topNavs,config } = siteInfo;
       localStorage.setItem('tenantId', String(siteInfo.tenantId));
       localStorage.setItem('tenantName', String(siteInfo.websiteName));
       // 缓存配置
@@ -55,7 +55,7 @@ export const useTenantStore = defineStore({
       // 用户菜单, 过滤掉按钮类型并转为 children 形式
       const { menus, homePath } = formatMenus(
           toTreeData({
-            data: navigations?.filter(d => d.position != 2).map((d) => {
+            data: topNavs?.filter(d => d.position != 2).map((d) => {
               if(d.parentId == 0 && d.type == 0 && d.path != '/'){
                 d.path = '/' + d.navigationId;
               }
@@ -71,9 +71,10 @@ export const useTenantStore = defineStore({
           })
       );
       this.menus = menus;
+      console.log(menus)
       // 处理底部链接
       this.subMenu = toTreeData({
-        data: navigations?.filter(d => d.position != 1).map((d) => {
+        data: topNavs?.filter(d => d.position != 1).map((d) => {
           return { ...d, key: d.navigationId, value: d.navigationId };
         }),
         idField: 'navigationId',
diff --git a/src/views/about/components/detail.vue b/src/views/about/components/detail.vue
index 81aeefc..63a4128 100644
--- a/src/views/about/components/detail.vue
+++ b/src/views/about/components/detail.vue
@@ -46,7 +46,6 @@ const { form,assignFields } = useFormData<Design>({
 
 const reload = () => {
   getNavigationByPath({path: pagePath.value}).then(data => {
-    console.log(data)
     if (data.design) {
       assignFields((data.design));
     }
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index c4a5d59..859b392 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -246,8 +246,8 @@
           </template>
           <div  class="ele-cell" style="
   display: flex;
-  justify-content: space-between;" :class="screenWidth > 567 ? 'hidden-sm-and-down' : 'hidden-sm-and-up'" v-if="siteInfo">
-            <div class="item-img" v-for="(item,index) in siteInfo.links" :key="index">
+  justify-content: space-between;" :class="screenWidth > 567 ? 'hidden-sm-and-down' : 'hidden-sm-and-up'" v-if="links">
+            <div class="item-img" v-for="(item,index) in links" :key="index">
               <a-image v-if="item.name == 'IEEE'" :src="item.icon" :preview="false" style="width: 240px;"></a-image>
               <a-image v-else :src="item.icon" :preview="false" style="width: 150px;"></a-image>
             </div>
@@ -269,11 +269,13 @@
   import {listArticle} from "@/api/cms/article";
   import {Article} from "@/api/cms/article/model";
   import {ref} from "vue";
-  import * as url from "url";
+  import {listLink} from "@/api/link";
+  import {Link} from "@/api/link/model";
 
+  const links = ref<Link[]>()
 
   const themeStore = useThemeStore();
-  const { screenWidth, styleResponsive } = storeToRefs(themeStore);
+  const { screenWidth } = storeToRefs(themeStore);
 
   const tenantStore = useTenantStore();
   const { siteInfo } = storeToRefs(tenantStore);
@@ -284,6 +286,10 @@
     article159.value = data
   })
 
+  listLink().then(data => {
+    links.value = data;
+  })
+
   const openUrl = (url: string) => {
     window.open(url);
   }