From 8f6c9518a5da8d372529f5c23133ee097492b760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 30 Sep 2024 19:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AppHeader.vue                      |  19 ++-
 components/PageBanner.vue                     |  53 ++++----
 composables/configState.ts                    |   4 +-
 nuxt.config.ts                                |   2 +-
 pages/article/components/CardList.vue         |  11 +-
 pages/ask/components/CardList.vue             |  22 ++--
 pages/case/[id].vue                           | 109 -----------------
 pages/case/components/CardList.vue            |  29 +++--
 pages/case/components/PageBanner.vue          | 113 ++++++++++++++++++
 pages/case/index.vue                          |   2 +
 pages/components/Flash.vue                    |  14 ++-
 pages/index.vue                               |  18 +--
 pages/market/components/PageBanner.vue        |  33 ++---
 pages/user/auth.vue                           |   2 +-
 .../user/components}/UserMenu.vue             |   2 +-
 pages/user/index.vue                          |   2 +-
 pages/user/order.vue                          |   6 +-
 pages/user/password.vue                       |   2 +-
 18 files changed, 228 insertions(+), 215 deletions(-)
 delete mode 100644 pages/case/[id].vue
 create mode 100644 pages/case/components/PageBanner.vue
 rename {components => pages/user/components}/UserMenu.vue (98%)

diff --git a/components/AppHeader.vue b/components/AppHeader.vue
index ef32489..e0691ed 100644
--- a/components/AppHeader.vue
+++ b/components/AppHeader.vue
@@ -57,12 +57,19 @@
             <ClientOnly>
               <template v-if="token">
                 <el-dropdown @command="handleCommand">
-                  <el-avatar class="cursor-pointer" :src="user?.avatar" :size="30"/>
-                  <el-button circle :icon="ElIconUserFilled" color="#155FAA"></el-button>
+                  <div class="flex items-center cursor-pointer">
+                    <el-avatar class="cursor-pointer" :src="user?.avatar" :size="30">
+                      <el-button circle :icon="ElIconUserFilled" color="#155FAA"></el-button>
+                    </el-avatar>
+                    <span class="tenant-name pl-1">{{ user?.mobile }}</span>
+                  </div>
                   <template #dropdown>
                     <el-dropdown-menu>
-                      <el-dropdown-item command="user">账户中心</el-dropdown-item>
-                      <el-dropdown-item divided command="logOut" @click="navigateTo('/user/logout')">退出
+                      <el-dropdown-item command="user" @click="openSpmUrl(`/user`)">账户中心</el-dropdown-item>
+                      <el-dropdown-item command="password" @click="openSpmUrl(`/user/password`)">修改密码</el-dropdown-item>
+                      <el-dropdown-item command="auth" @click="openSpmUrl(`/user/auth`)">实名认证</el-dropdown-item>
+                      <el-dropdown-item command="order" @click="openSpmUrl(`/user/order`)">我的订单</el-dropdown-item>
+                      <el-dropdown-item divided command="logOut" @click="openSpmUrl('/user/logout')">退出登录
                       </el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
@@ -182,12 +189,14 @@ const reload = async () => {
     if (response.value?.data) {
       user.value = response.value?.data;
     }
-    // 获取后台管理地址
+    // 获取企业信息
     const {data: company} = await useServerRequest<ApiResult<Company>>('/system/company/profile', {baseURL: runtimeConfig.public.apiServer})
     console.log(company.value,'>>>>90')
     if (company.value?.data?.domain) {
       sysDomain.value = company.value?.data?.domain;
+      user.value.tenantName = company.value?.data?.tenantName;
       localStorage.setItem('SysDomain', `${company.value?.data?.domain}`);
+      localStorage.setItem('tenantName', `${company.value?.data?.tenantName}`)
     }
 
   }
diff --git a/components/PageBanner.vue b/components/PageBanner.vue
index 1769f3d..f020757 100644
--- a/components/PageBanner.vue
+++ b/components/PageBanner.vue
@@ -127,33 +127,36 @@ const checkPassword = async () => {
   }
 }
 
