diff --git a/package.json b/package.json index f6e0809..a34b753 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "vue-count-to": "1.0.13", "vue-cropper": "0.4.9", "vue-router": "3.0.2", + "vue-seamless-scroll": "^1.1.23", "vue-splitpane": "1.0.4", "vuedraggable": "2.20.0", "vuex": "3.1.0" diff --git a/src/views/components/footer/index.vue b/src/views/components/footer/index.vue index 9434917..2440359 100644 --- a/src/views/components/footer/index.vue +++ b/src/views/components/footer/index.vue @@ -5,13 +5,17 @@
@@ -31,11 +35,11 @@
@@ -47,9 +51,7 @@ CopyRight 2020-2021 版权所有 合肥嘉策信息技术服务有限公司 - 皖ICP备2021010348号 + 皖ICP备2021010348号 @@ -74,17 +76,39 @@ export default { }, data() { return { - footerData: {} + footerData: {}, + total: 0, + gold: 0 }; }, + watch: { + totalNum: { + handler(newVal) { + this.total = newVal + }, + immediate: true, + deep: true + }, + goldNum: { + handler(newVal) { + this.gold = newVal + }, + immediate: true, + deep: true + } + }, created() { getBottom().then(({ data }) => { this.footerData = data; + // this.total = this.totalNum + // this.gold = this.goldNum }); if (!this.flag) return false; getRead({ id: 1 }).then(({ data }) => { - this.totalNum = data.count; - this.goldNum = data.today; + // this.totalNum = data.count; + this.total = data.count; + // this.goldNum = data.today; + this.gold = data.today; }); } }; diff --git a/src/views/home/home.vue b/src/views/home/home.vue index 91063d5..e8bed22 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -6,15 +6,15 @@ - +
- - + +
- 更多 + 更多 +
@@ -67,7 +68,7 @@ " >其他 - --> + -->
- {{ item.title }} - + >{{ item.title }} - + - {{ - parseTime(item.listDate, '{m}-{d}') - }} + + {{ + parseTime(item.listDate, '{m}-{d}') + }} +
@@ -102,8 +103,8 @@
- - + +
- 更多 + 更多 +
@@ -126,8 +128,8 @@ @mouseover=" (queryParams.labelId = '1415156808053559296'), handleClick() " - >政策转发 + @click="jumpToDetails('1415156808053559296')" + >政策转发 申报通知 + @click="jumpToDetails('1415156963146338304')" + >申报通知 公示转发 + @click="jumpToDetails('1415157002090450944')" + >公示转发 公告转发 + @click="jumpToDetails('1415157026115424256')" + >公告转发 + -->
{{ parseTime(item.listDate, '{m}-{d}') }}
@@ -188,8 +188,8 @@
- - + +
- 更多 + 更多 +
@@ -213,9 +214,7 @@ path: '/result', query: { key: 'information', id: item.id }, }" - > - {{ item.title }} - + >{{ item.title }}
{{ parseTime(item.createTime, '{m}-{d}') }} @@ -225,165 +224,110 @@
-

- - +

+ +

- - + + 安徽
- - + + 合肥
- - + + 芜湖
- - + + 蚌埠
- - + + 淮南
- - + + 马鞍山
- - + + 淮北
- - + + 铜陵
- - + + 安庆
- - + + 滁州
- - + + 阜阳
- - + + 宿州
- - + + 六安
- - + + 亳州
- - + + 池州
- - + + 宣城
- - + + 黄山
@@ -392,7 +336,7 @@ target="_blank" :to="{ path: '/notice', query: { key: '3', val: '合肥区县' } }" > - + 合肥区县
@@ -400,20 +344,13 @@

- - + +

{{ val }}: @@ -41,8 +40,7 @@ :label="item.value" border @change="handleClick" - >{{ item.label }} + >{{ item.label }}
{{ val }}: @@ -54,8 +52,7 @@ :label="item.value" border @change="handleClick" - >{{ item.label }} + >{{ item.label }}
@@ -70,9 +67,7 @@ id: item.id } }" - > - {{ item.title }} - + >{{ item.title }} {{ item.listDate }} {{ item.createTime }} @@ -85,15 +80,11 @@
发布:{{ item.createTime }} -
--> +
-->
- + 暂无数据
@@ -249,7 +240,8 @@ export default { } else if (key == 'information') { this.getPortraitList(); } else if (key == 'policyNotice') { - this.queryParams.labelId = this.policyNoticeOptions[0].value; + // this.queryParams.labelId = this.policyNoticeOptions[0].value; + this.queryParams.labelId = this.$route.query.labelId this.getPortraitList(); } else { this.msgError('非法进入'); diff --git a/src/views/result.vue b/src/views/result.vue index 118a235..509c7f6 100644 --- a/src/views/result.vue +++ b/src/views/result.vue @@ -30,19 +30,15 @@ - --> + -->

{{ formData.title }}

- 来源:{{ formData.source }} - 价格:{{ setNumber(formData.price) }} + 来源:{{ formData.source }} + 价格:{{ setNumber(formData.price) }} - 发布:{{ + + 发布:{{ formData.listDate || parseTime(formData.createTime, '{y}-{m}-{d}') - }} + }} + - - 收藏 + + + 收藏 - - 取消收藏 + + + 取消收藏
@@ -102,17 +90,14 @@
公示公告
- 更多 + 更多 +
    -
  • +
  • - {{ item.title }} + + {{ item.title }}
@@ -168,7 +154,7 @@ export default { }, watch: { formData: { - handler: function() { + handler: function () { if (this.type == 'policy' || this.type == 'policyRead') { this.$nextTick(() => { this.formatRichText( @@ -280,6 +266,7 @@ export default { } .my_main { margin: 30px auto; + .r { .title { display: flex; @@ -303,4 +290,7 @@ export default { } } } +.wzcon { + line-height: 1.5; +}