diff --git a/src/App.vue b/src/App.vue index 4c714eeefce331392c36e04e1974162a4306b687..49875a7040e2e2d900372b1b13642c931c2e02f3 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 4e41ab80cc8a773e2fe95b2d3298cb9cba8804d2..76aa307d01ca5f653f559f753df96e3afc36be3b 100644 --- a/src/components/service-info/app-info.vue +++ b/src/components/service-info/app-info.vue @@ -1,38 +1,38 @@ diff --git a/src/components/service-tabs/service-tab-detail.vue b/src/components/service-tabs/service-tab-detail.vue index ff39b4d7c9cbb919514ddf7ccc85f82800d8e6c0..3607c0c789ee9e1e5cdf5d124a27fd89c5423f14 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" > -

+

+ diff --git a/src/components/service-tabs/service-tabs.vue b/src/components/service-tabs/service-tabs.vue index f5f2a2f9960f76db00aed5352da3e4ad7efb13c0..189bf7f4dcc92481b870a89147c1e0f025ed5530 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" > @@ -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 4090fbf2b45ebbc17e690459ea5ed1bcff811685..d7835fb8002d83736ee300237e4d810cd1b52b05 100644 --- a/src/pages/service_shop/yysdDetail.vue +++ b/src/pages/service_shop/yysdDetail.vue @@ -13,11 +13,10 @@ @@ -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() {