From 5e12abaabb002eef246d54d92833f0e09fa5ddd7 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 16 Mar 2023 09:23:24 +0800
Subject: [PATCH] no message

---
 resources/assets/js/App.vue                       | 15 ++++++++++++---
 resources/assets/js/pages/login.vue               |  4 +++-
 resources/assets/js/store/state.js                |  3 +++
 resources/assets/sass/components/mobile.scss      |  5 +----
 .../sass/pages/components/dialog-wrapper.scss     |  6 ++----
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 3131ab856..c55d8e543 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -77,7 +77,7 @@ export default {
     },
 
     computed: {
-        ...mapState(['ws', 'themeMode']),
+        ...mapState(['ws', 'themeMode', 'supportTouch']),
 
         isSoftware() {
             return this.$Electron || this.$isEEUiApp;
@@ -145,6 +145,17 @@ export default {
             immediate: true
         },
 
+        supportTouch: {
+            handler(support) {
+                if (support) {
+                    $A("body").addClass("support-touch")
+                } else {
+                    $A("body").removeClass("support-touch")
+                }
+            },
+            immediate: true
+        },
+
         windowActive(active) {
             if (active) {
                 this.__windowTimer && clearTimeout(this.__windowTimer)
@@ -259,8 +270,6 @@ export default {
             if (!this.$isEEUiApp) {
                 return;
             }
-            // bodyClass
-            $A("body").addClass("eeui-app")
             // 页面失活
             window.__onPagePause = () => {
                 this.$store.state.windowActive = false;
diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index b9fd1be15..c2d552d17 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -566,7 +566,9 @@ export default {
             this.loginJump = true;
             const fromUrl = decodeURIComponent($A.getObject(this.$route.query, 'from'));
             if (fromUrl) {
-                window.location.replace(fromUrl);
+                $A.IDBSet("callAt", []).then(_ => {
+                    window.location.replace(fromUrl);
+                })
             } else {
                 this.goForward({name: 'manage-dashboard'}, true);
             }
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index a9bf4b9e1..94f2c1be9 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -1,4 +1,7 @@
 export default {
+    // 是否移动端（支持触摸）
+    supportTouch: "ontouchend" in document,
+
     // 浏览器尺寸信息
     windowWidth: $A(window).width(),
     windowHeight: $A(window).height(),
diff --git a/resources/assets/sass/components/mobile.scss b/resources/assets/sass/components/mobile.scss
index ee0092327..b65bbcdb1 100644
--- a/resources/assets/sass/components/mobile.scss
+++ b/resources/assets/sass/components/mobile.scss
@@ -306,7 +306,7 @@
     opacity: 0;
 }
 
-body.eeui-app {
+body.support-touch {
     .mobile-back {
         display: block;
     }
@@ -316,9 +316,6 @@ body.eeui-app {
     .mobile-tabbar {
         display: flex;
     }
-    .mobile-back {
-        display: block;
-    }
     .mobile-notification {
         top: 12px;
         width: 94%;
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index e3a0cf0c3..e8b8ab5fd 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -672,7 +672,7 @@
                                 .mention {
                                     color: $flow-status-end-color;
                                     background-color: transparent;
-                                    user-select: auto;
+                                    user-select: inherit;
                                     padding: 0;
                                     margin: 0;
 
@@ -1581,7 +1581,7 @@
     }
 }
 
-body.eeui-app {
+body.support-touch {
     .dialog-wrapper {
         .dialog-scroller {
             user-select: none;
@@ -1727,7 +1727,6 @@ body.eeui-app {
             padding-right: 14px;
             padding-left: 14px;
             overscroll-behavior: none;
-            user-select: none;
             background-color: #ffffff;
 
             &.default-header {
@@ -1769,7 +1768,6 @@ body.eeui-app {
                                 a, img {
                                     -webkit-touch-callout: default;
                                 }
-                                user-select: text;
                             }
                         }
                     }