From d50935f0516cbcf39491ad89d199e7f02a16cbeb Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 11 Nov 2020 14:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/service-header.vue             |  3 +-
 .../workbench/fwgl/apply_service_detail.vue   | 36 +++++++++----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/components/service-header.vue b/src/components/service-header.vue
index 9a5e73a..721e2a8 100644
--- a/src/components/service-header.vue
+++ b/src/components/service-header.vue
@@ -306,7 +306,8 @@ export default {
 .info_detail p {
   color: #8890a7;
 }
-.info_detail span {
+.info_detail span,
+.info_detail a {
   color: #242c43;
   font-weight: 600;
   margin-right: 48px;
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index fd951ec..51d6809 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -155,7 +155,6 @@ export default {
       use_approval_arr: [],
       process_in_up: false, //是否是服务注册产生的
       perception_in: false, //是否是感知服务
-      service_apply_type: 1, //服务申请的方式，1：计次收费2：时长收费
       port_select: "",
       req_solt_code_arr: "",
       res_solt_code_arr: "",
@@ -530,6 +529,10 @@ export default {
             name: "服务到期时间",
             text: "",
           },
+          {
+            name: "可用调用次数",
+            text: "",
+          },
         ],
         second: [
           {
@@ -841,31 +844,24 @@ export default {
             this.perception_in = false;
           }
 
-          if (this.service_apply_type == 1) {
+          if (data.service_apply_info.spcs_type == 1) {
+            this.$set(this.service_header_arr["first"][2], "text", "不限时长");
+
             this.$set(
-              this.service_header_arr["first"][2],
+              this.service_header_arr["first"][3],
               "text",
-              data.service_apply_info.service_end_time == "0001-01-01T00:00:00Z"
-                ? "-"
-                : data.service_apply_info.service_end_time
-                    .replace("T", " ")
-                    .split("+")[0]
-            );
-            this.$set(
-              this.service_header_arr["first"][2],
-              "name",
-              "可调用次数"
+              data.service_apply_info.spcs_count
             );
           } else {
             this.$set(
               this.service_header_arr["first"][2],
               "text",
-              data.service_apply_info.service_end_time == "0001-01-01T00:00:00Z"
-                ? "-"
-                : data.service_apply_info.service_end_time
-                    .replace("T", " ")
-                    .split("+")[0]
+              data.service_apply_info.service_end_time
+                .replace(/T|Z/g, " ")
+                .split("+")[0]
             );
+
+            this.$set(this.service_header_arr["first"][3], "text", "不限次数");
           }
           if (this.process_in_up) {
             var temp_sj = this.service_header_arr.first.pop();
@@ -950,7 +946,9 @@ export default {
           this.$set(
             this.apply_arr[8],
             "info",
-            data.service_apply_info.apply_time.replace(/T|Z/g, " ").split("+")[0]
+            data.service_apply_info.apply_time
+              .replace(/T|Z/g, " ")
+              .split("+")[0]
           );
           this.$set(
             this.apply_arr[9],
-- 
2.26.0