From dd9a9a26ae3f3b3bd0af1c48e2cb049df61ff6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 25 Oct 2024 12:25:29 +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

---
 layouts/default.vue                  |  7 +++++
 pages/index.vue                      |  2 +-
 pages/item/components/PageBanner.vue | 12 +++------
 pages/item/index.vue                 | 40 ++++++++++++++--------------
 pages/plug/index.vue                 |  2 +-
 pages/product/index.vue              |  3 +--
 6 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 05d6096..823c528 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -83,6 +83,13 @@ const reload = async () => {
     ElMessage.error('require is not defined.')
     return false;
   }
+  if(websiteInfo.value.code === 401){
+    const token = useToken();
+    token.value = '';
+    localStorage.clear();
+    window.location.reload();
+    return false;
+  }
   if (websiteInfo.value?.data) {
     console.log(websiteInfo.value.data,'-=======')
     website.value = websiteInfo.value?.data;
diff --git a/pages/index.vue b/pages/index.vue
index 6866809..7f4286a 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -2,7 +2,7 @@
 
   <Flash/>
 
-  <CompanyList :param="{type: 0,official: true,recommend: true,limit: 4}" :fit="`cover`"  title="产品服务" comments="拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！"/>
+  <CompanyList :param="{official: true,recommend: true,limit: 4}" :fit="`cover`"  title="产品服务" comments="拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！"/>
 
 <!--  <ProductList :param="{type:0, official: true,limit: 4}" :fit="`cover`" title="产品服务" comments="拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！"/>-->
 
diff --git a/pages/item/components/PageBanner.vue b/pages/item/components/PageBanner.vue
index 01f9c82..404c2b0 100644
--- a/pages/item/components/PageBanner.vue
+++ b/pages/item/components/PageBanner.vue
@@ -57,14 +57,10 @@
 <!--                      立即开通-->
 <!--                    </el-button>-->
 
-                    <!-- 2. 已购买 -->
-<!--                    <el-button-->
-<!--                        v-else-->
-<!--                        type="warning"-->
-<!--                        @click="installPlug"-->
-<!--                    >-->
-<!--                      立即安装-->
-<!--                    </el-button>-->
+                    <!-- 2. 已购买  @click="installPlug"-->
+                    <el-button type="primary">
+                      产品控制台
+                    </el-button>
 
                     <!-- 3. 其他按钮 -->
                     <template v-for="(item,index) in form.links" :key="index">
diff --git a/pages/item/index.vue b/pages/item/index.vue
index f47ce62..ecb81ac 100644
--- a/pages/item/index.vue
+++ b/pages/item/index.vue
@@ -5,26 +5,6 @@
   <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" v-if="form.files?.length" class="hover:border-green-50 hover:border-2 mb-5">
-          <template #header>
-            <div class="card-header font-bold text-xl">
-              <span>应用截图</span>
-            </div>
-          </template>
-          <div class="flex gap-xl">
-            <template v-for="(item,index) in form.files" :key="index" class="text item">
-              <el-image
-                  :src="item.url"
-                  :zoom-rate="1.2"
-                  :max-scale="7"
-                  :min-scale="0.2"
-                  :preview-src-list="srcList"
-                  :initial-index="4"
-                  fit="contain"
-              />
-            </template>
-          </div>
-        </el-card>
         <el-card shadow="hover" class="hover:border-green-50 hover:border-2 mb-5">
           <template #header>
             <div class="card-header font-bold text-xl">
@@ -44,6 +24,26 @@
           <el-descriptions title="安装说明" />
           <p v-html="form.content" class="content"></p>
         </el-card>
+        <el-card shadow="hover" v-if="form.files?.length" class="hover:border-green-50 hover:border-2 mb-5">
+        <template #header>
+          <div class="card-header font-bold text-xl">
+            <span>应用截图</span>
+          </div>
+        </template>
+        <div class="flex gap-xl">
+          <template v-for="(item,index) in form.files" :key="index" class="text item">
+            <el-image
+                :src="item.url"
+                :zoom-rate="1.2"
+                :max-scale="7"
+                :min-scale="0.2"
+                :preview-src-list="srcList"
+                :initial-index="4"
+                fit="contain"
+            />
+          </template>
+        </div>
+      </el-card>
         <!-- 产品评论 -->
         <Comments :productId="form.companyId" :comments="comments" :count="commentsTotal" @done="doComments" />
       </el-col>
diff --git a/pages/plug/index.vue b/pages/plug/index.vue
index 2b1fef2..aef6c1b 100644
--- a/pages/plug/index.vue
+++ b/pages/plug/index.vue
@@ -39,7 +39,7 @@ const reload = async (path: string) => {
   const {data: response} = await useServerRequest<ApiResult<PageResult<Company>>>('/system/company/pageAll',{baseURL: runtimeConfig.public.apiServer, params: {
       page: page.value,
       limit: 8,
-      categoryId: getIdBySpm(5),
+      official: false,
       keywords: where.keywords
     }})
   if(response.value?.data){
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 4d08f85..481b09e 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -37,10 +37,9 @@ const onSearch = () => {
 
 // 请求数据
 const reload = async (path: string) => {
-  const {data: response} = await useServerRequest<ApiResult<PageResult<Company>>>('/system/company/pageAll',{baseURL: runtimeConfig.public.apiServer, params: {
+  const {data: response} = await useServerRequest<ApiResult<PageResult<Company>>>('/system/company/page',{baseURL: runtimeConfig.public.apiServer, params: {
       page: page.value,
       limit: 8,
-      categoryId: getIdBySpm(5),
       keywords: where.keywords
     }})
   if(response.value?.data){