新版本官网优化完成

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>