From c8a8a58705731ea56eb0c59abec1e2e9bda805c5 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 29 Jul 2022 15:27:24 +0800
Subject: [PATCH] 747\739\748 Bug

---
 .../myAgent/demo/ResourcesAndServices.vue     | 71 ++++++++++++++++---
 .../Application/ApplicationTopDetails.vue     |  8 ++-
 .../Business/BusinessTopDetails.vue           |  2 +-
 .../Developer/DeveloperTopDetails.vue         |  2 +-
 .../LayerService/LayerServiceTopDetails.vue   |  2 +-
 5 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
index 75305f2e..c12c04d2 100644
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -40,29 +40,48 @@
                   v-for="multipleAdditionsItem in itemsonson.note1"
                   :key="multipleAdditionsItem"
                 >
-                  <div>
+                <el-tooltip placement="top">
+                    <div slot="content"> {{
+                      multipleAdditionsItem.question ||
+                      multipleAdditionsItem.type ||
+                      multipleAdditionsItem.name
+                    }}</div>
+                    <div>
                     {{
                       multipleAdditionsItem.question ||
                       multipleAdditionsItem.type ||
                       multipleAdditionsItem.name
                     }}
                   </div>
-                  <div>
+                  </el-tooltip>
+                  <el-tooltip placement="top">
+                    <div slot="content">{{
+                      multipleAdditionsItem.answer ||
+                      multipleAdditionsItem.price ||
+                      multipleAdditionsItem.img
+                    }}</div>
+                    <div>
                     {{
                       multipleAdditionsItem.answer ||
                       multipleAdditionsItem.price ||
                       multipleAdditionsItem.img
                     }}
                   </div>
-                  <div>{{ multipleAdditionsItem.desc }}</div>
+                  </el-tooltip>
+                  <el-tooltip placement="top">
+                    <div slot="content">{{ multipleAdditionsItem.desc }}</div>
+                    <div>{{ multipleAdditionsItem.desc }}</div>
+                  </el-tooltip>
                   <!-- <div>{{ multipleAdditionsItem }}</div> -->
                 </div>
               </div>
+              <el-tooltip v-else placement="top">
+                <div slot="content">{{ itemsonson.note1 }}</div>
                 <el-input
-                v-else
                 v-model="itemsonson.note1"
                 disabled="disabled"
               ></el-input>
+              </el-tooltip>
             </el-form-item>
             <el-form-item
               v-for="itemsonson in itemson.children"
@@ -94,7 +113,10 @@
                   style="border: 1px solid #3c9bcd;margin"
                 >
                   <div>{{ itemDataFormValue.name }}</div>
-                  <div>{{ itemDataFormValue.desc }}</div>
+                  <el-tooltip placement="top">
+                    <div slot="content">{{ itemDataFormValue.desc }}</div>
+                    <div>{{ itemDataFormValue.desc }}</div>
+                  </el-tooltip>
                 </div>
               </div>
             </div>
@@ -115,7 +137,10 @@
                   style="border: 1px solid #3c9bcd;margin"
                 >
                   <div>{{ itemDataFormValue.name }}</div>
-                  <div>{{ itemDataFormValue.desc }}</div>
+                  <el-tooltip placement="top">
+                    <div slot="content">{{ itemDataFormValue.desc }}</div>
+                    <div>{{ itemDataFormValue.desc }}</div>
+                  </el-tooltip>
                   <div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
                 </div>
               </div>
@@ -137,7 +162,10 @@
                   style="border: 1px solid #3c9bcd;margin"
                 >
                   <div>{{ itemDataFormValue.name }}</div>
-                  <div>{{ itemDataFormValue.desc }}</div>
+                  <el-tooltip placement="top">
+                    <div slot="content">{{ itemDataFormValue.desc }}</div>
+                    <div>{{ itemDataFormValue.desc }}</div>
+                  </el-tooltip>
                   <div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
                 </div>
               </div>
@@ -432,6 +460,11 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.el-tooltip__popper {
+  max-width: 300px;
+}
+</style>
 <style lang="scss" scoped>
 .wrapper {
   .dataTitle {
@@ -464,6 +497,28 @@ export default {
         margin-bottom: 10px;
         font-weight: bold;
         line-height: 14px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+      }
+      & > div:nth-child(2) {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 6;
+        line-height: initial;
+      }
+      & > div:nth-child(3) {
+        width: 90%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 6;
+        line-height: initial;
       }
     }
   }
@@ -503,7 +558,7 @@ export default {
       & > div:nth-child(3) {
         margin-top: 10px;
         position: absolute;
-        bottom: 30px;
+        bottom: 8px;
         cursor: pointer;
         font-size: 12px;
         border: 1px solid #3c9bcd;
diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
index 93f8ca1f..19ecc008 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue
@@ -59,7 +59,11 @@
           <template #icon><form-outlined /></template>
           申请使用
         </a-button>
-        <a-button v-if="!dataList.fuseResourceList" type="primary" @click="addShoppingCart()">
+        <a-button
+          v-if="!dataList.fuseResourceList"
+          type="primary"
+          @click="addShoppingCart()"
+        >
           <template #icon><shopping-cart-outlined /></template>
           加入购物车
         </a-button>
@@ -257,7 +261,7 @@
           margin-right: 0.2rem;
           font-size: 0.4rem;
           margin-right: 0.2rem;
-          max-width: 7rem;
+          max-width: 6rem;
           text-overflow: -o-ellipsis-lastline;
           overflow: hidden;
           text-overflow: ellipsis;
diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index 3ba478df..8b035940 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -243,7 +243,7 @@
           // white-space: nowrap;
           font-size: 0.4rem;
           margin-right: 0.2rem;
-          max-width: 7rem;
+          max-width: 6rem;
           text-overflow: -o-ellipsis-lastline;
           overflow: hidden;
           text-overflow: ellipsis;
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
index 752b715d..b4354020 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue
@@ -246,7 +246,7 @@
           // white-space: nowrap;
           font-size: 0.4rem;
           margin-right: 0.2rem;
-          max-width: 7rem;
+          max-width: 6rem;
           text-overflow: -o-ellipsis-lastline;
           overflow: hidden;
           text-overflow: ellipsis;
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
index 5f3175cd..4feddb1e 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue
@@ -239,7 +239,7 @@
           // white-space: nowrap;
           font-size: 0.4rem;
           margin-right: 0.2rem;
-          max-width: 7rem;
+          max-width: 6rem;
           text-overflow: -o-ellipsis-lastline;
           overflow: hidden;
           text-overflow: ellipsis;