From f5fe49021fd8963456bafe5f7a61a04b14b67ed3 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 17 Jun 2020 15:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 +-
 src/components/service-info/app-info.vue      | 30 ++++---
 .../service-list/commodity-card.vue           |  4 +-
 .../service-tabs/service-tab-detail.vue       | 15 +++-
 src/components/service-tabs/service-tabs.vue  | 10 +--
 src/pages/service_shop/yysdDetail.vue         | 79 +++++++++++++------
 6 files changed, 95 insertions(+), 45 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4c714ee..49875a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -38,7 +38,7 @@ export default {
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 99;
+  z-index: 2000;
 }
 #app {
   background-color: #f6f7fb;
diff --git a/src/components/service-info/app-info.vue b/src/components/service-info/app-info.vue
index 4e41ab8..76aa307 100644
--- a/src/components/service-info/app-info.vue
+++ b/src/components/service-info/app-info.vue
@@ -1,38 +1,38 @@
 <template>
   <div class="application_info" v-if="data">
     <div class="main_container">
-      <div class="main_container-left" v-if="data.img">
-        <el-avatar shape="square" :size="144" fit="cover" :src="data.img" />
+      <div class="main_container-left" v-if="data.logo">
+        <el-avatar shape="square" :size="144" fit="cover" :src="data.logo" />
       </div>
       <div class="main_container-right">
         <div class="application_title">
-          <span class="application_name" v-text="data.name"></span>
+          <span class="application_name" v-text="data.app_name"></span>
         </div>
         <div class="application_base_container">
           <ul class="application_base_info">
             <li>
               <span>应用开发者：</span>
-              <span v-text="data.providedBy"> </span>
+              <span v-text="data.username"> </span>
             </li>
             <li>
               <span>应用类型：</span>
-              <span v-html="data.serviceType"></span>
+              <span v-html="data.type_name"></span>
             </li>
           </ul>
           <ul class="application_base_info">
             <li>
               <span>部署次数：</span>
-              <span v-text="data.acquireCount"></span>
+              <span v-text="data.deploy_times"></span>
             </li>
             <li>
               <span>业务领域：</span>
-              <span v-text="data.dataField"></span>
+              <span v-text="data.ywly_name"></span>
             </li>
           </ul>
           <ul class="application_base_info">
             <li>
               <span>上线时间：</span>
-              <span v-text="data.publishTime"></span>
+              <span v-text="data.create_date"></span>
             </li>
           </ul>
         </div>
@@ -42,7 +42,7 @@
       <span>规&emsp;&emsp;格：</span>
       <div class="btn_container">
         <el-button
-          v-for="(item, index) in data.specifications"
+          v-for="(item, index) in specifications"
           :key="'specifications_' + index"
           :type="
             item.value === commodityData.specification ? 'primary' : 'default'
