From 75853687579fbee0daef46b26cee07201b8ada5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Fri, 17 Mar 2023 00:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/layout.vue |  6 +++---
 src/core/models/order.js         | 10 +++-------
 src/pages/member/member.vue      |  6 ++++--
 src/pages/member/password.vue    |  6 ++++--
 src/pages/service/cate.vue       |  6 ++++--
 src/pages/service/list.vue       |  6 ++++--
 src/store/modules/user.js        |  6 +++++-
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/components/layout/layout.vue b/src/components/layout/layout.vue
index a853efe..8bd6ddd 100644
--- a/src/components/layout/layout.vue
+++ b/src/components/layout/layout.vue
@@ -36,7 +36,7 @@
 
 <script>
 import AuthLoginBox from "@/components/auth/login-box";
-import { mapState } from "vuex";
+import { mapGetters } from "vuex";
 export default {
     name: "component-layout",
     data() {
@@ -84,8 +84,8 @@ export default {
         },
     },
     computed: {
-        ...mapState({
-            isLogin: (state) => state.user.token.length > 0,
+        ...mapGetters({
+            isLogin: "user/isLogin",
         }),
     },
     created() {
diff --git a/src/core/models/order.js b/src/core/models/order.js
index c14a359..d721156 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -80,9 +80,7 @@ export default {
                         },
                     });
                 }
-            }).catch(e => {
-                throw e
-            });
+            }).catch(e => { });
         });
     },
     /**
@@ -173,7 +171,7 @@ export default {
                     return resolve(list);
                 }
                 return reject(response.msg);
-            }).catch(e => { throw e });
+            }).catch(e => { });
         });
     },
     /**
@@ -242,9 +240,7 @@ export default {
                     return resolve(order);
                 }
                 return reject(response.msg);
-            }).catch(e => {
-                throw e
-            });
+            }).catch(e => { });
         });
     },
     /**
diff --git a/src/pages/member/member.vue b/src/pages/member/member.vue
index d710f95..7f862d6 100644
--- a/src/pages/member/member.vue
+++ b/src/pages/member/member.vue
@@ -63,7 +63,7 @@
 
 <script>
 import AppLayout from "@/components/layout/layout";
-import { mapState } from "vuex";
+import { mapGetters, mapState } from "vuex";
 export default {
     name: "member",
     data() {
@@ -76,9 +76,11 @@ export default {
     },
     computed: {
         ...mapState({
-            isLogin: (state) => state.user.token.length > 0,
             userInfo: (state) => state.user.info,
         }),
+        ...mapGetters({
+            isLogin: "user/isLogin",
+        }),
     },
     onLoad() {},
     onShow() {},
diff --git a/src/pages/member/password.vue b/src/pages/member/password.vue
index 51f6a7b..9a85663 100644
--- a/src/pages/member/password.vue
+++ b/src/pages/member/password.vue
@@ -35,7 +35,7 @@
 
 <script>
 import AppLayout from "@/components/layout/layout";
-import { mapState } from "vuex";
+import { mapGetters, mapState } from "vuex";
 export default {
     name: "member-password",
     data() {
@@ -52,9 +52,11 @@ export default {
     },
     computed: {
         ...mapState({
-            isLogin: (state) => state.user.token.length > 0,
             userInfo: (state) => state.user.info,
         }),
+        ...mapGetters({
+            isLogin: "user/isLogin",
+        }),
     },
     onLoad() {
         if (!this.isLogin) {
diff --git a/src/pages/service/cate.vue b/src/pages/service/cate.vue
index c79a210..e97cc0b 100644
--- a/src/pages/service/cate.vue
+++ b/src/pages/service/cate.vue
@@ -36,7 +36,7 @@
 import AppLayout from "@/components/layout/layout";
 import AppCate from "@/components/cate/cate";
 import WidgetSearch from "@/components/widgets/search";
-import { mapState } from "vuex";
+import { mapGetters, mapState } from "vuex";
 export default {
     name: "service-cate",
     data() {
@@ -57,7 +57,9 @@ export default {
         ...mapState({
             indexCateId: (state) => state.system.indexCateId,
             cartCount: (state) => state.cart.count,
-            isLogin: (state) => state.user.token.length > 0,
+        }),
+        ...mapGetters({
+            isLogin: "user/isLogin",
         }),
     },
     async onLoad() {
diff --git a/src/pages/service/list.vue b/src/pages/service/list.vue
index 32a30eb..d90de6e 100644
--- a/src/pages/service/list.vue
+++ b/src/pages/service/list.vue
@@ -29,7 +29,7 @@
 <script>
 import AppLayout from "@/components/layout/layout";
 import AppCate from "@/components/cate/cate";
-import { mapState } from "vuex";
+import { mapGetters, mapState } from "vuex";
 export default {
     name: "service-list",
     data() {
@@ -48,7 +48,9 @@ export default {
     computed: {
         ...mapState({
             cartCount: (state) => state.cart.count,
-            isLogin: (state) => state.user.token.length > 0,
+        }),
+        ...mapGetters({
+            isLogin: "user/isLogin",
         }),
     },
     onLoad(e) {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a3a3fe5..80431cc 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -13,7 +13,11 @@ export default {
             create_time: 0,
         },
     },
-    getters: {},
+    getters: {
+        isLogin(state) {
+            return state.token && state.token.length > 0;
+        },
+    },
     mutations: {
         showLoginModal(state, data) {
             state.showLoginModal = data;