新版本官网优化完成

pages/market/[id].vue

@@ -1,41 +1,26 @@
-<!-- 文章详情 -->
 <template>
-  <PageBanner :form="page" @done="reload"/>
-  <div class="page-main md:w-screen-xl m-auto p-3">
-    <el-row :gutter="24">
-      <el-col :span="18" :xs="24">
-        <el-card shadow="hover" class="mb-5">
-          <el-descriptions title="参数信息" :column="2" border>
-            <el-descriptions-item :span="2" label="产品名称">{{page.title}}</el-descriptions-item>
-            <el-descriptions-item v-if="form.isBuy" label="租户ID"><span class="text-orange-500">{{form.title}}</span></el-descriptions-item>
-            <el-descriptions-item v-if="form.isBuy" label="插件ID"><span class="text-orange-500">{{form.menuId || '-'}}</span></el-descriptions-item>
-            <el-descriptions-item label="控制台"><a class="cursor-pointer" @click="openUrl(`https://${form.domain}`)">{{form.domain}}</a></el-descriptions-item>
-            <el-descriptions-item v-for="(item,index) in form.parameters" :key="index" :label="item.name">{{ item.value }}</el-descriptions-item>
-          </el-descriptions>
-          <template v-if="form.accounts && form.accounts.length > 0">
-            <div class="h-[24px]"></div>
-            <el-descriptions title="登录账号" :column="1" border>
-              <template  v-for="(item,index) in form.accounts" :key="index">
-                <el-descriptions-item :label="item.type" v-if="item.account">
-                  还没有账号? <el-button type="text" @click="openSpmUrl(`/passport/regis`)">立即注册</el-button>
-                </el-descriptions-item>
-              </template>
-            </el-descriptions>
-          </template>
-          <template v-if="form.gits && form.gits.length > 0">
-            <div class="h-[24px]"></div>
-            <el-descriptions title="代码仓库" :column="1" border>
-              <el-descriptions-item v-for="(item,index) in form.gits" :key="index" :label="item.title">
-                <el-input  v-model="item.domain" readonly />
-              </el-descriptions-item>
-            </el-descriptions>
-          </template>
-          <template v-if="form.files && form.files.length > 0">
-            <div class="h-[24px]"></div>
-            <el-descriptions title="图文详情" />
-            <div v-for="(item,index) in JSON.parse(form.files)" :key="index" class="text item">
+  <!-- 主体部分 -->
+  <div class="xl:w-screen-xl m-auto py-4 mt-20">
+    <el-page-header :icon="ArrowLeft" @back="goBack">
+      <template #content>
+        <span class="text-large font-600 mr-3"> 产品详情 </span>
+      </template>
+      <template #extra>
+        <div class="h-[32px]"></div>
+      </template>
+      <PageBanner :form="page" @done="reload"/>
+      <el-divider />
+      <AppInfo :form="form" />
+
+      <div class="screen-item my-6">
+        <el-descriptions title="截屏" />
+        <el-scrollbar>
+          <div class="flex" v-if="form.files">
               <el-image
-                  :src="item"
+                  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.url"
                   :zoom-rate="1.2"
                   :max-scale="7"
                   :min-scale="0.2"
@@ -43,161 +28,150 @@
                   :initial-index="4"
                   fit="contain"
               />
-            </div>
-          </template>
-          <template v-if="form.content">
-            <p v-html="form.content" class="content"></p>
-          </template>
-        </el-card>
-        <!-- 产品评论 -->
-        <Comments :productId="form.companyId" :comments="comments" :count="commentsTotal" @done="doComments" />
-      </el-col>
-      <el-col :span="6" :xs="24">
-        <el-card shadow="hover" class="mb-5">
-          <template #header>
-            <div class="card-header font-bold text-xl">
-              <span>推荐产品</span>
-            </div>
-          </template>
-<!--          <el-space class="flex items-center">-->
-<!--            <div class="avatar">-->
-<!--              <el-avatar :size="55" :src="form.image"/>-->
-<!--            </div>-->
-<!--            <div class="flex flex-col">-->
-<!--              <span class="font-bold text-lg text-gray-600">{{ form.title }}</span>-->
-<!--              <span class="text-gray-400 pb-1 line-clamp-2">{{ form.comments }}</span>-->
-<!--            </div>-->
-<!--          </el-space>-->
-        </el-card>
-      </el-col>
-    </el-row>
+          </div>
+        </el-scrollbar>
+        <p v-html="form?.content || '介绍'" class="content"></p>
+      </div>
+
+      <el-divider />
+      <!-- 评分及评价 -->
+      <Comments :productId="form.companyId" :comments="comments" :count="commentsTotal" @done="doComments" />
+      <div class="h-[100px]"></div>
+    </el-page-header>
   </div>
 
