diff --git a/src/styles/index.scss b/src/styles/index.scss index 9a3a842..d054fc7 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -175,6 +175,10 @@ label { top: 30px !important; } +.mapboxgl-ctrl-top-left { + top: 30px !important; +} + //public .borderLN { diff --git a/src/views/layout/components/headbar.vue b/src/views/layout/components/headbar.vue index 5685bab..022ef80 100644 --- a/src/views/layout/components/headbar.vue +++ b/src/views/layout/components/headbar.vue @@ -306,6 +306,7 @@ export default { this.$store.dispatch('fetchRouteList') // 获取航线列表 this.$store.dispatch('fetchCategoryList') // 获取分类列表(小程序) this.$store.dispatch('fetchPaidOrderList') // 获取订单列表 + this.$store.dispatch('fetchMessageList')// 获取管理员公告列表 并弹出公告框 }, /** * @description: 登出 diff --git a/src/views/layout/components/main/admin/message.vue b/src/views/layout/components/main/admin/message.vue index 392215f..b99da05 100644 --- a/src/views/layout/components/main/admin/message.vue +++ b/src/views/layout/components/main/admin/message.vue @@ -79,7 +79,7 @@ export default { return } - const endTime = Math.floor(new Date(this.form.date).getTime() / 1000 + 86400) + const endTime = Math.floor(new Date(this.form.date).setHours(23, 59, 59, 999) / 1000)// 取日历选择的 当天最后一秒 const res = await pubMessage(this.form.tit, this.form.message, this.idArr, endTime) diff --git a/src/views/layout/components/main/register/index.vue b/src/views/layout/components/main/register/index.vue index 8ae7e9b..bd0c902 100644 --- a/src/views/layout/components/main/register/index.vue +++ b/src/views/layout/components/main/register/index.vue @@ -43,7 +43,7 @@ {{ scope.row.apply_time | parseTime('{y}-{m}-{d}') }} - +