From fee068c34e0c352396ad53e4af16c8b86497c6c3 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 9 Jul 2020 15:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=B6=85=E5=B8=82=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/service-info/service-info.vue | 2 +-
 src/pages/service_shop/sjfwDetail.vue        | 6 +++++-
 src/pages/service_shop/skfwDetail.vue        | 6 +++++-
 src/pages/service_shop/zhfwDetail.vue        | 6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index 57dbd71..50ffea6 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -40,7 +40,7 @@
           </li>
           <li>
             <span>服务类型：</span>
-            <span v-text="data.data_service_type3_str"></span>
+            <span v-html="data.data_service_type.join('&ensp;&ensp;')"></span>
           </li>
           <li>
             <span>资源摘要：</span>
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 2b88f8c..8bda77a 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -81,7 +81,11 @@ export default {
             create_time: datas.create_time,
             update_date: datas.update_date,
             sectors_name: datas.sectors_name,
-            data_service_type3_str: datas.data_service_type3_str,
+            data_service_type: [
+              datas.data_service_type1_name,
+              datas.data_service_type2_name,
+              datas.data_service_type3_name,
+            ],
             descript: datas.descript,
             serviceRequestSpcs: specificationData,
           };
diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue
index 328b142..e15263a 100644
--- a/src/pages/service_shop/skfwDetail.vue
+++ b/src/pages/service_shop/skfwDetail.vue
@@ -86,7 +86,11 @@ export default {
             create_time: datas.create_time,
             update_date: datas.update_date,
             sectors_name: datas.sectors_name,
-            data_service_type3_str: datas.data_service_type3_str,
+            data_service_type: [
+              datas.data_service_type1_name,
+              datas.data_service_type2_name,
+              datas.data_service_type3_name,
+            ],
             descript: datas.descript,
             serviceRequestSpcs: specificationData,
           };
diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue
index 9be05c5..c8e5f44 100644
--- a/src/pages/service_shop/zhfwDetail.vue
+++ b/src/pages/service_shop/zhfwDetail.vue
@@ -85,7 +85,11 @@ export default {
             create_time: datas.create_time,
             update_date: datas.update_date,
             sectors_name: datas.sectors_name,
-            data_service_type3_str: datas.data_service_type3_str,
+            data_service_type: [
+              datas.data_service_type1_name,
+              datas.data_service_type2_name,
+              datas.data_service_type3_name,
+            ],
             descript: datas.descript,
             serviceRequestSpcs: specificationData,
           };
-- 
2.26.0