From 287ceacaf3707eaf0ef155d525656b4d70a8c536 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, 15 Mar 2025 16:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=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

---
 api/cms/cmsWebsite/index.ts            |   2 +-
 api/layout/index.ts                    |   1 -
 components/AppFooter/AppFooter.vue     |   2 -
 components/Index/CaseList.vue          | 109 +++++++++++++++++++++++++
 components/Index/Partners.vue          |   2 +-
 components/Index/SiteList.vue          |  10 +--
 pages/ask/add.vue                      |  86 +++++++++++--------
 pages/case/[id].vue                    |   4 +-
 pages/case/index.vue                   |   2 +-
 pages/detail/[id].vue                  |   4 +-
 pages/developer/index.vue              |   7 +-
 pages/index.vue                        |  13 ++-
 pages/market/[id].vue                  | 104 +++++++++++------------
 pages/market/components/PageBanner.vue |  31 +++++--
 pages/market/index.vue                 |   6 ++
 pages/product/index.vue                |   8 +-
 pages/user/modify.vue                  |   1 +
 public/favicon.ico                     | Bin 796 -> 635 bytes
 utils/request.ts                       |  10 ++-
 19 files changed, 279 insertions(+), 123 deletions(-)
 create mode 100644 components/Index/CaseList.vue

