From 5fd4f18fe2a08c1013c58ad5fb9cc3c340adf116 Mon Sep 17 00:00:00 2001
From: rose <1942951600@qq.com>
Date: Mon, 10 May 2021 22:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Industry/Children/Serve.vue      | 28 ++++++++++++++++++-
 src/views/NewPlatform/Children/Service.vue | 32 ++++++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/views/Industry/Children/Serve.vue b/src/views/Industry/Children/Serve.vue
index 48de9d7..20cec46 100644
--- a/src/views/Industry/Children/Serve.vue
+++ b/src/views/Industry/Children/Serve.vue
@@ -26,7 +26,23 @@
         <p @click="showModal(item.id)" class="font-24 my-4" style="text-align: center">
           <span>{{ item.name }}</span>
         </p>
-        <p class="font-16 my-4 textColor line-height-30 item-content">{{ item.intro }}</p>
+        <div v-if="item.intro.length>45" class="font-16 textColor item-intro mb-2">
+          {{ item.intro.slice(0,45) }}
+          <a-button
+            @click="showIntro(index)"
+            class="font-16 baseColor"
+            type="link"
+            style="height:20px;float:right;padding:0px"
+          >
+            more
+            <a-icon style="font-size:12px" type="right" />
+          </a-button>
+          
+        </div>
+        
+        <div v-if="item.intro.length<=45" class="font-16 textColor item-intro">
+          <p>{{ item.intro }}</p>
+        </div>
         <!-- <p
           @click="jump(item.id)"
           class="font-16 baseColor"
@@ -34,6 +50,9 @@
         >了解更多→</p>-->
       </div>
     </div>
+    <a-modal v-model="showModelIntro" :footer="null">
+      <p class="mt-3"> {{ modelIntro }} </p>
+    </a-modal>
     <a-modal
       :confirm-loading="confirmLoading"
       :visible="visible"
@@ -208,6 +227,8 @@ export default {
         type: 0,
         id: '',
       },
+      showModelIntro: false,
+      modelIntro: ''
     };
   },
 
@@ -232,6 +253,11 @@ export default {
     ...mapMutations('home', ['setServiceArr']),
     ...mapActions('user', ['sendCode', 'sendPicCode']),
     ...mapActions('home', ['getUserSer']),
+
+    showIntro(index){
+      this.showModelIntro = true
+      this.modelIntro = this.list[index].intro
+    },
     // 获取服务列表
     async getService() {
       try {
diff --git a/src/views/NewPlatform/Children/Service.vue b/src/views/NewPlatform/Children/Service.vue
index 906739d..bd01aba 100644
--- a/src/views/NewPlatform/Children/Service.vue
+++ b/src/views/NewPlatform/Children/Service.vue
@@ -23,17 +23,38 @@
         <p class="font-24 my-4" style="text-align: center">
           <span>{{ item.name }}</span>
         </p>
-        <p
+        <!-- <p
           class="font-16 my-4 textColor line-height-30 item-content"
           v-if="item.intro"
-        >{{ item.intro }}</p>
+        >{{ item.intro }}</p> -->
+        <div v-if="item.intro === null? false: item.intro.length>45" class="font-16 textColor item-intro mb-2">
+          {{ item.intro.slice(0,45) }}
+          <a-button
+            @click="showIntro(index)"
+            class="font-16 baseColor"
+            type="link"
+            style="height:20px;float:right;padding:0px"
+          >
+            more
+            <a-icon style="font-size:12px" type="right" />
+          </a-button>
+          
+        </div>
+        
+        <div v-if="item.intro === null? false:item.intro.length<=45" class="font-16 textColor item-intro">
+          <p>{{ item.intro }}</p>
+        </div>
         <!-- <p
+
           @click="jump(item.id)"
           class="font-16 baseColor"
           style="text-align: right; cursor: pointer"
         >了解更多→</p>-->
       </div>
     </div>
+    <a-modal v-model="showModelIntro" :footer="null">
+      <p class="mt-3"> {{ modelIntro }} </p>
+    </a-modal>
     <a-modal
       :confirm-loading="confirmLoading"
       :visible="visible"
@@ -210,6 +231,8 @@ export default {
         type: 0,
         Id: '',
       },
+      showModelIntro: false,
+      modelIntro: ''
     };
   },
   computed: mapState('user', ['picCode']),
@@ -219,6 +242,11 @@ export default {
   methods: {
     ...mapMutations('home', ['setServiceArr', 'getUserSer']),
     ...mapActions('user', ['sendCode', 'sendPicCode']),
+
+    showIntro(index){
+      this.showModelIntro = true
+      this.modelIntro = this.list[index].intro
+    },
     // 获取服务列表
     async getService() {
       try {