From c9202cd09407ecd2efcddd9d60bc4774b1cfb63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Thu, 19 Nov 2020 18:51:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=A6=E6=83=85=E9=A1=B5?=
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/gzfwDetail.vue        | 6 +++---
 src/pages/service_shop/sjfwDetail.vue        | 6 +++---
 src/pages/service_shop/skfwDetail.vue        | 6 +++---
 src/pages/service_shop/spfwDetail.vue        | 6 +++---
 src/pages/service_shop/zhfwDetail.vue        | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index 3fe0a4b..122a629 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -93,7 +93,7 @@
           {{
             specification && specification.spcs_type == 1
               ? specification.descript
-              : data.serviceRequestSpcs.spcs_type_1[0].descript
+              : data.serviceRequestSpcs.spcs_type_1 && data.serviceRequestSpcs.spcs_type_1.length != 0 ? data.serviceRequestSpcs.spcs_type_1[0].descript : ""
           }}
         </div>
         <div
diff --git a/src/pages/service_shop/gzfwDetail.vue b/src/pages/service_shop/gzfwDetail.vue
index 4292bef..d4d7b40 100644
--- a/src/pages/service_shop/gzfwDetail.vue
+++ b/src/pages/service_shop/gzfwDetail.vue
@@ -182,9 +182,9 @@ export default {
               },
             },
           ];
-          let arr = datas.serviceRequestSpcs.spcs_type_1.concat(
-            datas.serviceRequestSpcs.spcs_type_2
-          );
+          let arr1 = datas.serviceRequestSpcs.spcs_type_1 || [];
+          let arr2 = datas.serviceRequestSpcs.spcs_type_2 || [];
+          let arr = arr1.concat(arr2);
           arr.map((item) => {
             item.type = item.spcs_type == 1 ? "计次收费规格" : "时长收费规格";
             item.spce =
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index fa8942b..5df58df 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -182,9 +182,9 @@ export default {
               },
             },
           ];
-          let arr = datas.serviceRequestSpcs.spcs_type_1.concat(
-            datas.serviceRequestSpcs.spcs_type_2
-          );
+          let arr1 = datas.serviceRequestSpcs.spcs_type_1 || [];
+          let arr2 = datas.serviceRequestSpcs.spcs_type_2 || [];
+          let arr = arr1.concat(arr2);
           arr.map((item) => {
             item.type = item.spcs_type == 1 ? "计次收费规格" : "时长收费规格";
             item.spce =
diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue
index cfe93d4..6eeba74 100644
--- a/src/pages/service_shop/skfwDetail.vue
+++ b/src/pages/service_shop/skfwDetail.vue
@@ -142,9 +142,9 @@ export default {
               ],
             }, */
           ];
-          let arr = datas.serviceRequestSpcs.spcs_type_1.concat(
-            datas.serviceRequestSpcs.spcs_type_2
-          );
+          let arr1 = datas.serviceRequestSpcs.spcs_type_1 || [];
+          let arr2 = datas.serviceRequestSpcs.spcs_type_2 || [];
+          let arr = arr1.concat(arr2);
           arr.map((item) => {
             item.type = item.spcs_type == 1 ? "计次收费规格" : "时长收费规格";
             item.spce =
diff --git a/src/pages/service_shop/spfwDetail.vue b/src/pages/service_shop/spfwDetail.vue
index 40e864a..2ecb706 100644
--- a/src/pages/service_shop/spfwDetail.vue
+++ b/src/pages/service_shop/spfwDetail.vue
@@ -182,9 +182,9 @@ export default {
               },
             },
           ];
-          let arr = datas.serviceRequestSpcs.spcs_type_1.concat(
-            datas.serviceRequestSpcs.spcs_type_2
-          );
+          let arr1 = datas.serviceRequestSpcs.spcs_type_1 || [];
+          let arr2 = datas.serviceRequestSpcs.spcs_type_2 || [];
+          let arr = arr1.concat(arr2);
           arr.map((item) => {
             item.type = item.spcs_type == 1 ? "计次收费规格" : "时长收费规格";
             item.spce =
diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue
index d37645f..2d64bfb 100644
--- a/src/pages/service_shop/zhfwDetail.vue
+++ b/src/pages/service_shop/zhfwDetail.vue
@@ -137,9 +137,9 @@ export default {
               value: datas.workflows_id,
             });
           }
-          let arr = datas.serviceRequestSpcs.spcs_type_1.concat(
-            datas.serviceRequestSpcs.spcs_type_2
-          );
+          let arr1 = datas.serviceRequestSpcs.spcs_type_1 || [];
+          let arr2 = datas.serviceRequestSpcs.spcs_type_2 || [];
+          let arr = arr1.concat(arr2);
           arr.map((item) => {
             item.type = item.spcs_type == 1 ? "计次收费规格" : "时长收费规格";
             item.spce =
-- 
2.26.0