-// 校验密码
-const {data: nav} = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath', {
-  query: {
-    path: route.path
-  }
-})
-if (nav.value?.data) {
-  form.value = nav.value?.data;
-  console.log('PageBanner.vue => ', form.value)
-  // 页面布局
-  if (form.value?.layout) {
-    layout.value = JSON.parse(form.value?.layout)
-  }
-  // 允许直接访问
-  if(form.value?.permission === 0){
-    emit('done', true);
-  }
-  // 要求登录可见
-  if (form.value?.permission === 1) {
-    navigateTo(`/passport/login`);
-    if(token && token.value.length > 0){
+const reload = async () => {
+  // 校验密码
+  const {data: nav} = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath', {
+    query: {
+      path: route.path
+    }
+  })
+  if (nav.value?.data) {
+    form.value = nav.value?.data;
+    console.log('PageBanner.vue => ', form.value)
+    // 页面布局
+    if (form.value?.layout) {
+      layout.value = JSON.parse(form.value?.layout)
+    }
+    // 允许直接访问
+    if(form.value?.permission === 0){
       emit('done', true);
     }
-  }
-  // 要求密码可见
-  if (form.value?.permission === 2) {
-    dialogVisible.value = true;
+    // 要求登录可见
+    if (form.value?.permission === 1) {
+      navigateTo(`/passport/login`);
+      if(token && token.value.length > 0){
+        emit('done', true);
+      }
+    }
+    // 要求密码可见
+    if (form.value?.permission === 2) {
+      dialogVisible.value = true;
+    }
   }
 }
+reload();
 </script>
diff --git a/composables/configState.ts b/composables/configState.ts
index 37278ca..c19d8e9 100644
--- a/composables/configState.ts
+++ b/composables/configState.ts
@@ -53,7 +53,9 @@ export const useUser = () =>
             phone: '',
             nickname: '',
             gradeId: 0,
-            gradeName: ''
+            gradeName: '',
+            tenantId: 0,
+            tenantName: '',
         };
     });
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 0c9cc42..ce28abd 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -36,7 +36,7 @@ export default defineNuxtConfig({
             // apiServer: 'http://127.0.0.1:30000/api',
 
             // 生产环境
-            apiServer: 'https://common-api.websoft.top/api',
+            apiServer: 'https://server.gxwebsoft.com/api',
             globalTitle: '网宿软件',
             domain: 'websoft.top'
         },
diff --git a/pages/article/components/CardList.vue b/pages/article/components/CardList.vue
index 4aa0834..55f78f7 100644
--- a/pages/article/components/CardList.vue
+++ b/pages/article/components/CardList.vue
@@ -6,11 +6,16 @@
           <el-card shadow="hover" :body-style="{ padding: '0px' }" class="hover:bg-gray-50 cursor-pointer" @click="openSpmUrl(`/detail`,item,item.articleId,true)">
             <el-image :src="item.image" fit="fill" :lazy="true" class="w-full h-[150px] cursor-pointer" />
             <div class="flex-1 px-4 py-5 sm:p-6 !p-4">
-              <div class="text-gray-700 dark:text-white text-base font-semibold  flex flex-col gap-1.5">
-                <div class="flex-1 text-xl cursor-pointer">{{ item.title }}</div>
+              <div class="line-clamp-2 font-semibold text-gray-700 dark:text-white text-base gap-1.5 text-xl">
+                <el-icon v-if="item.permission > 0"><Lock class="text-gray-400 pr-1"/></el-icon>
+                {{ item.title }}
               </div>
               <div class="flex items-center gap-1.5 py-2 text-gray-500 justify-between">
-                <div class="text-gray-500">{{ item.comments }}</div>
+                <div class="text-gray-500 line-clamp-3">{{ item.comments }}</div>
+              </div>
+              <div class="flex items-center gap-1.5 py-2 text-gray-500">
+                <el-avatar :src="item.avatar" :size="20"/>
+                <span>{{ item.nickname }} · {{ dayjs(item.createTime).format('MM-DD hh:mm') }}</span>
               </div>
             </div>
           </el-card>
diff --git a/pages/ask/components/CardList.vue b/pages/ask/components/CardList.vue
index 7a0261f..14af39f 100644
--- a/pages/ask/components/CardList.vue
+++ b/pages/ask/components/CardList.vue
@@ -3,17 +3,21 @@
     <el-row :gutter="24" class="flex">
       <template v-for="(item,index) in list" :key="index">
         <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" class="mb-5 min-w-xs">
-          <el-card shadow="hover" :body-style="{ padding: '0px' }" class="hover:bg-gray-50 cursor-pointer" @click="openSpmUrl(`/detail`,item,item.articleId,true)">
-            <el-image :src="item.image" fit="fill" :lazy="true" class="w-full md:h-[150px] h-[199px] cursor-pointer" />
+          <el-card shadow="hover" :body-style="{ padding: '0px' }" class="hover:bg-gray-50 cursor-pointer"
+                   @click="openSpmUrl(`/detail`,item,item.articleId,true)">
+            <el-image :src="item.image" fit="fill" :lazy="true" class="w-full md:h-[150px] h-[199px] cursor-pointer"/>
             <div class="flex-1 px-4 py-5 sm:p-6 !p-4">
-              <div class="text-gray-700 dark:text-white text-base font-semibold  flex items-center gap-1.5">
-                <span class="flex-1 text-xl cursor-pointer max-h-[57px] overflow-hidden">
-                {{ item.title }}</span>
+<!--              <div class="text-gray-700 dark:text-white text-base font-semibold  flex items-center gap-1.5">-->
+<!--                <div class="flex items-center text-xl cursor-pointer max-w-md line-clamp-2"><el-icon-->
+<!--                    v-if="item.permission > 0"><Lock class="text-gray-400 pr-1"/></el-icon>{{ item.title }}</div>-->
+<!--              </div>-->
+              <div class="line-clamp-2 font-semibold text-gray-700 dark:text-white text-base gap-1.5 text-xl">
+                <el-icon v-if="item.permission > 0"><Lock class="text-gray-400 pr-1"/></el-icon>
+                {{ item.title }}
               </div>
               <div class="flex items-center gap-1.5 py-2 text-gray-500">
-                <el-avatar :src="item.avatar" :size="20" />
+                <el-avatar :src="item.avatar" :size="20"/>
                 <span>{{ item.nickname }} · {{ dayjs(item.createTime).format('MM-DD hh:mm') }}</span>
-                <el-icon v-if="item.permission > 0"><Lock /></el-icon>
               </div>
             </div>
           </el-card>
@@ -29,7 +33,7 @@
 <script setup lang="ts">
 import {openSpmUrl} from "~/utils/common";
 import dayjs from "dayjs";
-import { Lock } from '@element-plus/icons-vue'
+import {Lock} from '@element-plus/icons-vue'
 
 const props = withDefaults(
     defineProps<{
@@ -44,7 +48,7 @@ const emit = defineEmits<{
 }>();
 
 const load = () => {
-  if(!props.disabled){
+  if (!props.disabled) {
     emit('done')
   }
 }
diff --git a/pages/case/[id].vue b/pages/case/[id].vue
deleted file mode 100644
index 5faf1f4..0000000
--- a/pages/case/[id].vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <!-- Banner -->
-  <Banner :layout="layout" />
-
-  <div class="container md:w-screen-xl m-auto">
-    <div class="flex flex-col" v-if="company">
-      <Breadcrumb :data="form" :title="`插件详情`" />
-      <div :class="company" class="page-main w-full bg-white rounded-lg">
-        <div class="p-4 leading-7">
-          <div class="goods-info flex">
-            <el-avatar :src="company.companyLogo" size="large" />
-            <div class="flex flex-col ml-2">
-              <div class="text-lg">{{ company.tenantName }}</div>
-              <div class="text-gray-400">{{ company.comments }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- 空白页 -->
-  <div class="mt-[60px]" v-if="!company">
-    <el-empty description="404 页面不存在"></el-empty>
-  </div>
-
-</template>
-<script setup lang="ts">
-import { Search } from '@element-plus/icons-vue'
-import type {ApiResult, PageResult} from "~/api";
-import {useServerRequest} from "~/composables/useServerRequest";
-import {useWebsite} from "~/composables/configState";
-import type {Navigation} from "~/api/cms/navigation/model";
-import {getIdByParam, getPath} from "~/utils/common";
-import type {Company, CompanyParam} from "~/api/system/company/model";
-import type {Tenant} from "~/api/system/tenant/model";
-import {navigateTo} from "#imports";
-import type {Website} from "~/api/cms/website/model";
-import PageContainer from "~/components/PageContainer.vue";
-import Breadcrumb from "~/components/Breadcrumb.vue";
-
-const route = useRoute();
-
-// 页面信息
-const runtimeConfig = useRuntimeConfig();
-const list = ref<Company[]>([]);
-const activeName = ref('web');
-const page = ref<number>(1);
-const resultText = ref('');
-const layout = ref<any>();
-
-// 获取状态
-const form = ref<Navigation>();
-const website = useWebsite();
-const company = ref<Company>()
-
-// 搜索表单
-const where = reactive<CompanyParam>({
-  keywords: ''
-});
-
-const navTo = (item: Company) => {
-  navigateTo(`/market/${item.companyId}`)
-}
-
-// 请求数据
-const reload = async () => {
-
-  const { data: nav } = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath',{query: {path: getPath()}})
-  if(nav.value?.data){
-    form.value = nav.value?.data;
-  }
-  // 页面布局
-  if(form.value?.layout){
-    layout.value = JSON.parse(form.value?.layout)
-  }
-  useHead({
-    title: `搜索结果 - ${website.value.websiteName}`,
-    bodyAttrs: {
-      class: "page-container",
-    }
-  });
-  await handleClick()
-}
-
-// 搜索结果
-const handleClick = async () => {
-  if(activeName.value == 'web'){
-    const {data: response} = await useServerRequest<ApiResult<Company>>(`/system/company/profileAll/${getIdByParam()}`,{baseURL: runtimeConfig.public.apiServer})
-    if(response.value?.data){
-      if (response.value.data) {
-        company.value = response.value.data
-      }
-      if(!response.value){
-        resultText.value = '暂无相关结果'
-      }
-    }
-  }
-}
-
-watch(
-    () => route,
-    () => {
-      reload();
-    },
-    { immediate: true }
-);
-
-</script>
diff --git a/pages/case/components/CardList.vue b/pages/case/components/CardList.vue
index 365558f..774f308 100644
--- a/pages/case/components/CardList.vue
+++ b/pages/case/components/CardList.vue
@@ -2,20 +2,26 @@
   <div class="xl:w-screen-xl sm:flex xl:p-0 p-4 m-auto relative" v-infinite-scroll="load">
     <el-row :gutter="24" class="flex">
       <template v-for="(item,index) in list" :key="index">
-        <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" class="mb-5 min-w-xs">
+        <el-col :span="8" class="mb-5 min-w-xs">
           <el-card shadow="hover" :body-style="{ padding: '0px' }" class="hover:bg-gray-50 cursor-pointer" @click="openSpmUrl(`/item`,item,item.appId,true)">
-            <el-image :src="item.appIcon" fit="contain" :lazy="true" class="w-full md:h-[150px] h-[199px] cursor-pointer" />
             <div class="flex-1 px-4 py-5 sm:p-6 !p-4">
-              <div class="text-gray-700 dark:text-white text-base font-semibold  flex items-center gap-1.5">
-                <span class="flex-1 text-xl cursor-pointer">{{ item.appName }}</span>
+              <div class="text-gray-700 dark:text-white flex items-center gap-2">
+                <div class="avatar">
+                  <el-avatar :src="item.appIcon" shape="square" :lazy="true" :size="48" />
+                </div>
+                <div class="app-name flex flex-col pb-2">
+                  <span class="flex-1 text-xl font-bold">{{ item.appName }}</span>
+                  <span class="text-gray-400 text-xs">{{ item.appUrl || item.appCode }}</span>
+                </div>
               </div>
               <div class="flex items-center gap-1.5 py-2 text-gray-500 justify-between">
-                <span class="text-gray-500">{{ item.comments }} </span>
+                <span class="text-gray-400 min-h-[50px] overflow-hidden">{{ item.comments }} </span>
               </div>
               <div class="button-group flex justify-center mt-3">
-                <el-button class="w-full" :icon="ElIconView" @click.stop="openSpmUrl(`/item`,item,item.appId,true)">查看详情</el-button>
-                <el-button v-if="item.price && item.price > 0" class="w-full" :icon="ElIconShoppingCart">购买</el-button>
-                <el-button v-else class="w-full" :icon="ElIconSetting" @click="openSpmUrl(`https://${item.tenantId}.websoft.top`,item,item.appId,true)">控制台</el-button>
+                <el-button class="w-full" @click.stop="addFavorite(item)">加入收藏</el-button>
+                <el-button class="w-full" @click.stop="openSpmUrl(`/item`,item,item.appId,true)">查看详情</el-button>
+                <el-button v-if="item.appUrl" class="w-full" @click="openSpmUrl(`https://${item.tenantCode}.websoft.top`,item,item.appId,true)">产品控制台</el-button>
+                <el-button v-else class="w-full" @click="openSpmUrl(`https://${item.tenantCode}.websoft.top`,item,item.appId,true)">产品控制台</el-button>
               </div>
             </div>
           </el-card>
@@ -31,10 +37,11 @@
 <script setup lang="ts">
 import {openSpmUrl} from "~/utils/common";
 import dayjs from "dayjs";
+import type {App} from "~/api/oa/app/model";
 
 const props = withDefaults(
     defineProps<{
-      list?: any[];
+      list?: App[];
       disabled?: boolean;
     }>(),
     {}
@@ -44,6 +51,10 @@ const emit = defineEmits<{
   (e: 'done'): void;
 }>();
 
+const addFavorite = () => {
+
+}
+
 const load = () => {
   if(!props.disabled){
     emit('done')
diff --git a/pages/case/components/PageBanner.vue b/pages/case/components/PageBanner.vue
new file mode 100644
index 0000000..371e61e
--- /dev/null
+++ b/pages/case/components/PageBanner.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="banner m-auto relative sm:flex">
+    <svg viewBox="0 0 1440 181" fill="none" xmlns="http://www.w3.org/2000/svg"
+         class="pointer-events-none absolute w-full top-[-2px] transition-all text-green-5 flex-shrink-0 opacity-100 duration-[400ms] opacity-80 -z-10">
+      <mask id="path-1-inside-1_414_5526" fill="white">
+        <path d="M0 0H1440V181H0V0Z"></path>
+      </mask>
+      <path d="M0 0H1440V181H0V0Z" fill="url(#paint0_linear_414_5526)" fill-opacity="0.22"></path>
+      <path d="M0 2H1440V-2H0V2Z" fill="url(#paint1_linear_414_5526)" mask="url(#path-1-inside-1_414_5526)"></path>
+      <defs>
+        <linearGradient id="paint0_linear_414_5526" x1="720" y1="0" x2="720" y2="181" gradientUnits="userSpaceOnUse">
+          <stop stop-color="currentColor"></stop>
+          <stop offset="1" stop-color="currentColor" stop-opacity="0"></stop>
+        </linearGradient>
+        <linearGradient id="paint1_linear_414_5526" x1="0" y1="90.5" x2="1440" y2="90.5" gradientUnits="userSpaceOnUse">
+          <stop stop-color="currentColor" stop-opacity="0"></stop>
+          <stop offset="0.395" stop-color="currentColor"></stop>
+          <stop offset="1" stop-color="currentColor" stop-opacity="0"></stop>
+        </linearGradient>
+      </defs>
+    </svg>
+    <div class="md:w-screen-xl m-auto md:p-0 px-4">
+      <div class="py-8 sm:py-16" _path="/templates" _dir="" _draft="false" _partial="false" _locale=""
+           _id="content:4.templates.yml" _type="yaml" _source="content" _file="4.templates.yml" _stem="4.templates"
+           _extension="yml">
+        <div v-if="layout">
+          <div class="banner w-full">
+            <h1
+                class="text-3xl font-bold tracking-tight text-gray-900 dark:text-white sm:text-4xl lg:text-5xl">
+              <span v-if="layout.title">{{ layout.title }}</span>
+              <span v-if="layout.name">{{ layout.name }}</span>
+            </h1>
+
+            <div class="mt-4 text-lg text-gray-500 dark:text-gray-400 gap-8 sm:gap-y-16 grid lg:grid-cols-2 lg:items-center">
+              {{ layout.description }}
+            </div>
+            <div class="flex justify-between w-full items-center mt-4">
+              <el-space>
+                <div class="w-[500px] pr-10">
+                  <el-input
+                      v-model="where.keywords"
+                      placeholder="搜索"
+                      :prefix-icon="Search"
+                      @keydown.enter="handleClick"
+                  >
+                    <template #append>
+                      <el-button size="large" type="primary" @click="handleClick">搜索</el-button>
+                    </template>
+                  </el-input>
+                </div>
+              </el-space>
+              <el-space>
+                <el-button size="large">我的收藏</el-button>
+                <el-button size="large">热门推荐</el-button>
+              </el-space>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Search } from '@element-plus/icons-vue'
+import {useConfigInfo} from "~/composables/configState";
+import {openSpmUrl} from "~/utils/common";
+import type {CompanyParam} from "~/api/system/company/model";
+
+const token = useToken();
+const sysDomain = useSysDomain();
+
+withDefaults(
+    defineProps<{
+      layout?: any;
+      title?: string;
+      desc?: string;
+      buyUrl?: string;
+    }>(),
+    {
+      title: 'Templates',
+      desc: 'Explore community templates to get up and running in a few seconds.',
+      demoUrl: '/product/website',
+      buyUrl: 'https://github.com/websoft9/ansible-templates'
+    }
+);
+
+// 搜索表单
+const where = reactive<CompanyParam>({
+  keywords: ''
+});
+
+const config = useConfigInfo();
+// 搜索结果
+const handleClick = async () => {
+  if (where.keywords == '') {
+    return false;
+  }
+  if(activeName.value == 'web'){
+    const {data: response} = await useServerRequest<ApiResult<PageResult<Website>>>('/cms/cms-website/page',{baseURL: runtimeConfig.public.apiServer, params: {
+        page: page.value, keywords: where.keywords
+      }})
+    if(response.value?.data){
+      if (response.value?.data.list) {
+        websites.value = response.value?.data.list;
+      }
+      if(response.value.data.count == 0){
+        resultText.value = '暂无相关结果'
+      }
+    }
+  }
+}
+</script>
diff --git a/pages/case/index.vue b/pages/case/index.vue
index f57c534..270c86d 100644
--- a/pages/case/index.vue
+++ b/pages/case/index.vue
@@ -9,6 +9,7 @@ import {useWebsite} from "~/composables/configState";
 import type {Navigation} from "~/api/cms/navigation/model";
 import type {CompanyParam} from "~/api/system/company/model";
 import CardList from './components/CardList.vue';
+import PageBanner from "./components/PageBanner.vue";
 import type {App} from "~/api/oa/app/model";
 
 const route = useRoute();
@@ -47,6 +48,7 @@ const reload = async (path: string) => {
   const {data: response} = await useServerRequest<ApiResult<PageResult<App>>>('/oa/oa-app/page',{baseURL: runtimeConfig.public.apiServer, params: {
       page: page.value,
       limit: 8,
+      showCase: 1,
       keywords: where.keywords
     }})
   if(response.value?.data){
diff --git a/pages/components/Flash.vue b/pages/components/Flash.vue
index 1938faa..4a3099a 100644
--- a/pages/components/Flash.vue
+++ b/pages/components/Flash.vue
@@ -88,18 +88,20 @@
           <el-tag type="warning" round @click="openSpmUrl(`/detail`, {},730,true)">v3.0 版本发布
           </el-tag>
         </div>
-        <h1 class="text-5xl font-bold tracking-tight text-gray-900 dark:text-white sm:text-7xl"> 现代Web应用 <br><span
-            class="text-primary block lg:inline-block text-green-500">Vue 框架</span></h1>
-        <div class="mt-6 text-lg tracking-tight text-gray-600 dark:text-gray-300"> WebSoft是一个基于Vue3和Nuxt构建的web框架，使web开发更直观而强大。<br>
-          自信地创建高性能和生产级的全栈web应用程序和网站。
+        <h1 class="text-5xl font-bold tracking-tight text-gray-900 dark:text-white sm:text-7xl">
+          <span>构建现代Web应用</span><br/>
+          <span class="text-primary block lg:inline-block text-green-500">Vue 框架</span>
+        </h1>
+        <div class="mt-6 text-lg tracking-tight text-gray-600 dark:text-gray-300"> WEBSOFT是一个基于Vue和Nuxt构建的web框架，使web开发更直观而强大<br>
+          自信地创建高性能和生产级的全栈web应用程序和网站
         </div>
         <div class="mt-10 flex flex-wrap gap-x-6 gap-y-3 justify-center">
           <div class="flex flex-col gap-4">
             <div class="flex items-center">
-              <el-button size="large" type="primary" v-if="!token" :icon="ElIconArrowRight" @click="openSpmUrl(`/developer`, {},0)">立即开始</el-button>
+              <el-button size="large" type="primary" v-if="!token" :icon="ElIconArrowRight" @click="openSpmUrl(`/passport/login`)">立即开始</el-button>
               <el-button size="large" type="primary" v-else :icon="ElIconArrowRight" @click="loginAdminByToken">进入控制台</el-button>
               <el-button size="large" type="success"  :icon="ElIconDownload" @click="openSpmUrl(`/down`, {},0,true)">源码下载</el-button>
-              <el-button size="large" type="warning"  :icon="ElIconShoppingCart">购买授权</el-button>
+              <el-button size="large" type="warning"  :icon="ElIconShoppingCart" @click="openSpmUrl(`/item`, {},124)">购买授权</el-button>
             </div>
           </div>
         </div>
diff --git a/pages/index.vue b/pages/index.vue
index 923677e..34a8320 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -10,21 +10,15 @@
 
 </template>
 <script setup lang="ts">
-import type {ApiResult} from "~/api";
-import {useServerRequest} from "~/composables/useServerRequest";
 import {useConfigInfo, useForm, useToken, useWebsite} from "~/composables/configState";
 import type {BreadcrumbItem} from "~/types/global";
-import type {Navigation} from "~/api/cms/navigation/model";
-import {getIdBySpm} from "~/utils/common";
 import Flash from './components/Flash.vue';
 import ProductList from "./components/ProductList.vue";
 import ArticleList from './components/ArticleList.vue';
 
 // 引入状态管理
 const route = useRoute();
-const website = useWebsite();
 const layout = ref<any>();
-const config = useConfigInfo();
 const token = useToken();
 const form = useForm();
 const breadcrumb = ref<BreadcrumbItem>();
@@ -32,16 +26,6 @@ const breadcrumb = ref<BreadcrumbItem>();
 // 请求数据
 const reload = async () => {
 
-  // 存在spm(优先级高)
-  const {data: nav} = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/' + getIdBySpm(5))
-  if (nav.value?.data) {
-    form.value = nav.value.data
-  } else {
-    const {data: nav} = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath', {query: {path: route.path}})
-    if (nav.value?.data) {
-      form.value = nav.value?.data;
-    }
-  }
   // 页面布局
   if (form.value?.layout) {
     layout.value = JSON.parse(form.value?.layout)
@@ -57,7 +41,7 @@ const reload = async () => {
 
   // seo
   useHead({
-    title: `现代Web应用开发(Vue)框架 · WEBSOFT`,
+    title: `构建现代WEB应用 · WEBSOFT`,
     meta: [{name: form.value.design?.keywords, content: form.value.design?.description}],
     bodyAttrs: {
       class: "page-container",
diff --git a/pages/market/components/PageBanner.vue b/pages/market/components/PageBanner.vue
index f550f71..6058951 100644
--- a/pages/market/components/PageBanner.vue
+++ b/pages/market/components/PageBanner.vue
@@ -36,33 +36,24 @@
             </div>
             <div class="flex justify-between w-full items-center mt-4">
               <el-space>
+                <div class="w-[500px]">
+                  <el-input
+                      v-model="where.keywords"
+                      placeholder="搜索"
+                      :prefix-icon="Search"
+                      @keydown.enter="handleClick"
+                  >
+                    <template #append>
+                      <el-button size="large" type="primary" @click="handleClick">搜索</el-button>
+                    </template>
+                  </el-input>
+                </div>
                 <el-button
-                    :icon="ElIconView"
-                    size="large"
-                    v-if="layout.demoUrl"
-                    @click="openSpmUrl(layout.demoUrl)"
-                >
-                  演示地址
-                </el-button>
-                <el-button
-                    v-if="token && layout.buyUrl"
                     size="large"
                     @click="openSpmUrl(`https://${sysDomain}/token-login`)"
                 >
                   创建应用
                 </el-button>
-                <el-input
-                    v-model="where.keywords"
-                    class="sm:w-[360px] w-full"
-                    size="large"
-                    placeholder="搜索"
-                    :prefix-icon="Search"
-                    @keydown.enter="handleClick"
-                >
-                  <template #append>
-                    <el-button size="large" type="primary" @click="handleClick">搜索</el-button>
-                  </template>
-                </el-input>
               </el-space>
             </div>
           </div>
diff --git a/pages/user/auth.vue b/pages/user/auth.vue
index 9cce850..ce0fa4d 100644
--- a/pages/user/auth.vue
+++ b/pages/user/auth.vue
@@ -18,7 +18,7 @@ import { ref } from 'vue'
 import { Plus } from '@element-plus/icons-vue'
 import {useServerRequest} from "~/composables/useServerRequest";
 import type {ApiResult} from "~/api";
-import UserMenu from "~/components/UserMenu.vue";
+import UserMenu from "./components/UserMenu.vue";
 import Auth from './components/Auth.vue';
 
 // 配置信息
diff --git a/components/UserMenu.vue b/pages/user/components/UserMenu.vue
similarity index 98%
rename from components/UserMenu.vue
rename to pages/user/components/UserMenu.vue
index c165c4f..53c0da4 100644
--- a/components/UserMenu.vue
+++ b/pages/user/components/UserMenu.vue
@@ -45,7 +45,7 @@ const activities = [
     path: '/user/auth'
   },
   {
-    name: '订单列表',
+    name: '我的订单',
     path: '/user/order'
   },
   {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 425e4c4..ce09037 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -20,7 +20,7 @@ import type { User } from '@/api/system/user/model';
 import { ref } from 'vue'
 import {useServerRequest} from "~/composables/useServerRequest";
 import type {ApiResult} from "~/api";
-import UserMenu from "~/components/UserMenu.vue";
+import UserMenu from "./components/UserMenu.vue";
 import Base from './components/Base.vue';
 
 // 配置信息
diff --git a/pages/user/order.vue b/pages/user/order.vue
index c061893..e1c4de9 100644
--- a/pages/user/order.vue
+++ b/pages/user/order.vue
@@ -18,13 +18,9 @@ import {useConfigInfo, useToken, useWebsite} from "~/composables/configState";
 import useFormData from '@/utils/use-form-data';
 import type { User } from '@/api/system/user/model';
 import { ref } from 'vue'
-import {getCaptcha} from "~/api/passport/login";
 import {useServerRequest} from "~/composables/useServerRequest";
 import type {ApiResult} from "~/api";
-import type {Website} from "~/api/cms/website/model";
-import type {CaptchaResult, LoginResult} from "~/api/passport/login/model";
-import {getPath, navigateTo} from "#imports";
-import UserMenu from "~/components/UserMenu.vue";
+import UserMenu from "./components/UserMenu.vue";
 import Order from './components/Order.vue';
 
 // 配置信息
diff --git a/pages/user/password.vue b/pages/user/password.vue
index ff85c1a..61bf252 100644
--- a/pages/user/password.vue
+++ b/pages/user/password.vue
@@ -20,7 +20,7 @@ import type { User } from '@/api/system/user/model';
 import { ref } from 'vue'
 import {useServerRequest} from "~/composables/useServerRequest";
 import type {ApiResult} from "~/api";
-import UserMenu from "~/components/UserMenu.vue";
+import UserMenu from "./components/UserMenu.vue";
 import Password from './components/Password.vue';
 import type {CaptchaResult} from "~/api/passport/login/model";