@@ -73,8 +73,18 @@ export default {
     },
   },
   data: () => ({
+    specifications: [
+      {
+        name: "1.申请获取应用镜像部署权限",
+        value: 1,
+      },
+      {
+        name: "2.申请获取应用二次开发权限（需要先行升级为开发者用户）",
+        value: 2,
+      },
+    ],
     commodityData: {
-      specification: 0,
+      specification: 1,
     },
   }),
   methods: {
diff --git a/src/components/service-list/commodity-card.vue b/src/components/service-list/commodity-card.vue
index dc959de..d6c4acd 100644
--- a/src/components/service-list/commodity-card.vue
+++ b/src/components/service-list/commodity-card.vue
@@ -23,8 +23,8 @@
       <div class="com_card_msg_num1">{{ cellData.deploy_times }}</div>
     </div>
     <div class="com_card_btn">
-      <el-button size="medium" class="btn_1" @click="addShop(cellData.id)">加入购物车</el-button>
-      <el-button size="medium" class="btn_2" @click="goUrl(cellData.id)">查看详情</el-button>
+      <el-button size="medium" class="btn_1" @click="addShop(cellData.app_id)">加入购物车</el-button>
+      <el-button size="medium" class="btn_2" @click="goUrl(cellData.app_id)">查看详情</el-button>
     </div>
   </div>
 </template>
diff --git a/src/components/service-tabs/service-tab-detail.vue b/src/components/service-tabs/service-tab-detail.vue
index ff39b4d..3607c0c 100644
--- a/src/components/service-tabs/service-tab-detail.vue
+++ b/src/components/service-tabs/service-tab-detail.vue
@@ -5,7 +5,11 @@
       v-for="(item, index) in data"
       :key="'detail_' + index"
     >
-      <h3 class="detail-title" v-text="item.name + '：'"></h3>
+      <h3
+        class="detail-title"
+        v-text="item.name + '：'"
+        v-if="item.type != 'rich-text'"
+      ></h3>
 
       <service-steps
         v-if="item.type == 'step'"
@@ -48,6 +52,15 @@
         <el-table-column prop="name" label="name" width="120"></el-table-column>
         <el-table-column prop="value" label="value"></el-table-column>
       </el-table>
+      <mavon-editor
+        v-else-if="item.type == 'rich-text'"
+        v-model="item.value"
+        :boxShadow="false"
+        :toolbarsFlag="false"
+        :subfield="false"
+        defaultOpen="preview"
+        :editable="false"
+      />
     </li>
   </ul>
 </template>
diff --git a/src/components/service-tabs/service-tabs.vue b/src/components/service-tabs/service-tabs.vue
index f5f2a2f..189bf7f 100644
--- a/src/components/service-tabs/service-tabs.vue
+++ b/src/components/service-tabs/service-tabs.vue
@@ -39,6 +39,7 @@
         class="service_info"
         :data="commentsData"
         :url="commentsUrl"
+        :is_app_detail="is_app_detail"
       ></service-tab-comments>
     </el-tab-pane>
   </el-tabs>
@@ -76,23 +77,22 @@ export default {
     },
     detailData: {
       type: Array,
-      default: () => [],
     },
     specificationData: {
       type: Array,
-      default: () => [],
     },
     providerData: {
       type: Object,
-      default: () => {},
     },
     commentsData: {
       type: Object,
-      default: () => {},
     },
     commentsUrl: {
       type: String,
-      default: () => [],
+    },
+    is_app_detail: {
+      type: Boolean,
+      default: false,
     },
   },
   data: () => ({
diff --git a/src/pages/service_shop/yysdDetail.vue b/src/pages/service_shop/yysdDetail.vue
index 4090fbf..d7835fb 100644
--- a/src/pages/service_shop/yysdDetail.vue
+++ b/src/pages/service_shop/yysdDetail.vue
@@ -13,11 +13,10 @@
     <app-info :data="baseInfo"></app-info>
 
     <service-tabs
-      detail-url="yysd"
-      provider-url="yysd"
-      comments-url="yysd"
-      detail-title="应用详情信息"
-      comments-title="应用评价信息"
+      :detail-data="detailData"
+      :provider-data="providerData"
+      :comments-url="commentsUrl"
+      :is_app_detail="true"
     ></service-tabs>
   </div>
 </template>
@@ -34,36 +33,64 @@ export default {
   data: () => ({
     baseInfo: null,
     detailData: null,
-    specification: null,
-    provider: null,
+    providerData: null,
   }),
   computed: {
     id() {
       return this.$route.params.id;
     },
+    commentsUrl() {
+      return `/apaas/hubApi/market/comments/${this.id}`;
+    },
   },
   methods: {
-    getDataFromApi(_url) {
-      return new Promise((resolve, reject) => {
-        this.$http
-          .get(_url)
-          .then((response) => {
-            resolve(response.body);
-          })
-          .catch(function(error) {
-            reject(error);
-          });
-      });
-    },
     init() {
-      this.getDataFromApi(`/static/serviceBaseInfo.json`).then(
-        ({ yysd }) => {
-          this.baseInfo = yysd;
-        },
-        (error) => {
+      this.$http
+        .get("/apaas/hubApi/market/baseInfo", {
+          params: {
+            id: this.id,
+          },
+        })
+        .then(({ data }) => {
+          this.baseInfo = data.data;
+        })
+        .catch(function(error) {
+          console.log(error);
+        });
+
+      this.$http
+        .get(`/apaas/hubApi/market/readme/${this.id}`)
+        .then(({ data }) => {
+          this.detailData = [
+            {
+              name: "获取流程",
+              type: "step",
+              value: ["服务申请", "信息填写", "审核确认", "服务获取"],
+            },
+            {
+              name: "富文本",
+              type: "rich-text",
+              value: data.data,
+            },
+          ];
+        })
+        .catch(function(error) {
+          console.log(error);
+        });
+
+      this.$http
+        .get(`/apaas/hubApi/appShop/orgInfo/${this.id}`)
+        .then(({ data }) => {
+          this.providerData = {
+            organization_name: data.department_name,
+            picture_path: data.picture_path,
+            user_name: data.user_name,
+            phone: data.phone,
+          };
+        })
+        .catch(function(error) {
           console.log(error);
-        }
-      );
+        });
     },
   },
   mounted() {
-- 
2.26.0