From 643ccc488076f5b59e125c81ac51f38f382a451a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 14 Jun 2022 09:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BC=9A=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8A=A0=E8=BD=BD=E8=A6=86=E7=9B=96=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/components/ManageLoad.vue | 33 -------------------
 resources/assets/js/pages/manage.vue          | 19 ++---------
 resources/assets/sass/pages/page-manage.scss  | 12 -------
 3 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 resources/assets/js/components/ManageLoad.vue

diff --git a/resources/assets/js/components/ManageLoad.vue b/resources/assets/js/components/ManageLoad.vue
deleted file mode 100644
index 6b3345cfa..000000000
--- a/resources/assets/js/components/ManageLoad.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-    <div v-if="[-1, 0].includes(userState)" class="app-view-loading">
-        <div v-if="userState === -1" class="load-error" @click="onClick">
-            {{$L('加载失败，点击重试')}}
-        </div>
-        <div v-else>
-            <div>PAGE LOADING</div>
-            <span></span>
-            <span></span>
-            <span></span>
-            <span></span>
-            <span></span>
-            <span></span>
-            <span></span>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: 'ManageLoad',
-        props: {
-            userState: {
-                type: Number,
-            },
-        },
-        methods: {
-            onClick() {
-                this.$emit('on-click')
-            }
-        }
-    }
-</script>
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 616332b21..8f69d3ef6 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -235,9 +235,6 @@
             </keep-alive>
         </div>
 
-        <!--等待覆盖层-->
-        <ManageLoad :user-state="userState" class="manage-box-load" @on-click="loadUser"/>
-
         <!--新建项目-->
         <Modal
             v-model="addShow"
@@ -378,11 +375,9 @@ import DialogModal from "./manage/components/DialogModal";
 import TaskModal from "./manage/components/TaskModal";
 import notificationKoro from "notification-koro1";
 import {Store} from "le5le-store";
-import ManageLoad from "../components/ManageLoad";
 
 export default {
     components: {
-        ManageLoad,
         TaskModal,
         DialogModal,
         MeetingManager,
@@ -400,7 +395,6 @@ export default {
     data() {
         return {
             loadIng: 0,
-            userState: 0,
 
             mateName: /macintosh|mac os x/i.test(navigator.userAgent) ? '⌘' : 'Ctrl',
 
@@ -466,9 +460,9 @@ export default {
     },
 
     activated() {
-        this.loadUser();
-        this.getReportUnread(0);
+        this.$store.dispatch("getUserInfo").catch(_ => {})
         this.$store.dispatch("getTaskPriority").catch(_ => {})
+        this.getReportUnread(0);
     },
 
     beforeDestroy() {
@@ -723,15 +717,6 @@ export default {
             };
         },
 
-        loadUser() {
-            this.userState = 0;
-            this.$store.dispatch("getUserInfo").then(_ => {
-                this.userState = 1;
-            }).catch(_ => {
-                this.userState = -1;
-            })
-        },
-
         chackPass() {
             if (this.userInfo.changepass === 1) {
                 this.goForward({name: 'manage-setting-password'});
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index d4b977b24..77caa92ff 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -260,18 +260,6 @@
             overflow: auto;
         }
     }
-    .manage-box-load {
-        position: fixed;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        z-index: 99;
-        background-color: #ffffff;
-        .load-error {
-            cursor: pointer;
-        }
-    }
 }
 
 .page-manage-menu-dropdown {