+
 </template>
 <script setup lang="ts">
-import {Cpu,Download,Star,Coin,Tickets} from '@element-plus/icons-vue'
+import { ArrowLeft,View, Monitor, Search,Cpu, Platform, Avatar } from '@element-plus/icons-vue'
 import type {ApiResult, PageResult} from "~/api";
 import {useServerRequest} from "~/composables/useServerRequest";
-import {useLayout, usePage, useWebsite} from "~/composables/configState";
-import type {BreadcrumbItem} from "~/types/global";
+import {usePage} from "~/composables/configState";
 import {getIdBySpm, getNavIdByParamsId, openUrl} from "~/utils/common";
 import useFormData from "~/utils/use-form-data";
 import PageBanner from './components/PageBanner.vue';
+import AppInfo from './components/AppInfo.vue';
 import Comments from './components/Comments.vue';
-import type {Company} from "~/api/system/company/model";
 import type {CompanyComment} from "~/api/system/companyComment/model";
-import {getCmsNavigation, listCmsNavigation} from "~/api/cms/cmsNavigation";
-import {getCmsArticle, pageCmsArticle} from "~/api/cms/cmsArticle";
-import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
-import type {CmsArticle, CmsArticleParam} from "~/api/cms/cmsArticle/model";
+import {getCmsWebsiteAll} from "~/api/cms/cmsWebsite";
 import type {CmsWebsite} from "~/api/cms/cmsWebsite/model";
-import {getCmsWebsite} from "~/api/cms/cmsWebsite";
+import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
+import Banner from "~/components/Banner.vue";
 
 // 引入状态管理
 const route = useRoute();
+const router = useRouter();
 const page = usePage();
-const layout = useLayout();
-const category = ref<CmsNavigation[]>([]);
-const i18n = useI18n();
-const total = ref(0);
-const list = ref<CmsArticle[]>([]);
-const website = useWebsite();
-const breadcrumb = ref<BreadcrumbItem>();
 const comments = ref<CompanyComment[]>([]);
 const commentsTotal = ref(0);
 const commentsPage = ref(1);
 const navId = ref();
