From f6dd10534b94907ede0b45d83a49e066fddb3508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 22 Aug 2024 12:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/main.css       |  8 +++--
 components/AppFooter.vue  |  7 ++++-
 components/AppHeader.vue  | 26 ++++-------------
 composables/useRequest.ts |  2 +-
 ecosystem.config.cjs      |  2 +-
 nuxt.config.ts            | 22 +++++++-------
 pages/[custom]/index.vue  | 14 +++++----
 pages/plug/index.vue      | 61 ---------------------------------------
 utils/tool.ts             |  3 +-
 9 files changed, 41 insertions(+), 104 deletions(-)
 delete mode 100644 pages/plug/index.vue

diff --git a/assets/css/main.css b/assets/css/main.css
index 5cd6764..5c3f64c 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -6,8 +6,8 @@
 body {
     margin: 0;
     font-family: Inter, "Inter Fallback: Arial",ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;
-    font-size: 14px;
-    line-height: 140%;
+    font-size: 15px;
+    line-height: 1.4rem;
 }
 
 ul, li {
@@ -19,6 +19,10 @@ a {
     color: #333333;
 }
 
+a:hover{
+    color: #cf1313;
+}
+
 h1, h2, h3, h4, h5, h6 {
     font-weight: normal;
 }
diff --git a/components/AppFooter.vue b/components/AppFooter.vue
index 061a814..ec39f98 100644
--- a/components/AppFooter.vue
+++ b/components/AppFooter.vue
@@ -8,6 +8,7 @@
   <footer class="text-center py-10">
     Copyright {{ new Date().getFullYear() }} {{ config?.siteName }} Inc. All Rights Reserved.
     <a href="https://beian.miit.gov.cn/" target="_blank" class="ml-10"> 备案号：{{ config?.icpNo }}</a>
+    <a class="ml-3 cursor-pointer" @click="reload">刷新</a>
   </footer>
 </template>
 
@@ -21,10 +22,14 @@ const config = ref<Config>()
 
 // 获取数据
 const reload = async () => {
-  await nextTick()
   const { data: fields } = await useRequest<ApiResult<Config>>('/cms/website-field/config', {})
   config.value = fields.value?.data;
+  ElMessage.success('刷新成功')
 }
 
 reload();
 </script>
+
+<style lang="scss">
+
+</style>
diff --git a/components/AppHeader.vue b/components/AppHeader.vue
index ad4ee02..52f80b0 100644
--- a/components/AppHeader.vue
+++ b/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
-  <header class="header bg-black">
-    <div class="container between">
+  <header class="header bg-black fixed z-10 w-full">
+    <div class="container flex between">
       <div class="header__left flex">
         <div class="logo w-[180px] flex items-center" @click="reload">
           <nuxt-link v-if="config?.siteLogo" to="/">
@@ -10,7 +10,7 @@
               <text>{{ config?.siteName || '网宿软件' }}</text>
           </nuxt-link>
         </div>
-        <div v-if="route.path.indexOf('/user') === -1" class="hidden-sm-and-down">
+        <nav v-if="route.path.indexOf('/user') === -1" class="hidden-sm-and-down">
           <el-menu
               :default-active="currentIndex"
               mode="horizontal"
@@ -19,6 +19,7 @@
               active-text-color="#ffd04b"
               :collapse="true"
               :ellipsis="false"
+              style="border-bottom: none"
               @select="handleSelect"
           >
             <template v-for="(item, index) in navigations">
@@ -48,23 +49,7 @@
               </template>
             </el-sub-menu>
           </el-menu>
-        </div>
-<!--        <nav v-if="route.path.indexOf('/user') === -1" class="hidden-sm-and-down">-->
-<!--          <ul>-->
-<!--            <li-->
-<!--                v-for="item in navigations"-->
-<!--                :key="item.navigationId"-->
-<!--                class="relative"-->
-<!--                :class="route.path === item.path ? 'active' : ''"-->
-<!--            >-->
-<!--              <nuxt-link v-if="item.target === '_blank'" :to="item.path" target="_blank">{{ item.title }}</nuxt-link>-->
-<!--              <nuxt-link v-else :to="`${item.path}`">{{ item.title }}</nuxt-link>-->
-<!--              <div class="absolute  p-2 h-[100px]" v-if="item.children">-->
-<!--                <nuxt-link v-for="(sub,index2) in item.children" :to="`${sub.path}`">{{ sub.title }}</nuxt-link>-->
-<!--              </div>-->
-<!--            </li>-->
-<!--          </ul>-->
-<!--        </nav>-->
+        </nav>
       </div>
       <div class="header__right items-center">
         <el-input
@@ -164,4 +149,5 @@ reload();
 </script>
 
 <style lang="scss">
+
 </style>
diff --git a/composables/useRequest.ts b/composables/useRequest.ts
index 743eef5..1f25612 100644
--- a/composables/useRequest.ts
+++ b/composables/useRequest.ts
@@ -19,7 +19,7 @@ export const useRequest = <T>(url: string, opts?: UseFetchOptions<T, unknown>) =
       if (token.value) {
         options.headers.Authorization = token.value;
       }
-      options.headers.tenantid = `${TENANT_ID}`;
+      options.headers.tenantid = `5`;
     },
     onResponse({ response }) {
       if (+response.status === 0 && +response._data.code !== 0) {
diff --git a/ecosystem.config.cjs b/ecosystem.config.cjs
index 63e1ebb..7fd091e 100644
--- a/ecosystem.config.cjs
+++ b/ecosystem.config.cjs
@@ -2,7 +2,7 @@ module.exports = {
     apps: [
         {
             name: '网宿软件',
-            port: '10198',
+            port: '10123',
             exec_mode: 'cluster',
             instances: 'max',
             script: './.output/server/index.mjs'
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 5bb0e8a..37fe599 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -24,19 +24,19 @@ export default defineNuxtConfig({
         }
     },
     devServer: {
-        port: 10189
+        port: 10123
     },
 
-    nitro: {
-        devProxy: {
-            "/api": {
-                target: 'http://127.0.0.1:9001/api',
-                prependPath: true,
-                changeOrigin: true,
-            }
-
-        }
-    }
+    // nitro: {
+    //     devProxy: {
+    //         "/api": {
+    //             target: 'http://127.0.0.1:9001/api',
+    //             prependPath: true,
+    //             changeOrigin: true,
+    //         }
+    //
+    //     }
+    // }
 
     // runtimeConfig: {
     //     public: {
diff --git a/pages/[custom]/index.vue b/pages/[custom]/index.vue
index 5ae96fc..832acb2 100644
--- a/pages/[custom]/index.vue
+++ b/pages/[custom]/index.vue
@@ -2,15 +2,17 @@
   <div class="banner" v-if="form">
     <el-image :src="form.photo"></el-image>
   </div>
-  <div v-if="form" class="container flex flex-col w-[1280px] m-auto">
-    <el-breadcrumb class="my-5" separator="/">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>{{ form.name }}</el-breadcrumb-item>
-    </el-breadcrumb>
-    <div class="w-7xl m-auto bg-gray-50">
+  <div class="container">
+    <div v-if="form" class="flex flex-col w-[1280px] m-auto bg-white">
+      <el-breadcrumb class="my-5" separator="/">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>{{ form.name }}</el-breadcrumb-item>
+      </el-breadcrumb>
+      <div class="w-7xl m-auto bg-gray-50">
         <div class="title text-3xl text-center py-10">{{ form.name }}</div>
         <div class="p-4 leading-7" v-html="form.content">
         </div>
+      </div>
     </div>
   </div>
   <div v-if="!form">
diff --git a/pages/plug/index.vue b/pages/plug/index.vue
deleted file mode 100644
index a7096a3..0000000
--- a/pages/plug/index.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-  <div class="banner" v-if="form">
-    <el-image :src="form.photo"></el-image>
-  </div>
-  <div v-if="form" class="container flex flex-col w-[1280px] m-auto">
-    <el-breadcrumb class="my-5" separator="/">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>{{ form.name }}</el-breadcrumb-item>
-    </el-breadcrumb>
-    <div class="w-7xl m-auto bg-gray-50">
-      <div class="title text-3xl text-center py-10">{{ form.name }}</div>
-      <div class="p-4 leading-7" v-html="form.content">
-      </div>
-    </div>
-  </div>
-  <div v-if="!form">
-    <el-empty description="404 页面不存在"></el-empty>
-  </div>
-</template>
-<script setup lang="ts">
-import type {Design} from "~/api/cms/design/model";
-import type {ApiResult} from "~/api";
-import {useRequest} from "~/composables/useRequest";
-
-const route = useRoute();
-const { query, params } = route;
-const { custom: pageName} = params;
-
-// 页面信息
-const form = ref<Design | any>();
-
-// 请求数据
-const { data: design } = await useRequest<ApiResult<Design[]>>('/cms/design', {params: {
-    path: `/${pageName}`
-  }})
-
-if (design.value) {
-  design.value?.data?.map((d,i) => {
-    if(i == 0){
-      form.value = d;
-      console.log(d.name)
-      useHead({
-        title: `${d.name} 网宿软件`,
-        meta: [{ name: "keywords", content: "Nuxt Vue SSR Typescript" }],
-        bodyAttrs: {
-          class: "page-container",
-        },
-        script: [
-          {
-            children: "console.log('Hello World')",
-          },
-        ],
-      });
-    }
-  })
-}
-</script>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/utils/tool.ts b/utils/tool.ts
index a479df5..22ef837 100644
--- a/utils/tool.ts
+++ b/utils/tool.ts
@@ -16,9 +16,10 @@ export function isArray(str: unknown) {
 
 // 配置服务器接口
 export function getBaseUrl() {
+  console.log('process:',process.server)
   if (process.server) {
     return "http://127.0.0.1:9001/api"
   } else {
-    return "/api"
+    return "https://modules.gxwebsoft.com/api"
   }
 }