From 6c79753051134d176f6b333935d0cc0ec227d7a4 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 10 Apr 2025 11:56:03 +0800
Subject: [PATCH] no message

---
 package.json                                           | 2 +-
 resources/assets/js/App.vue                            | 1 +
 resources/assets/js/components/Mobile/Notification.vue | 2 +-
 resources/assets/js/pages/manage/messenger.vue         | 2 +-
 resources/assets/js/store/state.js                     | 4 +++-
 resources/assets/sass/pages/common.scss                | 5 +++++
 resources/assets/sass/root.scss                        | 1 +
 resources/mobile                                       | 2 +-
 8 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9db618212..b08be5dff 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "stylus-loader": "^7.1.0",
         "tinymce": "^5.10.3",
         "tui-calendar-hi": "^2.1.3-3",
-        "view-design-hi": "^4.7.0-74",
+        "view-design-hi": "^4.7.0-75",
         "vite": "^2.9.15",
         "vite-plugin-file-copy": "^1.0.0",
         "vite-plugin-require": "^1.1.10",
diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index e5978d87d..e4d45c1df 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -155,6 +155,7 @@ export default {
 
         rootStyle() {
             return {
+                '--window-scroll-y': `${this.windowScrollY}px`,
                 '--status-bar-height': `${this.safeAreaSize.top}px`,
                 '--status-bar-color': this.statusColor || '#ffffff',
                 '--navigation-bar-height': `${this.safeAreaSize.bottom}px`,
diff --git a/resources/assets/js/components/Mobile/Notification.vue b/resources/assets/js/components/Mobile/Notification.vue
index 508a9eeff..0e3ae59ed 100644
--- a/resources/assets/js/components/Mobile/Notification.vue
+++ b/resources/assets/js/components/Mobile/Notification.vue
@@ -67,7 +67,7 @@ export default {
             this.show = true;
             this.timer && clearTimeout(this.timer);
             if (this.duration > 0) {
-                // this.timer = setTimeout(this.close, this.duration)
+                this.timer = setTimeout(this.close, this.duration)
             }
             $A.eeuiAppSendMessage({
                 action: 'setVibrate',
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index d79e44384..54e7fec25 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -66,7 +66,7 @@
                 <Scrollbar
                     ref="list"
                     class="messenger-list"
-                    :hide-bar="this.operateVisible"
+                    :hide-bar="operateVisible"
                     @touchstart.native="listTouch"
                     @on-scroll="listScroll">
                     <ul v-if="tabActive==='dialog'" ref="ul" class="dialog">
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 9c0bfa65b..fb2cae119 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -15,13 +15,15 @@ export default {
     // 窗口滚动条位置
     windowScrollY: 0,
 
+    // 安全区域尺寸（顶部状态栏、底部导航栏）
+    safeAreaSize: {top: 0, bottom: 0, data: null},
+
     // 浏览器支持触摸事件
     windowTouch: "ontouchend" in document,
 
     // 浏览器尺寸信息
     windowWidth: windowWidth,
     windowHeight: windowHeight,
-    safeAreaSize: {top: 0, bottom: 0, data: null},   // 安全区域尺寸
 
     // 是否第一个页面（eeui）
     isFirstPage: false,
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 7936e07eb..b60537692 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -273,6 +273,11 @@ body {
         }
     }
 
+    .ivu-notice,
+    .ivu-message {
+        margin-top: calc(var(--window-scroll-y) + var(--status-bar-height));
+    }
+
     .ivu-modal-wrap {
         overflow: overlay;
 
diff --git a/resources/assets/sass/root.scss b/resources/assets/sass/root.scss
index 7899c92b7..aab41cb8f 100644
--- a/resources/assets/sass/root.scss
+++ b/resources/assets/sass/root.scss
@@ -1,4 +1,5 @@
 :root {
+    --window-scroll-y: 0px;
     --status-bar-height: 0px;
     --status-bar-color: #ffffff;
     --navigation-bar-height: 0px;
diff --git a/resources/mobile b/resources/mobile
index c1afa3642..b9d4772f6 160000
--- a/resources/mobile
+++ b/resources/mobile
@@ -1 +1 @@
-Subproject commit c1afa36421ff425312ed9e3c09046a7ca73d8c28
+Subproject commit b9d4772f665d36e018f35d791f3c8b9a934c035e