From 928f9783e9706128efb530ee189b1eeb6258f37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 24 Aug 2024 01:51:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AppHeader.vue | 10 ++++--
 nuxt.config.ts           |  4 +--
 pages/[custom]/index.vue |  2 --
 pages/product/index.vue  | 75 ++++++++++++++++++++++++++++++++++++++++
 pages/test.vue           | 41 ++++++++++++----------
 5 files changed, 107 insertions(+), 25 deletions(-)
 create mode 100644 pages/product/index.vue

diff --git a/components/AppHeader.vue b/components/AppHeader.vue
index e5ddcbe..858b946 100644
--- a/components/AppHeader.vue
+++ b/components/AppHeader.vue
@@ -1,8 +1,8 @@
 <template>
-  <header class="header bg-white fixed z-10 w-full">
+  <header class="header bg-black fixed z-10 w-full">
     <div class="flex between md:w-3/4 m-auto px-2">
       <div class="header__left flex">
-        <div class="logo w-[140px] flex items-center" @click="reload">
+        <div class="logo w-[170px] flex items-center" @click="reload">
           <nuxt-link v-if="config?.siteLogo" to="/">
             <el-image
               :src="config.siteLogo"
@@ -20,6 +20,9 @@
           <el-menu
             :default-active="currentIndex"
             mode="horizontal"
+            background-color="#000000"
+            text-color="#fff"
+            active-text-color="#ffd04b"
             :collapse="true"
             :ellipsis="false"
             style="border-bottom: none"
@@ -30,7 +33,7 @@
                 <template v-if="item.children.length > 0">
                   <el-sub-menu :index="item.path">
                     <template #title>
-                      <text class="text-[17px]">{{ item.title }}</text>
+                        <el-button type="text" :icon="ElIconArrowDown"  class="text-[17px]">{{ item.title }}</el-button>
                     </template>
                     <el-menu-item v-for="(sub,subIndex) in item.children" :index="`${sub.path}`" :key="subIndex">{{ sub.title }}</el-menu-item>
                   </el-sub-menu>
@@ -85,6 +88,7 @@
 </template>
 
 <script setup lang="ts">
+// 引入所需的图标
   import type { Config } from '~/types/config';
   import type { ApiResult } from '~/api';
   import type { Navigation } from '~/api/cms/navigation/model';
diff --git a/nuxt.config.ts b/nuxt.config.ts
index b52e028..46c271e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -4,7 +4,7 @@ import {domain} from "~/config";
 export default defineNuxtConfig({
     compatibilityDate: '2024-04-03',
     devtools: {enabled: false},
-    modules: ["@element-plus/nuxt", '@unocss/nuxt', "@nuxt/image"],
+    modules: ["@element-plus/nuxt",'@unocss/nuxt', "@nuxt/image"],
     css: [
         'element-plus/dist/index.css',
         'element-plus/theme-chalk/display.css',
@@ -31,7 +31,7 @@ export default defineNuxtConfig({
     runtimeConfig: {
         public: {
             // 一般只需修改租户号和接口地址
-            tenantId: '16880',
+            tenantId: '5',
             domain: 'websoft.top',
             apiBase: 'https://modules.gxwebsoft.com/api',
             // 以下一般不需要修改
diff --git a/pages/[custom]/index.vue b/pages/[custom]/index.vue
index 57e15fd..2f9b185 100644
--- a/pages/[custom]/index.vue
+++ b/pages/[custom]/index.vue
@@ -15,8 +15,6 @@
       </div>
     </div>
   </div>
-  {{ config }}
-  {{ token }}
   <div v-if="!form">
     <el-empty description="404 页面不存在"></el-empty>
   </div>
diff --git a/pages/product/index.vue b/pages/product/index.vue
new file mode 100644
index 0000000..3e3045c
--- /dev/null
+++ b/pages/product/index.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="banner m-auto text-center pt-[60px]" v-if="form">
+    <el-image v-if="form.photo" :src="form.photo"></el-image>
+  </div>
+  <div class="container">
+    <div v-if="form" class="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-white">
+        <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">
+    <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 {useServerRequest} from "~/composables/useServerRequest";
+import {useConfigInfo, useToken} from "~/composables/configState";
+import type {GoodsCategory} from "~/api/shop/goodsCategory/model";
+
+const route = useRoute();
+const { query, params } = route;
+const pageName = window.location.pathname;
+
+console.log(window.location.pathname,'pageName')
+
+// 网站配置信息
+const config = useConfigInfo();
+const token = useToken();
+// 页面信息
+const form = ref<Design | any>();
+
+// 请求数据
+const { data: design } = await useServerRequest<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')",
+          },
+        ],
+      });
+    }
+  })
+}
+
+
+const { data: category } = useServerRequest<ApiResult<GoodsCategory>>('/shop/goods-category')
+
+console.log(category.value)
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/test.vue b/pages/test.vue
index 3c8abce..1b91bfd 100644
--- a/pages/test.vue
+++ b/pages/test.vue
@@ -4,25 +4,30 @@
 
 <template>
   <div class="p-20 pt-[200px]">
-    <el-dropdown>
-    <span class="el-dropdown-link">
-      Dropdown List
-      <el-icon class="el-icon--right">
-        <arrow-down />
-      </el-icon>
-    </span>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item>Action 1</el-dropdown-item>
-          <el-dropdown-item>Action 2</el-dropdown-item>
-          <el-dropdown-item>Action 3</el-dropdown-item>
-          <el-dropdown-item disabled>Action 4</el-dropdown-item>
-          <el-dropdown-item divided>Action 5</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
 
-    <el-tag type="primary">Tag 1</el-tag>
+    <el-icon>
+      <ElIconLink/>
+    </el-icon>
+    <el-icon><ElIconArrowDown /></el-icon>
+<!--    <el-dropdown>-->
+<!--    <span class="el-dropdown-link">-->
+<!--      Dropdown List-->
+<!--      <el-icon class="el-icon&#45;&#45;right">-->
+<!--        <arrow-down />-->
+<!--      </el-icon>-->
+<!--    </span>-->
+<!--      <template #dropdown>-->
+<!--        <el-dropdown-menu>-->
+<!--          <el-dropdown-item>Action 1</el-dropdown-item>-->
+<!--          <el-dropdown-item>Action 2</el-dropdown-item>-->
+<!--          <el-dropdown-item>Action 3</el-dropdown-item>-->
+<!--          <el-dropdown-item disabled>Action 4</el-dropdown-item>-->
+<!--          <el-dropdown-item divided>Action 5</el-dropdown-item>-->
+<!--        </el-dropdown-menu>-->
+<!--      </template>-->
+<!--    </el-dropdown>-->
+
+<!--    <el-tag type="primary">Tag 1</el-tag>-->
   </div>
 </template>