diff --git a/src/api/notice/index.js b/src/api/notice/index.js index 3ca92686..35c016bf 100644 --- a/src/api/notice/index.js +++ b/src/api/notice/index.js @@ -17,3 +17,19 @@ export function Attestation(query) { params: query }) } + +//成交公告 +export function noticeDetails(id) { + return request({ + url: '/transaction/website/outproject/publicity/id/'+id, + method: 'get' + }) +} + +//鉴证公告 +export function AttestationDetail(id) { + return request({ + url: '/transaction/website/jzlist/id/'+id, + method: 'get' + }) +} diff --git a/src/api/user/index.js b/src/api/user/index.js new file mode 100644 index 00000000..cbacbce2 --- /dev/null +++ b/src/api/user/index.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +//新闻列表 +export function userData(query){ + return request({ + url: '/transaction/website/newsList', + method: 'get', + params: query + }) +} diff --git a/src/router/index.js b/src/router/index.js index db78923b..6c3a58d4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -266,6 +266,33 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/policy/index'], resolve) + }, + { + path: '/noticeDetail', + name: 'noticeDetail', + meta: { + title: '公告详情', + hidden: true, + }, + component: (resolve) => require(['@/views/notice/noticeDetail'], resolve) + }, + { + path: '/attestationDetail', + name: 'attestationDetail', + meta: { + title: '鉴证详情', + hidden: true, + }, + component: (resolve) => require(['@/views/notice/attestationDetail'], resolve) + }, + { + path: '/policyDetail', + name: 'policyDetail', + meta: { + title: '政策法规', + hidden: true, + }, + component: (resolve) => require(['@/views/policy/policyDetail'], resolve) } ]; diff --git a/src/views/news/newDetail.vue b/src/views/news/newDetail.vue index e2ed7172..1da9156d 100644 --- a/src/views/news/newDetail.vue +++ b/src/views/news/newDetail.vue @@ -7,6 +7,14 @@ placeholder @click-left="onClickLeft" /> +

{{detail.title}}

+ + + {{detail.createTime}} + 数据来源:{{detail.createBy}} + + +
@@ -16,8 +24,7 @@ export default { name: "newsDetail", data() { return { - current: 0, - show: false, + detail:'', }; }, created() { @@ -25,17 +32,10 @@ export default { }, methods: { getList(){ - this.loading = true; - console.log(this.$route.query.id) newDetails(this.$route.query.id).then(response => { - this.List = response.rows; console.log(response) - if(this.List.length >= response.total){ - this.finished = true; - return; - } - this.queryParams.pageNum += 1 ; - this.loading = false; + this.detail = response.data + document.getElementById('content').innerHTML = response.data.content; }); }, }, @@ -44,5 +44,13 @@ export default { diff --git a/src/views/notice/attestationDetail.vue b/src/views/notice/attestationDetail.vue new file mode 100644 index 00000000..fa4eff5f --- /dev/null +++ b/src/views/notice/attestationDetail.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue index d4caccc6..ff90d3df 100644 --- a/src/views/notice/index.vue +++ b/src/views/notice/index.vue @@ -5,6 +5,7 @@ left-arrow fixed placeholder + @click-left="onClickLeft" /> @@ -16,7 +17,7 @@ style="margin-top: 10px;" @load="getList" > - + @@ -32,9 +33,9 @@ style="margin-top: 10px;" @load="getAttestationList" > - + @@ -97,6 +98,7 @@ export default { this.attestationLoading = true; Attestation(this.attestationQueryParams).then(response => { this.attestationList = response.rows; + console.log(response.rows) if(this.attestationList.length >= response.total){ this.attestationFinished = true; return; diff --git a/src/views/notice/noticeDetail.vue b/src/views/notice/noticeDetail.vue new file mode 100644 index 00000000..3cd1f780 --- /dev/null +++ b/src/views/notice/noticeDetail.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/policy/index.vue b/src/views/policy/index.vue index 44b3b5cf..78acc24f 100644 --- a/src/views/policy/index.vue +++ b/src/views/policy/index.vue @@ -5,6 +5,7 @@ left-arrow fixed placeholder + @click-left="onClickLeft" /> @@ -16,7 +17,7 @@ style="margin-top: 10px;" @load="getList" > - + @@ -32,7 +33,7 @@ style="margin-top: 10px;" @load="getSecondList" > - + @@ -48,7 +49,7 @@ style="margin-top: 10px;" @load="getThreeList" > - < + diff --git a/src/views/policy/policyDetail.vue b/src/views/policy/policyDetail.vue index eba82971..cdb14d97 100644 --- a/src/views/policy/policyDetail.vue +++ b/src/views/policy/policyDetail.vue @@ -1,410 +1,56 @@ diff --git a/src/views/supply/index.vue b/src/views/supply/index.vue index 35814323..1bad1d55 100644 --- a/src/views/supply/index.vue +++ b/src/views/supply/index.vue @@ -5,6 +5,7 @@ left-arrow fixed placeholder + @click-left="onClickLeft" /> diff --git a/src/views/user/accountSetting/userInformation/userInformation.vue b/src/views/user/accountSetting/userInformation/userInformation.vue index f10c97da..1fb283ad 100644 --- a/src/views/user/accountSetting/userInformation/userInformation.vue +++ b/src/views/user/accountSetting/userInformation/userInformation.vue @@ -29,8 +29,9 @@