From 0b718307d8864bb1dda5863f663a6e4d348879f8 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Wed, 10 Aug 2022 17:52:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/integrationServices.vue | 32 ++++++++++++++------
 front/src/views/home/packagingDetails.vue    | 16 +++++-----
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index a1083b41..112fd4c4 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -19,17 +19,22 @@
           <div class="hengxian"></div>
         </div>
       </div>
-      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
-        :resourceList="resourceList" :resourceTotal="resourceTotal" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-      <div class="pagination">
-        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
-      </div>
-      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-        <a-empty />
+      <div v-loading="loadingData">
+        <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
+          :resourceList="resourceList" :resourceTotal="resourceTotal"
+          :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
+        <div class="pagination">
+          <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
+            v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper
+            :total="resourceTotal" :page-size-options="pageSizeOptions" @change="pageChange"
+            @showSizeChange="onShowSizeChange" />
+        </div>
+        <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
+          <a-empty />
+        </div>
       </div>
     </div>
+
   </div>
   <home-footer></home-footer>
 </template>
@@ -58,6 +63,7 @@ export default defineComponent({
     const resourceList = reactive({ data: [] })
     const resourceTotal = ref(0)
     const current = ref(1)
+    const loadingData = ref(false)
     // 选项卡
     const titleName = ref([
       {
@@ -120,6 +126,8 @@ export default defineComponent({
 
     // 获取融合服务列表
     const getIntegrationList = () => {
+      loadingData.value = true;
+      console.log('获取融合服务列表------------>');
       let postData = {
         limit: currentPageSize.value,
         page: currentPage.value,
@@ -130,13 +138,17 @@ export default defineComponent({
       }
       getIntegrationServicesList(postData).then(
         (res) => {
+          loadingData.value = false;
           if (res.data.code !== 0) {
             return message.error(res.data.msg)
           }
+          console.log('res.data------------>', res.data);
+
           resourceList.data = res.data.data.list || []
           resourceTotal.value = res.data.data.total || 0
         },
         (err) => {
+          loadingData.value = false;
           message.error(err)
         }
       )
@@ -180,6 +192,7 @@ export default defineComponent({
     }
 
     onMounted(() => {
+      console.log('222----onMounted-------->', 222);
       listKey2.value++
       getAppResources()
     })
@@ -215,6 +228,7 @@ export default defineComponent({
       titleName,
       changeCards,
       number,
+      loadingData,
     }
   },
   components: {
diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue
index 6cf964cc..d1a293ca 100644
--- a/front/src/views/home/packagingDetails.vue
+++ b/front/src/views/home/packagingDetails.vue
@@ -20,7 +20,9 @@
               </div>
             </div>
             <div class="flex-row-start desc">
-              <div class="desc">描述：{{ detailInfoObj.description || '--' }}</div>
+              <a-tooltip placement="topLeft" :title="detailInfoObj.description || '--'">
+                <div class="desc">描述：{{ detailInfoObj.description || '--' }}</div>
+              </a-tooltip>
             </div>
             <div class="btn-box">
               <a-button size="big" class="btn-text" type="primary" @click="handleAKeyApplication()">
@@ -29,12 +31,11 @@
                 </template>
                 申请使用
               </a-button>
-              <a-button size="big" class="btn-text" :type="detailInfoObj.isCollect == 'true' ? 'primary' : ''"
-                @click="addCollect()">
+              <a-button size="big" class="btn-text" type="primary" @click="addCollect()">
                 <template #icon>
                   <form-outlined />
                 </template>
-                收藏
+                {{ detailInfoObj.isCollect == 'true' ? '已收藏' : '收藏' }}
               </a-button>
             </div>
           </div>
@@ -299,12 +300,10 @@ getIntegrationServicesDeatil(id)
 
   .name {
     font-size: 0.16rem;
-    margin-bottom: 0.2rem;
-    margin-top: 0.2rem;
   }
 
   .area {
-    margin-bottom: 0.2rem;
+    margin: 0.1rem 0;
   }
 
   .desc {
@@ -319,7 +318,7 @@ getIntegrationServicesDeatil(id)
 
 .btn-box {
   position: absolute;
-  bottom: 0;
+  bottom: -15px;
   left: 0.2rem;
 
   .btn-text {
@@ -341,5 +340,4 @@ getIntegrationServicesDeatil(id)
 .list-box {
   padding: 0.4rem;
 }
-
 </style>