From 5169da0d66ed750ad19148ed25d2747db30efe5d Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 2 Jul 2020 16:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=95=86=E5=BA=97=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service-tabs/service-tab-detail.vue       |  1 -
 src/pages/service_shop/yysdDetail.vue         | 45 ++++++++++++++-----
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/components/service-tabs/service-tab-detail.vue b/src/components/service-tabs/service-tab-detail.vue
index 3607c0c..3f51a69 100644
--- a/src/components/service-tabs/service-tab-detail.vue
+++ b/src/components/service-tabs/service-tab-detail.vue
@@ -8,7 +8,6 @@
       <h3
         class="detail-title"
         v-text="item.name + '：'"
-        v-if="item.type != 'rich-text'"
       ></h3>
 
       <service-steps
diff --git a/src/pages/service_shop/yysdDetail.vue b/src/pages/service_shop/yysdDetail.vue
index eb59cc6..c9776e6 100644
--- a/src/pages/service_shop/yysdDetail.vue
+++ b/src/pages/service_shop/yysdDetail.vue
@@ -58,21 +58,44 @@ export default {
           console.log(error);
         });
 
-      this.$http
-        .get(`/apaas/hubApi/market/readme/${this.id}`)
-        .then(({ data }) => {
-          this.detailData = [
+      let detailData = [
+        {
+          name: "获取流程",
+          type: "step",
+          value: ["应用申请", "信息填写", "审核确认", "应用获取"],
+        },
+      ];
+      Promise.all([
+        this.$http.get(`/apaas/hubApi/market/app/detail/${this.id}`),
+        this.$http.get(`/apaas/hubApi/market/values/${this.id}`),
+      ])
+        .then((response) => {
+          let data1 = response[0].data.data;
+          let data2 = response[1].data.data;
+
+          detailData.push(
             {
-              name: "获取流程",
-              type: "step",
-              value: ["应用申请", "信息填写", "审核确认", "应用获取"],
+              name: "应用简介",
+              type: "text",
+              value: data1.yyjj,
             },
             {
-              name: "富文本",
-              type: "rich-text",
-              value: data.data,
+              name: "功能简介",
+              type: "text",
+              value: data1.gnjj,
             },
-          ];
+            {
+              name: "应用场景",
+              type: "text",
+              value: data1.cjsl,
+            },
+            {
+              name: "应用参数",
+              type: "rich-text",
+              value: data2,
+            }
+          );
+          this.detailData = detailData;
         })
         .catch(function(error) {
           console.log(error);
-- 
2.26.0