-const activeName = ref();
-const url =
-    'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg'
 const srcList = ref<any[]>([]);
 
 // 配置信息
 const {form, assignFields} = useFormData<CmsWebsite>({
-  // 文章id
-  articleId: undefined,
-  // 文章模型
-  model: undefined,
-  // 文章标题
-  title: undefined,
-  // 分类类型
-  type: undefined,
-  // 展现方式
-  showType: undefined,
-  // 文章类型
-  categoryId: undefined,
-  // 文章分类
-  categoryName: undefined,
-  parentId: undefined,
-  // 封面图
-  image: undefined,
-  // 附件
-  files: undefined,
-  // 附件
-  fileList: [],
-  // 缩列图
-  thumbnail: undefined,
-  // 视频地址
-  video: undefined,
-  // 上传的文件类型
-  accept: undefined,
-  // 来源
-  source: undefined,
-  // 标签
-  tags: undefined,
-  // 文章内容
-  content: undefined,
-  // 虚拟阅读量
-  virtualViews: undefined,
-  // 实际阅读量
-  actualViews: undefined,
-  // 访问权限
-  permission: undefined,
-  // 访问密码
-  password: undefined,
-  password2: undefined,
-  // 用户ID
-  userId: undefined,
-  // 用户昵称
-  nickname: undefined,
-  // 账号
-  username: undefined,
-  // 用户头像
-  // userAvatar: undefined,
-  author: undefined,
-  // 所属门店ID
-  shopId: undefined,
-  //
+  // 站点ID
+  websiteId: undefined,
+  // 网站名称
+  websiteName: undefined,
+  // 网站标识
+  websiteCode: undefined,
+  // 网站LOGO
+  websiteIcon: undefined,
+  // 网站LOGO
+  websiteLogo: undefined,
+  // 网站LOGO(深色模式)
+  websiteDarkLogo: undefined,
+  // 网站类型
+  websiteType: undefined,
+  // 评分
+  rate: undefined,
+  // 点赞数
   likes: undefined,
-  // 排序
-  sortNumber: undefined,
+  // 访问量
+  clicks: undefined,
+  // 下载量
+  downloads: undefined,
+  // 网站截图
+  files: undefined,
+  // 网站关键词
+  keywords: undefined,
+  // 域名前缀
+  prefix: undefined,
+  // 绑定域名
+  domain: undefined,
+  // 全局样式
+  style: undefined,
+  // 后台管理地址
+  adminUrl: undefined,
+  // 应用版本 10免费版 20专业版 30永久授权
+  version: undefined,
+  // 服务到期时间
+  expirationTime: undefined,
+  // 模版ID
+  templateId: undefined,
+  // 行业类型(父级)
+  industryParent: undefined,
+  // 行业类型(子级)
+  industryChild: undefined,
+  // 企业ID
+  companyId: undefined,
+  // 所在国家
+  country: undefined,
+  // 所在省份
+  province: undefined,
+  // 所在城市
+  city: undefined,
+  // 所在辖区
+  region: undefined,
+  // 经度
+  longitude: undefined,
+  // 纬度
+  latitude: undefined,
+  // 街道地址
+  address: undefined,
+  // 联系电话
+  phone: undefined,
+  // 电子邮箱
+  email: undefined,
+  // ICP备案号
+  icpNo: undefined,
+  // 公安备案
+  policeNo: undefined,
   // 备注
   comments: undefined,
-  // 状态
+  // 是否推荐
+  recommend: undefined,
+  // 运行状态
+  running: undefined,
+  // 状态 0未开通 1运行中 2维护中 3已关闭 4已欠费停机 5违规关停
   status: undefined,
+  // 维护说明
+  statusText: undefined,
+  // 关闭说明
+  statusClose: undefined,
+  // 状态图标
+  statusIcon: undefined,
+  // 全局样式
+  styles: undefined,
+  content: undefined,
+  // 排序号
+  sortNumber: undefined,
+  // 用户ID
+  userId: undefined,
+  // 是否删除, 0否, 1是
+  deleted: undefined,
+  // 租户id
+  tenantId: undefined,
   // 创建时间
   createTime: undefined,
-  // 更新时间
+  // 修改时间
   updateTime: undefined,
-  // 租户ID
-  tenantId: undefined,
-  // 租户名称
-  tenantName: undefined,
-  // 租户logo
-  logo: undefined,
-  // 详情页路径
-  detail: undefined
-});
-
-// 搜索表单
-const where = reactive<CmsArticleParam>({
-  keywords: '',
-  page: 1,
-  limit: 20,
-  status: 0,
-  parentId: undefined,
-  categoryId: undefined,
-  lang: i18n.locale.value
+  // 网站配置
+  config: undefined,
+  topNavs: undefined,
+  bottomNavs: undefined,
+  loginUser: undefined
 });
 
 const doComments = async (page: any) => {
@@ -221,9 +195,13 @@ const reloadComments = async () => {
   }
 }
 
