From dd2556133851cabf556f60771e9ef7b3d8d14a4e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 10 Jun 2022 11:23:37 +0800
Subject: [PATCH] no message

---
 .../assets/js/components/RightBottom.vue      |  8 ++++++++
 resources/assets/js/components/UserAvatar.vue |  1 +
 resources/assets/js/pages/index.vue           | 20 ++++++++++---------
 .../pages/manage/components/DialogWrapper.vue | 12 +++++++++++
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/components/RightBottom.vue b/resources/assets/js/components/RightBottom.vue
index b91b73410..fd17cd118 100644
--- a/resources/assets/js/components/RightBottom.vue
+++ b/resources/assets/js/components/RightBottom.vue
@@ -99,7 +99,15 @@ export default {
     },
 
     methods: {
+        isNotServer() {
+            let apiHome = $A.getDomain(window.systemInfo.apiUrl)
+            return this.isSoftware && (apiHome == "" || apiHome == "public")
+        },
+        
         checkVersion() {
+            if (this.isNotServer()) {
+                return;
+            }
             axios.get($A.apiUrl('../version')).then(({status, data}) => {
                 if (status === 200) {
                     this.apiVersion = data.version || ''
diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index cae8875c5..f7d177846 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -9,6 +9,7 @@
             <slot/>
             <p>{{$L('昵称')}}: {{user.nickname}}</p>
             <p>{{$L('职位/职称')}}: {{user.profession || '-'}}</p>
+            <p v-if="user.disable_at"><strong>{{$L('离职时间')}}: {{user.disable_at}}</strong></p>
             <div v-if="userId != userid && showIconMenu" class="avatar-icons">
                 <Icon type="ios-chatbubbles" @click="openDialog"/>
             </div>
diff --git a/resources/assets/js/pages/index.vue b/resources/assets/js/pages/index.vue
index 40dbd861b..b79d439df 100644
--- a/resources/assets/js/pages/index.vue
+++ b/resources/assets/js/pages/index.vue
@@ -206,15 +206,17 @@ export default {
     },
 
     mounted() {
-        if (this.$router.mode === "hash") {
-            if ($A.stringLength(window.location.pathname) > 2) {
-                window.location.href = `${window.location.origin}/#${window.location.pathname}${window.location.search}`
-                return
-            }
-        } else if (this.$router.mode === "history") {
-            if ($A.strExists(window.location.href, "/#/")) {
-                window.location.href = window.location.href.replace("/#/", "/")
-                return
+        if (/^https*:/i.test(window.location.protocol)) {
+            if (this.$router.mode === "hash") {
+                if ($A.stringLength(window.location.pathname) > 2) {
+                    window.location.href = `${window.location.origin}/#${window.location.pathname}${window.location.search}`
+                    return
+                }
+            } else if (this.$router.mode === "history") {
+                if ($A.strExists(window.location.href, "/#/")) {
+                    window.location.href = window.location.href.replace("/#/", "/")
+                    return
+                }
             }
         }
         this.getNeedStartHome();
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index c773ba5e6..042680cf1 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -73,6 +73,7 @@
         <DynamicScroller
             ref="scroller"
             class="dialog-scroller scrollbar-overlay"
+            :style="{opacity: scrollerShow ? 1 : 0}"
             :disabled="touchBackInProgress"
             :items="allMsgs"
             :min-item-size="58"
@@ -328,6 +329,7 @@ export default {
 
             dialogDrag: false,
             groupInfoShow: false,
+            scrollerShow: true,
 
             navStyle: {},
 
@@ -498,6 +500,9 @@ export default {
 
         allMsgList(newList, oldList) {
             const {scrollE} = this.scrollInfo();
+            if (oldList.length === 0) {
+                this.scrollerShow = false;
+            }
             this.allMsgs = newList;
             //
             if (scrollE > 10 && oldList.length > 0) {
@@ -507,6 +512,13 @@ export default {
             } else {
                 requestAnimationFrame(this.onToBottom)
             }
+            //
+            this.allMsgTimer && clearTimeout(this.allMsgTimer);
+            if (!this.scrollerShow) {
+                this.allMsgTimer = setTimeout(_=>{
+                    this.scrollerShow = true;
+                },100)
+            }
         },
 
         windowScrollY(val) {