From 499171b0d6711bb971c5b13291611929a2890ded Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 18 Jun 2020 15:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=9C=8D=E5=8A=A1=E8=B6=85=E5=B8=82=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BCfixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/service-info/service-info.vue | 45 ++++++++++++++------
 src/pages/service_shop/sjfwDetail.vue        |  1 +
 src/pages/workbench/fwgl/fwglList.vue        | 31 +++++++-------
 3 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index b5e62b2..48631b8 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -64,7 +64,7 @@
           <span>规格说明：</span>
           <span
             class="commodity_text"
-            v-text="specification && specification.descript"
+            v-text="(specification && specification.descript) || '-'"
           ></span>
         </div>
         <div class="commodity_information">
@@ -108,24 +108,15 @@ export default {
     },
   },
   data: () => ({
-    types: [
-      {
-        name: "按月",
-        value: 1,
-      },
-      {
-        name: "按年",
-        value: 2,
-      },
-    ],
-    type: 1, // 购买方式 1：按月，2：按年
+    types: [],
+    type: 0, // 购买方式 1：按月，2：按年
     specification: {}, // 规格
     duration: 1, // 时长
   }),
   computed: {
     specifications() {
       let specifications = (this.data.serviceRequestSpcs || []).filter(
-        (item) => item.type == this.type
+        (item) => item.type == this.type || item.type == 3
       );
 
       return specifications;
@@ -200,7 +191,33 @@ export default {
         new Set(this.data.serviceRequestSpcs.map((item) => item.type))
       );
 
-      this.types = this.types.filter((item) => types.indexOf(item.value) > -1);
+      if (types.indexOf(3) > -1) {
+        this.types = [
+          {
+            name: "按月",
+            value: 1,
+          },
+          {
+            name: "按年",
+            value: 2,
+          },
+        ];
+      } else if (types.indexOf(2) > -1) {
+        this.types = [
+          {
+            name: "按年",
+            value: 2,
+          },
+        ];
+      } else if (types.indexOf(1) > -1) {
+        this.types = [
+          {
+            name: "按月",
+            value: 1,
+          },
+        ];
+      }
+
       this.type = (this.types[0] && this.types[0].value) || 0;
     }
 
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 2b88f8c..c37cc6a 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -68,6 +68,7 @@ export default {
               }))) ||
             [];
 
+          debugger;
           this.baseInfo = {
             service_id: this.id,
             app_id: 0,
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 8d0a2f1..2610849 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -26,6 +26,7 @@
 </template>
 
 <script>
+import helper from "@/services/helper.js";
 import { mapState } from "vuex";
 import apassList from "@/components/apass-list";
 import apassDialog from "@/components/apass-dialog";
@@ -126,8 +127,8 @@ export default {
             label: "注册发布时间",
             prop: "create_time",
             getText(item) {
-              let create_time = item.create_time || "";
-              return create_time.substring(0, 10);
+              let date = item.create_time || "";
+              return helper.dateStringTransform(date);
             },
             align: "center",
           },
@@ -238,11 +239,11 @@ export default {
             label: "申请时间",
             prop: "service_apply_info",
             getText(item) {
-              return (
+              let date =
                 (item.service_apply_info &&
                   item.service_apply_info.apply_time) ||
-                ""
-              );
+                "";
+              return helper.dateStringTransform(date);
             },
             align: "center",
           },
@@ -415,8 +416,8 @@ export default {
             label: "注册发布时间",
             prop: "create_time",
             getText(item) {
-              let create_time = item.create_time || "";
-              return create_time.substring(0, 10);
+              let date = item.create_time || "";
+              return helper.dateStringTransform(date);
             },
             align: "center",
           },
@@ -504,11 +505,11 @@ export default {
             label: "审批时间",
             prop: "service_apply_info",
             getText(item) {
-              return (
+              let date =
                 (item.service_apply_info &&
                   item.service_apply_info.approval_time) ||
-                ""
-              );
+                "";
+              return helper.dateStringTransform(date);
             },
             align: "center",
           },
@@ -680,8 +681,8 @@ export default {
             label: "注册发布时间",
             prop: "create_time",
             getText(item) {
-              let create_time = item.create_time || "";
-              return create_time.substring(0, 10);
+              let date = item.create_time || "";
+              return helper.dateStringTransform(date);
             },
             align: "center",
           },
@@ -777,11 +778,11 @@ export default {
             label: "审批时间",
             prop: "service_apply_info",
             getText(item) {
-              return (
+              let date =
                 (item.service_apply_info &&
                   item.service_apply_info.approval_time) ||
-                ""
-              );
+                "";
+              return helper.dateStringTransform(date);
             },
             align: "center",
           },
-- 
2.26.0