From 51160514d9827803d4fdf555428d13de93415bb3 Mon Sep 17 00:00:00 2001
From: air <30444667+sszdot@users.noreply.github.com>
Date: Fri, 13 Jun 2025 12:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afactor=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=20=20=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=BB=84=E5=AE=BD=E5=BA=A6=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                               | 4 ++++
 src/views/layout/components/headbar.vue             | 1 +
 src/views/layout/components/main/admin/message.vue  | 2 +-
 src/views/layout/components/main/register/index.vue | 2 +-
 src/views/layout/index.vue                          | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

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}') }}
         </template>
       </el-table-column>
-      <el-table-column prop="controler" label="操作" width="200" min-width="200">
+      <el-table-column prop="controler" label="操作" width="380" min-width="380">
         <template slot-scope="scope">
           <el-button-group>
             <el-button type="primary" class="iconfont icon-youxishoubing"
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 8076ad6..eeadc84 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -69,7 +69,7 @@ export default {
     this.$store.dispatch('fetchSpuList')// 获取商品spu列表
     this.$store.dispatch('fetchSkuList')// 获取商品sku列表
     this.$store.dispatch('fetchPaidOrderList')// 获取订单列表
-    this.$store.dispatch('fetchMessageList')// 获取管理员公告列表
+    this.$store.dispatch('fetchMessageList')// 获取管理员公告列表 并弹出公告框
   },
   watch: {
     /**