From fe9cb54c936d653510378960fc6f422a13e037fe Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 17 Mar 2021 11:09:52 +0800
Subject: [PATCH] update

Former-commit-id: c1dadd17596c6d8c9f5484fd3b176f871248b8da
Former-commit-id: 50f6914b285bceeb06af42cbd9cdc408e1625b63
---
 .../wwwroot/components/views/shared/layout.html |  2 +-
 .../components/views/shared/redirect.html       | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/projects/WebMVC/wwwroot/components/views/shared/layout.html b/projects/WebMVC/wwwroot/components/views/shared/layout.html
index ac42840a..f83a9d5f 100644
--- a/projects/WebMVC/wwwroot/components/views/shared/layout.html
+++ b/projects/WebMVC/wwwroot/components/views/shared/layout.html
@@ -122,7 +122,7 @@
                     if (response.status === 200) {
                         store.commit('login', response.data);
                         setTimeout(function () {
-                            router.push({ path: '/components/views/shared/redirect.html', query: { url: router.currentRoute.fullPath } });
+                            router.push({ path: '/components/views/shared/redirect.html', query: { url: router.currentRoute.fullPath,message:'正在切换当前机构' } });
                         }, 1000);
                     }
                     else if (response.status === 400) {
diff --git a/projects/WebMVC/wwwroot/components/views/shared/redirect.html b/projects/WebMVC/wwwroot/components/views/shared/redirect.html
index 4016d022..53ec4110 100644
--- a/projects/WebMVC/wwwroot/components/views/shared/redirect.html
+++ b/projects/WebMVC/wwwroot/components/views/shared/redirect.html
@@ -1,19 +1,18 @@
 <template>
-    <layout><div>loading</div></layout>
+    <div class="content-wrapper" style="box-sizing:border-box;height: calc(100vh);padding:5em 1em;margin:0;background:#333;text-align:center;font-size:14px;color:#ccc;">
+        <p>{{message}}</p>
+    </div>
 </template>
 <script>
     export default {
+        computed: {
+            message: function () {
+                return this.$route.query.message || 'loading';
+            }
+        },
         mounted: function () {
             var url = this.$route.query.url || '/';
             this.$router.push(url);
-        },
-        methods: {
-            //beforeRouteEnter(to, from, next) {
-            //    console.log(to);
-            //    console.log(from);
-            //    console.log(next);
-            //    router.push('/');
-            //}
         }
     }
 </script>
\ No newline at end of file