浏览代码

Fix user log out on refresh

master
Kobus 5 年前
父节点
当前提交
aab02e0878

+ 1
- 0
src/components/admin/status/timeshareAdminPage.vue 查看文件

@@ -23,6 +23,7 @@
23 23
           @onClearSelected="onClearSelected"
24 24
           :columnsCount="15"
25 25
           :title="'Pending Weeks'"
26
+          :showNew="false"
26 27
         />
27 28
       </div>
28 29
     </div>

+ 1
- 1
src/components/shared/listView.vue 查看文件

@@ -5,7 +5,7 @@
5 5
     <div style="height:5px"></div>
6 6
     <div class="d-flex justify-content-between table-title">
7 7
       <div class="p-2" v-if="!hideSearch">
8
-        <input v-model="searchItem" class="form-control" :placeholder="currentPage" />
8
+        <input v-model="searchItem" class="form-control" placeholder="Search...." />
9 9
       </div>
10 10
       <div class="p-2" v-if="title">
11 11
         <h2>{{title}}</h2>

+ 6
- 4
src/components/shared/navBar.vue 查看文件

@@ -214,6 +214,7 @@
214 214
 
215 215
 <script>
216 216
 import { mapState, mapActions } from 'vuex';
217
+import Log from '../../assets/Log';
217 218
 
218 219
 export default {
219 220
   computed: {
@@ -224,11 +225,12 @@ export default {
224 225
       'person',
225 226
       'token',
226 227
     ]),
227
-    NAME() {
228
-      return this.person.name;
229
-    },
230 228
     isLoggedIn() {
231
-      return this.token !== null && this.token !== undefined;
229
+      console.log(Log.isLoggedIn());
230
+      return Log.isLoggedIn();
231
+    },
232
+    NAME() {
233
+      return Log.getPerson().name;
232 234
     },
233 235
     // eslint-disable-next-line vue/return-in-computed-property
234 236
     Logout() {

正在加载...
取消
保存