Merge branch 'zj' into dev

src/pages/workbench/yygl/deploy_app_detail.vue

 <template>
   <div class="detail_contain">
-    <p class="now_page_title">我的应用 / 应用仓库 / <span>应用详情</span></p>
+    <p class="now_page_title">我的应用 / 部署的应用 / <span>应用详情</span></p>
     <div class="info_contain">
       <service-header
         :data="service_header_arr"
@@ -21,40 +21,10 @@
           </div>
         </div>
         <div class="type_box_select">
-          <div v-if="now_service == 0||now_service==2" class="info_contain2">
-            <info-list :list_arr="now_service == 0?list_arr:fwfw_arr">
+          <mavon-editor v-model="list_arr" :boxShadow="false" :toolbarsFlag="false" :subfield="false" defaultOpen="preview" :editable="false" v-if="now_service == 0"/>
+          <div v-if="now_service==2" class="info_contain2">
+            <info-list :list_arr="fwfw_arr">
               <div class="appcode" v-html="appcode" slot="app_code"></div>
-              <div slot="use_know0">
-                访问地址:
-                <a :href="list_arr[4].url" target="_blank">{{
-                  list_arr[4].url
-                }}</a>
-              </div>
-              <div slot="use_know1" class="use_know">
-                <p>
-                  <span>主机名或IP地址</span
-                  ><span>{{ list_arr[4].url.ip }}</span>
-                </p>
-                <p>
-                  <span>端口</span><span>{{ list_arr[4].url.port }}</span>
-                </p>
-                <p>
-                  <span>用户名</span><span>{{ list_arr[4].url.user }}</span>
-                </p>
-                <p>
-                  <span>密码</span
-                  ><span>{{
-                    showPass ? list_arr[4].url.password : this.list_arr[4].url1
-                  }}</span>
-                  <i @click="showpass" class="el-icon-view"></i>
-                </p>
-              </div>
-              <div slot="use_know2" class="use_know2">
-                <p>
-                  {{ list_arr[4].url.text }}
-                  <span @click="gotoview(list_arr[4].url.url)">浏览文件</span>
-                </p>
-              </div>
               <table-um
               slot="fw_table"
               :headers="header_fw_arr"
@@ -405,9 +375,32 @@ export default {
       ],
       service_header_arr: {
         name: "",
-        first: [],
-        second: [],
+        first: [
+          {
+            "name": "业务类型",
+            "text": ""
+          },
+          {
+            "name": "业务领域",
+            "text": ""
+          }
+        ],
+        second: [
+          {
+              "name": "上架区域",
+              "text": ""
+          },
+          {
+              "name": "部署区域",
+              "text": ""
+          },
+          {
+              "name":"部署时间",
+              "text":""
+          }
+        ],
         bsdetail: true,
+        url:'',
       },
       now_service: 0,
       header_arr: [
@@ -437,33 +430,7 @@ export default {
         },
       ],
 
-      list_arr: [
-        {
-          title: "应用简介：",
-          info: "",
-        },
-        {
-          title: "功能简介：",
-          info: "",
-        },
-        {
-          title: "应用场景：",
-          info: "",
-        },
-        {
-          title: "应用参数：",
-          info: "",
-          type: "solt",
-          solt_name: "app_code",
-        },
-        {
-          title: "使用说明：",
-          url: "",
-          url1: "",
-          type: "solt",
-          solt_name: "use_know",
-        },
-      ],
+      list_arr:'',
       fwfw_arr:[
         {
           title: "访问排名",
@@ -625,43 +592,26 @@ export default {
     },
     getServiceInfo() {
       this.$http
-        .get("/static/deployappdetail.json")
+        .get(`/apaas/hubApi/market/deployInfo/${this.$route.params.id}`)
         .then((response) => {
           let data = response.data.data;
-          this.$set(this.service_header_arr, "name", data.appInfo.name);
-          this.$set(this.service_header_arr, "first", data.appInfo.first);
-          this.$set(this.service_header_arr, "second", data.appInfo.second);
+          this.$set(this.service_header_arr, "name", data.deploy_name+ ' ' +'V'+data.app_version);
+          this.$set(this.service_header_arr, "url", data.logo);
+          this.$set(this.service_header_arr['first'][0], "text", data.type_name);
+          this.$set(this.service_header_arr['first'][1], "text", data.business_area_name);
+          this.$set(this.service_header_arr['second'][0], "text", data.upload_area);
+          this.$set(this.service_header_arr['second'][1], "text", data.namespace);
+          this.$set(this.service_header_arr['second'][2], "text", data.created);
         })
         .catch(function(response) {});
     },
 
     getServiceBaseInfo() {
       this.$http
-        .get("/static/deployappdetail.json")
+        .get("/apaas/hubApi/market/readme/"+this.$route.params.id)
         .then((response) => {
           let data = response.data.data;
-          this.$set(this.list_arr[0], "info", data.appbaseinfo.intorduce);
-          this.$set(this.list_arr[1], "info", data.appbaseinfo.action);
-          this.$set(this.list_arr[2], "info", data.appbaseinfo.use);
-          this.$set(
-            this.list_arr[4],
-            "solt_name",
-            "use_know" + data.appbaseinfo.state
-          );
-          if (data.appbaseinfo.state == 0) {
-            this.$set(this.list_arr[4], "url", data.appbaseinfo.url);
-          } else if (data.appbaseinfo.state == 1) {
-            this.$set(this.list_arr[4], "url", data.appbaseinfo.url1);
-            var temp = "";
-            data.appbaseinfo.url1.password.split("").forEach((e) => {
-              temp = temp + "*";
-            });
-            this.$set(this.list_arr[4], "url1", temp);
-          } else if (data.appbaseinfo.state == 2) {
-            this.$set(this.list_arr[4], "url", data.appbaseinfo.url2);
-            this.public = data.appbaseinfo.public;
-          }
-          this.appcode = data.appbaseinfo.appcode;
+          this.list_arr = data
         })
         .catch(function(response) {});
     },