+const goBack = () => {
+  router.back();
+}
+
 // 读取导航详情
 const reload = async () => {
-  getCmsWebsite(navId.value).then(data => {
+  getCmsWebsiteAll(navId.value).then(data => {
     // 获取栏目信息
     assignFields(data)
     page.value = {
@@ -231,7 +209,15 @@ const reload = async () => {
       title: data.websiteName,
       categoryName: '应用市场',
       ...data,
-      }
+    }
+
+    // 应用截图
+    if(data.files){
+      const imgArr = JSON.parse(data.files);
+      imgArr.map((item: any) => {
+        srcList.value.push(item.url)
+      })
+    }
 
     // 设置页面标题
     useSeoMeta({
@@ -240,25 +226,6 @@ const reload = async () => {
       titleTemplate: `${data?.websiteName}` + ' - %s',
     })
 
-    // 二级栏目分类
-    // listCmsNavigation({
-    //   parentId: data.parentId == 0 ? data.navigationId : data.parentId
-    // }).then(categoryData => {
-    //   category.value = categoryData;
-    //   // 加载文章列表
-    //   if(data.parentId == 0 && category.value.length > 0){
-    //     where.parentId = data.navigationId;
-    //   }else {
-    //     where.categoryId = data.navigationId;
-    //   }
-    //   pageCmsArticle(where).then(response => {
-    //     if(response){
-    //       total.value = response?.count;
-    //       list.value = response?.list;
-    //     }
-    //   })
-    // })
-
   }).catch(err => {
     console.log(err,'加载失败...')
   })
@@ -281,4 +248,14 @@ watch(
     height: auto !important;
   }
 }
+.scrollbar-flex-content {
+  display: flex;
+}
+.scrollbar-item {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
 </style>

pages/market/components/AppInfo.vue

@@ -0,0 +1,82 @@
+<template>
+  <div v-if="form" class="app-info flex justify-around items-center">
+    <div class="item text-center">
+      <div class="rate text-gray-400">评分</div>
+      <div class="text-2xl font-bold">3.1</div>
+      <el-rate v-model="form.rate" disabled size="small"/>
+    </div>
+    <el-divider class="opacity-40" style="height: 40px" direction="vertical" />
+    <div class="item text-center flex flex-col items-center">
+      <div class="text-gray-400">插件ID</div>
+      <el-icon size="24" class="py-1"><Cpu /></el-icon>
+      <span class="text-gray-500">{{ form.websiteCode }}</span>
+    </div>
+    <el-divider class="opacity-40" style="height: 40px" direction="vertical" />
+    <nuxt-link class="item text-center flex flex-col items-center">
+      <div class="text-gray-400">类型</div>
+      <el-icon size="24" class="py-1"><Monitor /></el-icon>
+      <span class="text-gray-500">{{ '小程序' }}</span>
+    </nuxt-link>
+    <el-divider class="opacity-40" style="height: 40px" direction="vertical" />
+    <nuxt-link :to="`https://${form.tenantId}.wsdns.cn`" class="item text-center flex flex-col items-center">
+      <div class="text-gray-400">开发者</div>
+      <el-icon size="24" class="py-1"><Avatar /></el-icon>
+      <span class="text-gray-500">{{'WebSoft Inc.'}}</span>
+    </nuxt-link>
+    <el-divider class="opacity-40" style="height: 40px" direction="vertical" />
+    <div class="item text-center flex flex-col items-center">
+      <div class="text-gray-400">下载次数</div>
+<!--      <div>#<span class="text-2xl font-bold">13</span></div>-->
+      <el-icon size="24" class="py-1"><Download /></el-icon>
+      <span class="text-gray-500">{{ form.downloads }}</span>
+    </div>
+    <el-divider class="opacity-40" style="height: 40px" direction="vertical" />
+    <div class="item text-center">
+      <div class="text-gray-400">大小</div>
+      <div class="text-2xl font-bold">26</div>
+      <span class="text-gray-400">MB</span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ArrowLeft,View, Menu, Search, Cpu,Monitor, Download, Platform, Avatar } from '@element-plus/icons-vue'
+import type {CmsWebsite} from "~/api/cms/cmsWebsite/model";
+import {getTenantIdByDomain} from "~/api/cms/cmsDomain";
+import {listTenant} from "~/api/system/tenant";
+
+const i18n = useI18n();
+
+const props = withDefaults(
+    defineProps<{
+      title?: string;
+      desc?: string;
+      buyUrl?: string;
+      form?: CmsWebsite;
+      value?: number;
+    }>(),
+    {}
+);
+
+const emit = defineEmits<{
+  (e: 'done', where: any): void
+}>()
+
+// 搜索表单
+const where = reactive<any>({
+  keywords: '',
+  page: 1,
+  limit: 20,
+  status: 0,
+  parentId: undefined,
+  categoryId: undefined,
+  lang: i18n.locale.value
+});
+
+const reload = () => {
+
+}
+reload();
+</script>
+<style scoped lang="less">
+</style>

pages/market/components/Comments.vue

@@ -1,4 +1,10 @@
 <template>
+  <el-descriptions title="评分及评价">
+    <template #extra>
+      <el-button type="text" @click="onComplaint">投诉</el-button>
+      <el-button type="text" @click="onComments">发表评论</el-button>
+    </template>
+  </el-descriptions>
   <form
       ref="formRef"
       :model="form"
@@ -8,54 +14,42 @@
       size="large"
       status-icon
   >
-    <el-card shadow="hover" v-if="comments" class="mb-5">
-      <template #header>
-        <div class="card-header font-bold text-xl flex justify-between">
-          <span>评分和评价</span>
-          <div class="comments">
-            <el-button @click="onComplaint">投诉</el-button>
-            <el-button type="primary" @click="onComments">发表评论</el-button>
-          </div>
-        </div>
-      </template>
-      <template #default>
-        <template v-if="comments.length > 0">
-          <div class="w-full">
-            <div v-for="(item,index) in comments" :key="index"
-                 class="flex flex-col border-b-2 border-gray-200 pb-2 mb-3"
-                 style="border-bottom:1px solid #f3f3f3">
-              <el-space class="user-info flex items-start" style="align-items:normal">
-                <div class="avatar">
-                  <el-avatar :src="item.logo"/>
-                </div>
-                <div class="nickname flex flex-col">
-                  <el-space class="text-sm text-gray-900">
-                    <span class="font-bold">{{ item.tenantName }}</span>
-                    <el-rate v-model="item.rate" disabled size="small"/>
-                  </el-space>
-                  <span class="text-xs text-gray-400">{{ item.createTime }}</span>
-                  <div class="comments py-2" v-html="item.comments"></div>
-                  <template v-if="item.children" v-for="(sub,index2) in item.children" :key="index2">
-                    <el-space class="text-sm text-gray-900">
-                      <el-avatar :src="sub.logo" size="small"/>
-                      <span class="font-bold">{{ sub.tenantName }}</span>
-                      <span class="text-xs text-gray-400">{{ sub.createTime }}</span>
-                    </el-space>
-                    <div class="comments py-2" v-html="sub.comments"></div>
-                  </template>
-                </div>
-              </el-space>
+    <template v-if="comments && comments.length > 0">
+      <div class="w-full">
+        <div v-for="(item,index) in comments" :key="index"
+             class="flex flex-col border-b-2 border-gray-200 pb-2 mb-3"
+             style="border-bottom:1px solid #f3f3f3">
+          <el-space class="user-info flex items-start" style="align-items:normal">
+            <div class="avatar">
+              <el-avatar :src="item.logo"/>
             </div>
-          </div>
-          <div class="pagination flex justify-center">
-            <el-pagination background layout="prev, pager, next" size="small" :total="count" @change="onPageChange"/>
-          </div>
-        </template>
-        <template v-else>
-          暂无用户评论
-        </template>
-      </template>
-    </el-card>
+            <div class="nickname flex flex-col">
+              <el-space class="text-sm text-gray-900">
+                <span class="font-bold">{{ item.tenantName }}</span>
+                <el-rate v-model="item.rate" disabled size="small"/>
+              </el-space>
+              <span class="text-xs text-gray-400">{{ item.createTime }}</span>
+              <div class="comments py-2" v-html="item.comments"></div>
+              <template v-if="item.children" v-for="(sub,index2) in item.children" :key="index2">
+                <el-space class="text-sm text-gray-900">
+                  <el-avatar :src="sub.logo" size="small"/>
+                  <span class="font-bold">{{ sub.tenantName }}</span>
+                  <span class="text-xs text-gray-400">{{ sub.createTime }}</span>
+                </el-space>
+                <div class="comments py-2" v-html="sub.comments"></div>
+              </template>
+            </div>
+          </el-space>
+        </div>
+      </div>
+      <div class="pagination flex justify-center">
+        <el-pagination background layout="prev, pager, next" size="small" :total="count" @change="onPageChange"/>
+      </div>
+    </template>
+    <template v-else>
+      暂无用户评论
+    </template>
+
     <!-- 发表评论 -->
     <el-dialog
         v-model="visible"

pages/market/components/PageBanner.vue

@@ -1,71 +1,39 @@
 <template>
-  <div class="banner m-auto relative sm:flex mt-15">
-    <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">
-      <Breadcrumb :data="form" :categoryName="form?.categoryName"/>
-      <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 class="banner m-auto relative sm:flex">
+    <div class="md:w-screen-xl m-auto py-10">
         <div class="gap-8 sm:gap-y-16 lg:items-center" v-if="form">
           <div class="w-full sm:px-0 px-4">
             <div class="flex flex-1">
-              <template v-if="form.image">
-                <el-image :src="form.image" shape="square"
-                           class="hidden-sm-and-down bg-white w-[128px] h-[128px] cursor-pointer rounded-avatar shadow-sm hover:shadow mr-4"/>
-<!--                <el-image :src="form.image" shape="square" :size="80"-->
-<!--                           class="hidden-sm-and-up bg-white rounded-avatar-xs shadow-sm hover:shadow mr-4"/>-->
+              <template v-if="form.websiteLogo">
+                <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
-                    class="text-2xl font-bold tracking-tight text-gray-900 dark:text-white sm:text-3xl lg:text-4xl">
-                  <span v-if="form.title">{{ form.title }}</span>
+                    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 }}
                 </div>
-                <!--                <a class="company-name text-sm my-1">-->
-                <!--                  {{ form.companyName || 'WebSoft Inc.' }}-->
-                <!--                </a>-->
-                <el-rate v-model="form.rate" disabled />
-                <div class="btn">
-                  <el-space class="mt-4">
-                    <el-button>产品控制台</el-button>
-                    <el-button>帮助文档</el-button>
-                  </el-space>
-                </div>
+                <el-space class="btn">
+                  <nuxt-link target="_blank"><el-button type="primary" round>获取</el-button></nuxt-link>
+                </el-space>
               </div>
             </div>
           </div>
         </div>
-      </div>
+<!--      {{ form }}-->
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import {FullScreen} from '@element-plus/icons-vue'
-import Breadcrumb from "~/components/Breadcrumb.vue";
 import type {ApiResult} from "~/api";
 import type {Company} from "~/api/system/company/model";
-import type {CmsArticle} from "~/api/cms/cmsArticle/model";
+import type {CmsWebsite} from "~/api/cms/cmsWebsite/model";
 
 const token = useToken();
 
@@ -74,7 +42,7 @@ const props = withDefaults(
       title?: string;
       desc?: string;
       buyUrl?: string;
-      form?: CmsArticle;
+      form?: CmsWebsite;
       value?: number;
     }>(),
     {}
@@ -95,7 +63,7 @@ const onBuy = (item: Company) => {
   if (!token.value || token.value == '') {
     ElMessage.error('请先登录');
     setTimeout(() => {
-      openSpmUrl(`/product/create`, item, item.companyId)
+      navigateTo(`/product/create`)
     }, 500)
 
   }

pages/market/components/SearchBar.vue

@@ -0,0 +1,45 @@
+<template>
+  <el-space class="flex items-center">
+    <el-input v-model="where.keywords" :placeholder="`${$t('searchKeywords')}...`" :suffix-icon="Search" @change="reload"/>
+  </el-space>
+</template>
+
+<script setup lang="ts">
+import { Search } from '@element-plus/icons-vue'
+import type {CmsArticle} from "~/api/cms/cmsArticle/model";
+
+const i18n = useI18n();
+
+const props = withDefaults(
+    defineProps<{
+      title?: string;
+      desc?: string;
+      buyUrl?: string;
+      form?: CmsArticle;
+      value?: number;
+    }>(),
+    {}
+);
+
+const emit = defineEmits<{
+  (e: 'done', where: any): void
+}>()
+
+// 搜索表单
+const where = reactive<any>({
+  keywords: '',
+  page: 1,
+  limit: 20,
+  status: 0,
+  parentId: undefined,
+  categoryId: undefined,
+  lang: i18n.locale.value
+});
+
+const reload = () => {
+  navigateTo(`/search/${where.keywords}`)
+}
+
+</script>
+<style scoped lang="less">
+</style>

pages/market/index.vue

@@ -16,13 +16,13 @@
 <!--                :value="item.value"-->
 <!--            />-->
 <!--          </el-select>-->
-          <el-button-group>
+          <el-input v-model="where.keywords" style="width: 400px" :placeholder="`应用搜索`" :suffix-icon="Search" @change="reload"/>
+          <el-button-group v-model:value="where" @tab-click="handleClick" @change="reload">
+            <el-button>综合</el-button>
             <el-button>最新</el-button>
             <el-button>免费</el-button>
             <el-button>付费</el-button>
-            <el-button>综合</el-button>
           </el-button-group>
-          <el-input v-model="where.keywords" :placeholder="`${$t('searchKeywords')}...`" :suffix-icon="Search" @change="reload"/>
         </el-space>
       </template>
       <el-row :gutter="24" id="container" class="clearfix">
@@ -41,7 +41,7 @@
                 </div>
               </div>
               <div class="item-image pt-3">
-                <el-image v-if="item.files" :src="`${JSON.parse(item.files)[0].url}`" class="w-full h-1/2" />
+                <el-image v-if="item.files" :src="`${JSON.parse(item.files)[0].url}`" class="w-full h-1/2 max-h-[220px]" />
                 <el-image v-else class="w-full h-[220px]" />
               </div>
             </div>
@@ -89,10 +89,11 @@ const layout = useLayout();
 const where = reactive<CmsWebsiteParam>({
   keywords: '',
   page: 1,
-  limit: 20,
-  status: 0,
+  limit: 12,
+  status: undefined,
+  recommend: undefined,
   categoryId: undefined,
-  lang: i18n.locale.value
+  lang: undefined
 });
 
 const goBack = () => {

pages/market/search.vue

@@ -0,0 +1,201 @@
+<template>
+
+  <!-- 主体部分 -->
+  <div class="xl:w-screen-xl m-auto py-4 mt-20">
+    <el-page-header :icon="ArrowLeft" @back="goBack">
+      <template #content>
+        <span class="text-large font-600 mr-3"> 应用市场 </span>
+      </template>
+      <template #extra>
+        <el-space class="flex items-center">
+<!--          <el-select v-model="value" clearable placeholder="筛选" style="width: 240px">-->
+<!--            <el-option-->
+<!--                v-for="item in options"-->
+<!--                :key="item.value"-->
+<!--                :label="item.label"-->
+<!--                :value="item.value"-->
+<!--            />-->
+<!--          </el-select>-->
+          <el-button-group>
+            <el-button>最新</el-button>
+            <el-button>免费</el-button>
+            <el-button>付费</el-button>
+            <el-button>综合</el-button>
+          </el-button-group>
+          <el-input v-model="where.keywords" :placeholder="`${$t('searchKeywords')}...`" :suffix-icon="Search" @change="reload"/>
+        </el-space>
+      </template>
+      <el-row :gutter="24" id="container" class="clearfix">
+        <el-col v-for="(item,index) in list" :key="index" :span="8" class="left mb-8">
+          <el-card shadow="hover" :body-style="{ padding: '0px' }" class=" hover:bg-gray-50 cursor-pointer" @click="navigateTo(`/item/${item.websiteId}.html`)">
+            <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 gap-1.5">
+                <el-avatar
+                    :src="item.websiteLogo" shape="square" :size="55" style="background-color: white;"/>
+                <div class="flex-1 text-lg cursor-pointer flex flex-col">
+                  {{ item.websiteName }}
+                  <div class="flex justify-between items-center">
+                    <sapn class="text-xs text-gray-400 font-normal line-clamp-1">{{ item.comments || '暂无描述' }}</sapn>
+                    <el-button size="small" round>获取</el-button>
+                  </div>
+                </div>
+              </div>
+              <div class="item-image pt-3">
+                <el-image v-if="item.files" :src="`${JSON.parse(item.files)[0].url}`" class="w-full h-1/2 max-h-[220px]" />
+                <el-image v-else class="w-full h-[220px]" />
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-page-header>
+
+    <Pagination :total="total" @done="search" />
+  </div>
+
+</template>
+<script setup lang="ts">
+
+import { Picture as IconPicture } from '@element-plus/icons-vue'
+import { ArrowLeft,View,Search } from '@element-plus/icons-vue'
+import { ElNotification as notify } from 'element-plus'
+import { useLayout, usePage} from "~/composables/configState";
+import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
+import type {CmsArticle, CmsArticleParam} from "~/api/cms/cmsArticle/model";
+import type { ComponentSize } from 'element-plus'
+import { ElNotification } from 'element-plus'
+import type { TabsPaneContext } from 'element-plus'
+import dayjs from "dayjs";
+import {getCmsNavigation, listCmsNavigation} from "~/api/cms/cmsNavigation";
+import {pageCmsArticle} from "~/api/cms/cmsArticle";
+import {pageCmsWebsiteAll} from "~/api/cms/cmsWebsite";
+import type {CmsWebsite, CmsWebsiteParam} from "~/api/cms/cmsWebsite/model";
+
+const route = useRoute();
+const router = useRouter();
+const navId = ref();
+// 页面信息
+const list = ref<CmsWebsite[]>([]);
+const i18n = useI18n();
+const category = ref<CmsNavigation[]>([]);
+const total = ref(0);
+const activeName = ref('2839');
+
+// 获取状态
+const page = usePage();
+const layout = useLayout();
+
+// 搜索表单
+const where = reactive<CmsWebsiteParam>({
+  keywords: '',
+  page: 1,
+  limit: 20,
+  status: 0,
+  categoryId: undefined,
+  lang: i18n.locale.value
+});
+
+const goBack = () => {
+  router.back();
+}
+
+// 加载页面数据
+const reload = async () => {
+  await pageCmsWebsiteAll(where).then(response => {
+    if(response?.list){
+      list.value = response?.list;
+      total.value = response.count;
+    }
+  }).catch(() => {})
+}
+
+const bakReload = async () => {
+  await getCmsNavigation(navId.value).then(data => {
+    page.value = data;
+    layout.value.banner = data.banner;
+
+    // seo
+    useSeoMeta({
+      description: data.comments || data.title,
+      keywords: data.title,
+      titleTemplate: `${data?.title}` + ' - %s',
+    })
+
+    // 二级栏目分类
+    listCmsNavigation({
+      parentId: data.parentId == 0 ? data.navigationId : data.parentId
+    }).then(navigation => {
+      category.value = navigation;
+      // 加载文章列表
+      if(data.parentId == 0 && category.value.length > 0){
+        where.parentId = page.value.navigationId;
+      }else {
+        where.categoryId = page.value.navigationId;
+      }
+      pageCmsArticle(where).then(response => {
+        if(response){
+          total.value = response.count;
+          list.value = response.list;
+        }
+      })
+    })
+  }).catch(() => {})
+
+}
+
+/**
+ * 搜索
+ * @param data
+ */
+const search = (data: CmsArticleParam) => {
+  where.page = data.page;
+  reload();
+}
+
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+  console.log(tab, event)
+}
+const value = ref('')
+const options = [
+  {
+    value: 'Option1',
+    label: 'Option1',
+  },
+  {
+    value: 'Option2',
+    label: 'Option2',
+  },
+  {
+    value: 'Option3',
+    label: 'Option3',
+  },
+  {
+    value: 'Option4',
+    label: 'Option4',
+  },
+  {
+    value: 'Option5',
+    label: 'Option5',
+  },
+]
+
+watch(
+    () => route.params.id,
+    (id) => {
+      // navId.value = getNavIdByParamsId(id);
+      reload();
+    },
+    { immediate: true }
+);
+</script>
+<style lang="scss">
+.right .content img{
+  width: auto !important;
+}
+.demo-tabs > .el-tabs__content {
+  padding: 32px;
+  color: #6b778c;
+  font-size: 32px;
+  font-weight: 600;
+}
+</style>