diff --git a/api/cms/cmsWebsite/index.ts b/api/cms/cmsWebsite/index.ts
index 4d74efa..e1ed257 100644
--- a/api/cms/cmsWebsite/index.ts
+++ b/api/cms/cmsWebsite/index.ts
@@ -68,7 +68,7 @@ export async function updateCmsWebsite(data: CmsWebsite) {
  */
 export async function updateCmsWebsiteAll(data: CmsWebsite) {
   const res = await request.put<ApiResult<unknown>>(
-      'http://127.0.0.1:9002/api/cms/cms-website/updateAll',
+      '/cms/cms-website/updateAll',
       data
   );
   if (res.code === 0) {
diff --git a/api/layout/index.ts b/api/layout/index.ts
index dc2f5b6..b704da5 100644
--- a/api/layout/index.ts
+++ b/api/layout/index.ts
@@ -46,7 +46,6 @@ export async function updateUser(data: User){
     return res.message ?? '修改成功';
   }
   return Promise.reject(new Error(res.message));
-
 }
 
 /**
diff --git a/components/AppFooter/AppFooter.vue b/components/AppFooter/AppFooter.vue
index 2880175..8611199 100644
--- a/components/AppFooter/AppFooter.vue
+++ b/components/AppFooter/AppFooter.vue
@@ -1,7 +1,5 @@
 <template>
 
-  <!-- 下单定制 -->
-  <Customized />
   <!-- 底部菜单 -->
   <SubMenu />
   <!-- 版权信息 -->
diff --git a/components/Index/CaseList.vue b/components/Index/CaseList.vue
new file mode 100644
index 0000000..7c75b4b
--- /dev/null
+++ b/components/Index/CaseList.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="xl:w-screen-xl m-auto py-4 px-4 sm:px-0">
+    <div class="text-center flex flex-col items-center z-0 relative">
+      <h2 class="text-4xl font-bold tracking-tight text-gray-800 dark:text-white">
+        {{ title || '客户案例' }}
+      </h2>
+      <div class="sub-title">
+        <p class="text-gray-400 text-sm dark:text-gray-400 py-3">
+          {{ comments || '推荐的代表性客户案例' }}
+        </p>
+      </div>
+    </div>
+
+    <el-row id="container" :gutter="24" class="clearfix">
+      <el-col v-for="(item,index) in list" :key="index" :span="6" :xs="24" class="left mb-8">
+        <el-card :body-style="{ padding: '0px' }" class=" hover:bg-gray-50 cursor-pointer" shadow="hover" @click="navigateTo(`/detail/${item.articleId}`)">
+          <el-image
+            :lazy="true"
+            :src="item.image"
+            class="w-full md:h-[166px] h-[199px] cursor-pointer bg-gray-50" fit="cover"/>
+          <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="text-xl cursor-pointer items-center line-clamp-1">
+                {{ item.title }}
+              </div>
+            </div>
+            <div class="flex items-center gap-1.5 py-2 text-gray-500 justify-between">
+              <div class="text-gray-500 line-clamp-2">{{ item.comments }}</div>
+            </div>
+            <div class="button-group flex justify-between items-center mt-3 text-sm">
+              <el-space class="flex items-end">
+                <div class="text-gray-400 gap-1 flex items-center"><el-icon><View /></el-icon><span>{{ getViews(item) }}</span></div>
+              </el-space>
+              <div class="text-gray-400">
+                <el-avatar v-if="item.avatar" :src="`${item.avatar}`" size="small" />
+                {{ dayjs(item.createTime).format('YYYY-MM-DD') }}
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+  <div v-if="disabled" class="px-1 text-center text-gray-500 min-h-xs">
+    没有更多了
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {navigateTo} from "#imports";
+import type {CmsWebsite, CmsWebsiteParam} from "~/api/cms/cmsWebsite/model";
+import { ArrowLeft,View, Search } from '@element-plus/icons-vue'
+import {pageCmsArticle} from "~/api/cms/cmsArticle";
+import dayjs from "dayjs";
+import type {CmsArticle, CmsArticleParam} from "~/api/cms/cmsArticle/model";
+
+const props = withDefaults(
+    defineProps<{
+      param?: CmsWebsiteParam | any;
+      disabled?: boolean;
+      title?: string;
+      comments?: string;
+      fit?: any;
+    }>(),
+    {
+      fit: 'cover'
+    }
+);
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+}>();
+const list = ref<CmsArticle[]>([]);
+const id = ref<number>(0);
+const i18n = useI18n();
+const total = ref(0);
+
+const showMenu = (item: CmsWebsite) => {
+  id.value = Number(item.websiteId);
+};
+
+const hideMenu = () => {
+  id.value = 0;
+};
+
+// 搜索表单
+const where = reactive<CmsArticleParam>({
+  keywords: '',
+  page: 1,
+  limit: 12,
+  status: 0,
+  recommend: 1,
+  order: 'desc',
+  sort: 'actualViews',
+  parentId: undefined,
+  categoryId: 2838
+});
+
+// 请求数据
+const reload = async () => {
+  pageCmsArticle(where).then(response => {
+    if(response){
+      total.value = response.count;
+      list.value = response.list;
+    }
+  })
+}
+reload();
+</script>
diff --git a/components/Index/Partners.vue b/components/Index/Partners.vue
index 81c9b64..539eb9e 100644
--- a/components/Index/Partners.vue
+++ b/components/Index/Partners.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="xl:w-screen-xl m-auto py-4 px-4 sm:px-0">
     <div class="text-center flex flex-col items-center z-0 relative">
-      <h2 class="text-4xl font-bold tracking-tight text-gray-500 dark:text-white">
+      <h2 class="text-4xl font-bold tracking-tight text-gray-800 dark:text-white">
         {{ title || '合作伙伴' }}
       </h2>
       <div class="sub-title">
diff --git a/components/Index/SiteList.vue b/components/Index/SiteList.vue
index 2909a5d..03d2f49 100644
--- a/components/Index/SiteList.vue
+++ b/components/Index/SiteList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="xl:w-screen-xl m-auto py-4 px-4 sm:px-0">
     <div class="text-center flex flex-col items-center z-0 relative">
-      <h2 class="text-4xl font-bold tracking-tight text-gray-500 dark:text-white">
+      <h2 class="text-4xl font-bold tracking-tight text-gray-800 dark:text-white">
         {{ title || '产品服务' }}
       </h2>
       <div class="sub-title">
@@ -15,16 +15,16 @@
         <el-card :body-style="{ padding: '0px' }" class="h-[180px] items-center flex justify-center" shadow="hover" @mouseleave="hideMenu" @mouseover="showMenu(item)">
           <div class="flex-1 px-4 py-5 sm:p-4 !p-4">
             <div class="text-gray-700 dark:text-white text-base font-semibold  flex flex-col items-center gap-1.5">
-              <nuxt-link :to="`https://${item.adminUrl}`" target="_blank">
+              <nuxt-link :to="`/market/${item.websiteId}`" target="_blank">
                 <el-avatar
                   :size="55" :src="item.websiteLogo" shape="square" style="background-color: white;"/>
               </nuxt-link>
               <div class="flex-1 cursor-pointer flex flex-col text-center">
-                <nuxt-link :to="`https://${item.adminUrl}`" class="text-lg" target="_blank">{{ item.websiteName }}</nuxt-link>
+                <nuxt-link :to="`/market/${item.websiteId}`" target="_blank">
+                  <el-button type="text"><span class="text-lg text-gray-800">{{ item.websiteName }}</span></el-button>
+                </nuxt-link>
                 <div v-if="id == item.websiteId" class="flex text-gray-400 text-sm font-normal py2 justify-between items-center">
                   <div>
-                    <nuxt-link :to="`https://${item.adminUrl}`" target="_blank"><span class="text-gray-400 hover:text-green-700">控制台</span></nuxt-link>
-                    <el-divider direction="vertical" />
                     <nuxt-link :to="`/market/${item.websiteId}`"><span class="text-gray-400 hover:text-green-700">详情</span></nuxt-link>
                     <el-divider direction="vertical" />
                     <nuxt-link :to="`/market/${item.websiteId}`"><span class="text-gray-400 hover:text-green-700">评论</span></nuxt-link>
diff --git a/pages/ask/add.vue b/pages/ask/add.vue
index badb4f8..b8105ed 100644
--- a/pages/ask/add.vue
+++ b/pages/ask/add.vue
@@ -6,20 +6,20 @@
       <template #content>
         <span class="text-large font-600 line-clamp-1"> 发布文章 </span>
       </template>
-
       <div class="my-5 sm:my-10">
-        <el-form :model="form" label-width="auto" size="large">
-          <el-form-item label-position="left" label-width="0">
-            <el-input v-model="form.title" placeholder="文章标题"/>
+        <el-form ref="formRef" :model="form" :rules="rules" label-width="auto" size="large">
+          <el-form-item label-position="left" label-width="0" prop="title">
+            <el-input v-model="form.title" :maxlength="100" placeholder="文章标题"/>
           </el-form-item>
-          <el-form-item label-position="left" label-width="0">
+          <el-form-item label-position="left" label-width="0" prop="content">
             <!-- 编辑器 -->
-            <MdEditor v-model="form.content" @onUploadImg="onUploadImg"/>
+            <MdEditor v-model="form.content" placeholder="请填写文章内容" @onUploadImg="onUploadImg"/>
           </el-form-item>
           <el-form-item label="关联栏目" label-position="left">
-            <el-switch v-model="hasCategory" />
+            <el-switch v-model="hasCategory"/>
             <div v-if="hasCategory" class="mx-5">
-              <el-cascader v-model="category" :options="categoryList" placeholder="选项关联的栏目" @change="handleCategory" />
+              <el-cascader v-model="category" :options="categoryList" placeholder="选项关联的栏目"
+                           @change="handleCategory"/>
             </div>
           </el-form-item>
           <el-form-item label="选择话题" label-position="left">
@@ -38,22 +38,15 @@
               </el-select>
             </div>
           </el-form-item>
-          <el-form-item label-position="left" label-width="0">
-            <div class="m-auto text-center flex justify-center text-center items-center">
-              <el-button size="large" @click="saveDraft">存草稿</el-button>
-              <el-button class="sm:w-auto w-full" size="large" type="primary" @click="onRelease">发布</el-button>
-            </div>
+          <el-form-item label="保存操作" label-position="left">
+            <el-button size="large" @click="saveDraft">存草稿</el-button>
+            <el-button class="sm:w-auto" size="large" type="primary" @click="onRelease(formRef)">立即发布
+            </el-button>
           </el-form-item>
-
-
-          <div class="flex flex-col">
-            <el-form-item class="my-4" label-position="left">
-
-            </el-form-item>
-          </div>
         </el-form>
+        <div class="h-[20px]"></div>
+        <el-divider />
       </div>
-
     </el-page-header>
   </div>
 
@@ -66,14 +59,15 @@ import {MdEditor} from 'md-editor-v3';
 import 'md-editor-v3/lib/style.css';
 import type {CmsWebsite, CmsWebsiteParam} from "~/api/cms/cmsWebsite/model";
 import {addCmsArticle, pageCmsArticle, updateCmsArticle} from "~/api/cms/cmsArticle";
-import type {UploadUserFile} from 'element-plus'
 import useFormData from "~/utils/use-form-data";
 import {uploadOss} from "~/api/system/file";
+import type {FormInstance, FormRules, UploadProps, UploadUserFile} from 'element-plus'
 import {updateCmsWebsiteAll} from "~/api/cms/cmsWebsite";
 import {addShopMerchantApply, updateShopMerchantApply} from "~/api/shop/shopMerchantApply";
 import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
 import {listDictData} from "~/api/system/dict-data";
 import {getLang} from "~/utils/common";
+import type {ShopMerchantApply} from "~/api/shop/shopMerchantApply/model";
 
 const route = useRoute();
 const router = useRouter();
@@ -92,6 +86,7 @@ const srcList = ref<string[]>([])
 const inputWidth = ref<string>('180px');
 const showSearch = ref<boolean>(false);
 const loading = ref(false)
+const formRef = ref<FormInstance>()
 
 // 搜索表单
 const where = reactive<CmsWebsiteParam>({
@@ -188,6 +183,17 @@ const {form, assignFields} = useFormData<CmsArticle>({
   detail: undefined
 });
 
+const rules = reactive<FormRules<CmsArticle>>({
+  title: [
+    {required: true, message: '请输入文章标题', trigger: 'blur'},
+    {min: 5, message: '标题长度太短啦', trigger: 'blur'},
+  ],
+  content: [
+    {required: true, message: '请输入手机号码', trigger: 'blur'},
+    {pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur'},
+  ]
+})
+
 const goBack = () => {
   router.back();
 }
@@ -259,23 +265,31 @@ const saveDraft = () => {
 
 }
 
-const onRelease = () => {
+// 发布文章
+const onRelease = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
   if (loading.value) return // 防止重复提交
+  await formEl.validate(async (valid) => {
+    if (!valid) return;
+    form.files = undefined;
+    if (srcList.value.length > 0) {
+      form.files = JSON.stringify(srcList.value)
+    }
+    // if(!form.developer){
+    //   form.developer = developer.value;
+    // }
 
-  form.files = undefined;
-  if (srcList.value.length > 0) {
-    form.files = JSON.stringify(srcList.value)
-  }
-  // if(!form.developer){
-  //   form.developer = developer.value;
-  // }
-
-  loading.value = true
-  const saveOrUpdate = isUpdate.value ? updateCmsArticle : addCmsArticle;
-  saveOrUpdate(form).then(() => {
-    ElMessage.success('发布成功');
+    loading.value = true
+    const saveOrUpdate = isUpdate.value ? updateCmsArticle : addCmsArticle;
+    saveOrUpdate(form).then(() => {
+      assignFields({});
+      ElMessage.success('发布成功');
+      loading.value = false;
+    }).catch((err => {
+      console.log(err)
+      loading.value = false;
+    }));
   });
-
 }
 
 watch(
diff --git a/pages/case/[id].vue b/pages/case/[id].vue
index 7549f07..399adb7 100644
--- a/pages/case/[id].vue
+++ b/pages/case/[id].vue
@@ -1,13 +1,13 @@
 <template>
 
   <!-- 主体部分 -->
-  <div class="xl:w-screen-xl m-auto py-4 mt-20">
+  <div class="xl:w-screen-xl m-auto py-4 mt-12 px-4 sm:px-0 sm:mt-20">
     <el-page-header :icon="ArrowLeft" @back="goBack">
       <template #content>
         <span class="text-large font-600"> {{ page.title }} </span>
       </template>
       <el-row :gutter="24" id="container" class="clearfix">
-        <el-col v-for="(item,index) in list" :key="index" :span="6" class="left mb-8">
+        <el-col v-for="(item,index) in list" :key="index" :span="6" :xs="24" class="left mb-8">
           <el-card :body-style="{ padding: '0px' }" class=" hover:bg-gray-50 cursor-pointer" shadow="hover" @click="navigateTo(`/detail/${item.articleId}.html`)">
             <el-image
                 :src="item.image"
diff --git a/pages/case/index.vue b/pages/case/index.vue
index 53c6b68..165aa7c 100644
--- a/pages/case/index.vue
+++ b/pages/case/index.vue
@@ -35,7 +35,7 @@
         </el-dialog>
       </template>
       <el-row :gutter="24" id="container" class="clearfix">
-        <el-col v-for="(item,index) in list" :key="index" :xs="24" :sm="8" class="left mb-8">
+        <el-col v-for="(item,index) in list" :key="index" :span="6" :xs="24" class="left mb-8">
           <el-card shadow="hover" :body-style="{ padding: '0px' }" class="cursor-pointer" @mouseover="showDomain(item)"
                    @mouseleave="hideDomain">
             <nuxt-link :to="`/market/${item.websiteId}`">
diff --git a/pages/detail/[id].vue b/pages/detail/[id].vue
index d69e332..474da17 100644
--- a/pages/detail/[id].vue
+++ b/pages/detail/[id].vue
@@ -11,8 +11,8 @@
 
         <!-- 新闻详细 -->
         <div class=" bg-white">
-          <h1 class="pt-5 text-3xl">{{ form.title }}</h1>
-          <div class="flex items-center justify-between py-4">
+          <h1 class="pt-5 text-3xl text-center">{{ form.title }}</h1>
+          <div class="flex items-center justify-center py-4">
             <el-space size="large" class="text-gray-400">
               <span>{{ $t('createTime') }}：{{ dayjs(form.createTime).format('YYYY-MM-DD') }}</span>
               <span>{{ $t('author') }}：{{ form.author }}</span>
diff --git a/pages/developer/index.vue b/pages/developer/index.vue
index 362d40c..12ecdd4 100644
--- a/pages/developer/index.vue
+++ b/pages/developer/index.vue
@@ -10,13 +10,14 @@
         </el-space>
       </template>
       <template v-if="!isDeveloper">
-        <el-card class="m-5 w-screen-sm mt-24 mb-[200px] m-auto">
+        <el-card class="m-5 w-screen-sm mt-24 mb-[200px] m-auto flex justify-center text-center">
           <el-result
             icon="warning"
-            title="您还不是开发者！"
-            :sub-title="`请先完成实名认证`"
+            :sub-title="`审核通过后可管理您的应用`"
+            title="请先完成实名认证！"
           >
           </el-result>
+          <nuxt-link to="/user/auth"><el-button type="primary">加入开发者</el-button></nuxt-link>
         </el-card>
       </template>
       <template v-else>
diff --git a/pages/index.vue b/pages/index.vue
index 50f8399..5fd0185 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -7,13 +7,19 @@
   <LandingHero/>
 
   <!-- 站点列表 -->
-  <SiteList />
+  <SiteList/>
 
   <!-- 插件列表 -->
-<!--  <MarketList />-->
+  <!--  <MarketList />-->
+
+  <!-- 客户案例 -->
+  <CaseList/>
 
   <!-- 合作伙伴 -->
-  <Partners />
+  <Partners/>
+
+  <!-- 下单定制 -->
+  <Customized />
 
 </template>
 <script setup lang="ts">
@@ -32,6 +38,7 @@ import Carousel from "~/components/Index/Carousel.vue";
 import LandingHero from "~/components/Index/LandingHero.vue";
 import SiteList from "~/components/Index/SiteList.vue";
 import MarketList from "~/components/Index/MarketList.vue";
+import CaseList from "~/components/Index/CaseList.vue"
 import Partners from "~/components/Index/Partners.vue";
 import Customized from "~/components/Index/Customized.vue";
 
diff --git a/pages/market/[id].vue b/pages/market/[id].vue
index 0b0b3ad..e9e488b 100644
--- a/pages/market/[id].vue
+++ b/pages/market/[id].vue
@@ -1,53 +1,52 @@
 <template>
-    <!-- 主体部分 -->
-    <div class="xl:w-screen-xl m-auto py-4 mt-12 px-4 sm:px-0 sm:mt-20">
-      <el-page-header :icon="ArrowLeft" @back="goBack">
-        <template #content>
-          <span class="text-large font-600"> 产品详情 </span>
-        </template>
-        <template #extra>
-          <div class="h-[32px]"></div>
-        </template>
+  <!-- 主体部分 -->
+  <div class="xl:w-screen-xl m-auto py-4 mt-12 px-4 sm:px-0 sm:mt-20">
+    <el-page-header :icon="ArrowLeft" @back="goBack">
+      <template #content>
+        <span class="text-large font-600"> 产品详情 </span>
+      </template>
+      <template #extra>
+      </template>
 
-        <!-- 应用介绍 -->
-        <PageBanner :form="page" @done="reload"/>
+      <!-- 应用介绍 -->
+      <PageBanner :form="page" @done="reload"/>
 
-        <!-- 评分插件 -->
-        <AppInfo :form="form" />
+      <!-- 评分插件 -->
+      <AppInfo :form="form"/>
 
-        <!-- 应用截屏 -->
-        <div id="screen-item" class="screen-item my-6">
-          <el-descriptions title="截屏" class="mt-5" />
-          <el-scrollbar class="bg-white p-5">
-            <div class="flex" v-if="form.files">
-              <el-image
-                v-for="(item,index) in JSON.parse(form.files)"
-                :key="index"
-                class="scrollbar-item w-[240px] max-h-[625px] mr-4 mb-3"
-                :src="item"
-                :zoom-rate="1.2"
-                :max-scale="7"
-                :min-scale="0.2"
-                :preview-src-list="srcList"
-                :initial-index="4"
-                fit="contain"
-              />
-            </div>
-          </el-scrollbar>
-          <el-descriptions title="详细介绍" class="mt-5" />
-          <MdPreview id="preview-only" class="px-3" :modelValue="form.content || '暂无详细内容'" />
-        </div>
+      <!-- 应用截屏 -->
+      <div id="screen-item" class="screen-item my-6">
+        <el-descriptions class="mt-5" title="截屏"/>
+        <el-scrollbar class="bg-white p-5">
+          <div v-if="form.files" class="flex">
+            <el-image
+              v-for="(item,index) in JSON.parse(form.files)"
+              :key="index"
+              :initial-index="4"
+              :max-scale="7"
+              :min-scale="0.2"
+              :preview-src-list="srcList"
+              :src="item"
+              :zoom-rate="1.2"
+              class="scrollbar-item w-[240px] max-h-[625px] mr-4 mb-3"
+              fit="contain"
+            />
+          </div>
+        </el-scrollbar>
+        <el-descriptions class="mt-5" title="详细介绍"/>
+        <MdPreview id="preview-only" :modelValue="form.content || '暂无详细内容'" class="px-3"/>
+      </div>
 
-        <!-- 评分及评价 -->
-        <Comments :productId="form.companyId" :comments="comments" :count="commentsTotal" @done="doComments" />
+      <!-- 评分及评价 -->
+      <Comments :comments="comments" :count="commentsTotal" :productId="form.companyId" @done="doComments"/>
 
-        <div class="h-[100px]"></div>
+      <div class="h-[100px]"></div>
 
-      </el-page-header>
-    </div>
+    </el-page-header>
+  </div>
 </template>
 <script setup lang="ts">
-import { ArrowLeft,View, Monitor, Search,Cpu, Platform, Avatar } from '@element-plus/icons-vue'
+import {ArrowLeft, View, Monitor, Search, Cpu, Platform, Avatar, MoreFilled} from '@element-plus/icons-vue'
 import type {ApiResult, PageResult} from "~/api";
 import {useServerRequest} from "~/composables/useServerRequest";
 import {usePage} from "~/composables/configState";
@@ -59,13 +58,14 @@ import Comments from './components/Comments.vue';
 import type {CompanyComment} from "~/api/system/companyComment/model";
 import {getCmsWebsiteAll} from "~/api/cms/cmsWebsite";
 import type {CmsWebsite} from "~/api/cms/cmsWebsite/model";
-import { MdPreview } from 'md-editor-v3';
+import {MdPreview} from 'md-editor-v3';
 // preview.css相比style.css少了编辑器那部分样式
 import 'md-editor-v3/lib/preview.css';
 
 // 引入状态管理
 const route = useRoute();
 const router = useRouter();
+const user = useUser();
 const page = usePage();
 const comments = ref<CompanyComment[]>([]);
 const commentsTotal = ref(0);
@@ -194,7 +194,7 @@ const reloadComments = async () => {
       // status: 1
     }
   })
-  if(commentsResponse.value && commentsResponse.value?.data){
+  if (commentsResponse.value && commentsResponse.value?.data) {
     comments.value = commentsResponse.value?.data?.list
     commentsTotal.value = commentsResponse.value?.data?.count;
   }
@@ -217,7 +217,7 @@ const reload = async () => {
     }
 
     // 应用截图
-    if(data.files){
+    if (data.files) {
       const imgArr = JSON.parse(data.files);
       imgArr.map((item: any) => {
         srcList.value.push(item)
@@ -232,17 +232,17 @@ const reload = async () => {
     })
 
   }).catch(err => {
-    console.log(err,'加载失败...')
+    console.log(err, '加载失败...')
   })
 }
 
 watch(
-    () => route.params.id,
-    (id) => {
-      navId.value = getNavIdByParamsId(id);
-      reload();
-    },
-    { immediate: true }
+  () => route.params.id,
+  (id) => {
+    navId.value = getNavIdByParamsId(id);
+    reload();
+  },
+  {immediate: true}
 );
 </script>
 
@@ -253,9 +253,11 @@ watch(
     height: auto !important;
   }
 }
+
 .scrollbar-flex-content {
   display: flex;
 }
+
 .scrollbar-item {
   flex-shrink: 0;
   display: flex;
diff --git a/pages/market/components/PageBanner.vue b/pages/market/components/PageBanner.vue
index 9011604..6f33917 100644
--- a/pages/market/components/PageBanner.vue
+++ b/pages/market/components/PageBanner.vue
@@ -8,18 +8,30 @@
                 <el-image :src="form.websiteLogo" shape="square"
                            class="hidden-sm-and-down bg-white w-[128px] h-[128px] cursor-pointer rounded-avatar shadow-sm hover:shadow mr-6"/>
               </template>
-              <div class="title flex flex-col">
-                <h1
+              <div class="title flex flex-col justify-between">
+                <div>
+                  <h1
                     class="text-2xl font-bold tracking-tight text-gray-900 dark:text-white sm:text-3xl lg:text-3xl">
-                  <el-space>
-                    <span>{{ form.websiteName }}</span>
-                  </el-space>
-                </h1>
-                <div class="my-1 text-sm text-gray-500 w-auto sm:max-w-3xl max-w-xs flex-1 dark:text-gray-400">
-                  {{ form?.comments || desc }}
+                    <el-space>
+                      <span>{{ form.websiteName }}</span>
+                    </el-space>
+                  </h1>
+                  <div class="text-sm mt-1 text-gray-500 w-auto sm:max-w-4xl line-clamp-2 max-w-xs  dark:text-gray-400">
+                    {{ form?.comments }}
+                  </div>
                 </div>
                 <el-space class="btn">
-                  <nuxt-link target="_blank"><el-button type="primary" round>获取</el-button></nuxt-link>
+                  <nuxt-link v-if="form.domain" :to="`https://${form.domain}`" target="_blank"><el-button round type="primary">访问</el-button></nuxt-link>
+                  <nuxt-link v-if="form.adminUrl" :to="`https://${form.adminUrl}`" target="_blank"><el-button round>管理</el-button></nuxt-link>
+<!--                  <el-dropdown>-->
+<!--                    <el-button :icon="MoreFilled" round></el-button>-->
+<!--                    <template #dropdown>-->
+<!--                      <el-dropdown-menu>-->
+<!--                        <el-dropdown-item @click="openUrl(`https://git.websoft.top`)">源码</el-dropdown-item>-->
+<!--                        <el-dropdown-item divided><nuxt-link to="/developer">编辑</nuxt-link></el-dropdown-item>-->
+<!--                      </el-dropdown-menu>-->
+<!--                    </template>-->
+<!--                  </el-dropdown>-->
                 </el-space>
               </div>
             </div>
@@ -33,6 +45,7 @@
 import type {ApiResult} from "~/api";
 import type {Company} from "~/api/system/company/model";
 import type {CmsWebsite} from "~/api/cms/cmsWebsite/model";
+import {MoreFilled} from "@element-plus/icons-vue";
 
 const token = useToken();
 
diff --git a/pages/market/index.vue b/pages/market/index.vue
index 4796ced..b094131 100644
--- a/pages/market/index.vue
+++ b/pages/market/index.vue
@@ -39,6 +39,12 @@
       <SearchBar :where="where" id="search" />
 
       <!-- 应用列表 -->
+
+      <el-tabs>
+        <el-tab-pane label="全部" name="all">
+          <el-button :icon="View" class="hidden-sm-and-up" @click="showSearch = true"></el-button>
+        </el-tab-pane>
+      </el-tabs>
       <el-row :gutter="24" id="container" class="clearfix">
         <el-col v-for="(item,index) in list" :key="index" :xs="24" :sm="8" class="left mb-8">
           <el-card shadow="hover" :body-style="{ padding: '0px' }" class="cursor-pointer" @mouseover="showDomain(item)"
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 85b3025..c1c3529 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -12,16 +12,16 @@
           <el-card :body-style="{ padding: '0px' }" class="h-[180px] items-center flex justify-center" shadow="hover" @mouseleave="hideMenu" @mouseover="showMenu(item)">
             <div class="flex-1 px-4 py-5 sm:p-4 !p-4">
               <div class="text-gray-700 dark:text-white text-base font-semibold  flex flex-col items-center gap-1.5">
-                <nuxt-link :to="`https://${item.adminUrl}`" target="_blank">
+                <nuxt-link :to="`/market/${item.websiteId}`" target="_blank">
                   <el-avatar
                     :size="55" :src="item.websiteLogo" shape="square" style="background-color: white;"/>
                 </nuxt-link>
                 <div class="flex-1 cursor-pointer flex flex-col text-center">
-                  <nuxt-link :to="`https://${item.adminUrl}`" class="text-lg" target="_blank">{{ item.websiteName }}</nuxt-link>
+                  <nuxt-link :to="`/market/${item.websiteId}`" target="_blank">
+                    <el-button type="text"><span class="text-lg text-gray-800">{{ item.websiteName }}</span></el-button>
+                  </nuxt-link>
                   <div v-if="id == item.websiteId" class="flex text-gray-400 text-sm font-normal py2 justify-between items-center">
                     <div>
-                      <nuxt-link :to="`https://${item.adminUrl}`" target="_blank"><span class="text-gray-400 hover:text-green-700">控制台</span></nuxt-link>
-                      <el-divider direction="vertical" />
                       <nuxt-link :to="`/market/${item.websiteId}`"><span class="text-gray-400 hover:text-green-700">详情</span></nuxt-link>
                       <el-divider direction="vertical" />
                       <nuxt-link :to="`/market/${item.websiteId}`"><span class="text-gray-400 hover:text-green-700">评论</span></nuxt-link>
diff --git a/pages/user/modify.vue b/pages/user/modify.vue
index 707205b..3c32446 100644
--- a/pages/user/modify.vue
+++ b/pages/user/modify.vue
@@ -151,6 +151,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
 }
 
 const onSubmit = () => {
+  form.tenantId = Number(localStorage.getItem('ServerTenantId'));
   updateUser(form).then(() => {
     ElMessage.success('修改成功');
   });
diff --git a/public/favicon.ico b/public/favicon.ico
index 4cfa356992e8dbf8fcf43a75aa63469cd90ada45..4d9aa97808f3df7f8533a8ec5adaac75960ce152 100644
GIT binary patch
delta 551
zcmV+?0@(eW2KxjM000310RRvX00000AOK|okq{XU5C8xG5C{eU001BJ|6!3gOMe05
zNkl<ZIE}57O=^@u5Qg9S>2JP~;L4bgiNQ!v!~+Nu7m}SW1l?!h0mOwMxNz?#pdLUy
zhbtGxI|LLo%p4#?g5Pv^b-CzCWD*I2_PXk!>#e5<e|YU+SU}<+asYrk!Hv4{7d~A}
z^NpJY5)7;cmNEw@#wb}}NxJbapML?gt9K02WY;ExgF%7;GXR`mNl=ndjtYy~jXui>
zpdD-$XfL_83EIohCWF+#TmhvJJPUGE<f&5b0`fF;<6Tw&fCO`GGPIWw+6d|8I*ODE
zFoq=oaRC5FA@afi!0ljI>de8QO}@GFVG*HC9{Ta&MGhV=L=XLl(5CBe-+wRSctlof
z2g9Nuaj?|zNX-(#rO6cf>Eo3fv;fG_x4pRX_{oYL0wAsVSS%oM2GML?<Y0E25;mUi
zTmv_G`N8)3>Z9#-aFfHrTAL??n#-(*$j|Kc`<oXdi;ShM`%4xXN23~p9RNRGKixlF
zuT>H!zzL<09Uj1@gy!n)OMEs3@`SK_@8zvLnT1(Ot)2BL+~_1_2?9%Esp>I)_v|YG
zT;6)MQNNJ{US&cth8tB6*6t<`ZG`sIxofnkB6SV&&p@eby8TZ<kI6)=j+r=K7?#cv
pDJm@eHu0ZT{x8Qg5BmFa{skHcE;F`1xA*`6002ovPDHLkV1kwP_Jsfd

delta 714
zcmV;*0yX{n1e^vC000310RS*C00000AOHpfkq{XUFaQ7mFbD<!00374`G=7=OMe1{
zNkl<ZXo2mRKWG#|6vlrSQ}_=X6$H~5wGku;T38qqL{Ka((n)F?OR*8Ovrq`e%0f$n
zU_cwOlT@OfmZGRw7|<eM6pcvE;%2#bvu}21ZfEuq*$;-@dHcOL-{Z~f><%<&(4Yu2
zKxfEprbuARVc!XS4Nf;LwgNwGqkk)bj=28-JW8R+180G~qVLk%hokh$cOrqPP>j*j
zGvVX#M>t3<0e2PKlx156j)bZ#L8j+<2w5huU9rt6wkM{)T0v})rgjL~uD}9t&a%A*
z_E|QsK>`safnma#z)1aC;$qz=Fk13_Elnd8|9u6#cD@?moC)i`0;v<&4}Tm^IY8MI
z8U){f9gb%of$^Aw#jL<vx^q>EZ_~f|>@l3Bh~wrk$WEN`zgvC#Il!+9@ssStnULGS
zHsG4+PYcc^bDaV<0kf8GRD@LEq~SeQ{I$4$MgN(x9SG1A{bNq!bx?l&fE5QfWSk^Z
z=(4!ae*f&xZh-6NDnGyPM1L4R2j2?ZS2*WO{5rr*#WwG$DOZ6i`@ks?+{QwI-!%DO
z&f^ty<ltL@-xjw@)7FfpDe4;dVXiIF<`kQ301p(~N(CJ`_*US8;fx8}M2TOA?yEP$
zZezRQsVT{8bWyRrSGX^fnC}9{sdXRFj#XA2+@bCRo5cVb9@3rL8-FZr3;1k_0@zYf
zLk^)Ib5{j_qlmFAIEy0QsNi1-)RgR8Xjb@K1isK)um{ckE8v#k-3y4HJOO~ymTyrz
z6BxUe1Tq}MEqrpon6)O50zq$~6o<31@Y07gPJb1KdGs=3Y1!rL_=)m`Sa*99n*CZz
w;;Bod&(Yx|aL6y`=pSg){daEApn(Jb0Ajs%Z0~$JKmY&$07*qoM6N<$f{&0)jQ{`u

diff --git a/utils/request.ts b/utils/request.ts
index 36159d3..ba6bc3b 100644
--- a/utils/request.ts
+++ b/utils/request.ts
@@ -1,11 +1,17 @@
 import type { UseFetchOptions } from '#app';
 import {useToken} from "~/composables/configState";
-import {getTenantId} from "~/utils/domain";
 
 export const request = <T>(url:string, options?: UseFetchOptions<T, unknown>) => {
     const nuxtApp = useNuxtApp()
     const config = useRuntimeConfig()
-    const TenantId = localStorage.getItem('TenantId') || `${config.public.tenantId}`;
+    let TenantId = localStorage.getItem('TenantId') || `${config.public.tenantId}`;
+    const body = options?.body;
+    // @ts-ignore
+    const tenantIdByOptions = body?.tenantId;
+    if(tenantIdByOptions){
+      // 自定义传TenantId
+      TenantId = tenantIdByOptions;
+    }
     return useFetch<T>(url,{
         baseURL: config.public.apiBaseUrl,
         onRequest({ options }: any){