feat: 5.22 update

src/api/http.js

@@ -9,11 +9,11 @@ const DEFAULT_TIMEOUT = 15000;
 
 // 错误码定义
 const ERR_CODE = {
-  SUCCESS: 200,
+    SUCCESS: 200,
-  UNAUTHORIZED: 401,
+    UNAUTHORIZED: 401,
-  FORBIDDEN: 403,
+    FORBIDDEN: 403,
-  NOT_FOUND: 404,
+    NOT_FOUND: 404,
-  SERVER_ERROR: 500,
+    SERVER_ERROR: 500,
 };
 
 function getHeaders(contentType = 'application/json') {
@@ -63,6 +63,11 @@ function handleResponse(response) {
  * 处理 token 失效
  */
 function handleUnauthorized() {
+    // 如果 localStorage 中本来就没有 token，说明是未登录状态，不做处理
+    if (!localStorage.getItem('member_token')) {
+        return;
+    }
+
     // 清除登录状态
     localStorage.removeItem('member_token');
     localStorage.removeItem('member_username');

src/components/ManagerPopup.vue

@@ -87,6 +87,11 @@ export default {
       })
     },
     getPermissions() {
+      if (!this.$isLogin()) {
+        // this.$showFailToast('登录状态异常，请重新登录')
+        // location.replace('#/Login')
+        return
+      }
       this.$get('/v1/client/DUsersClient').then(res => {
         this.PermissionsData = {
           id: res.data.id,

src/router.js

@@ -310,6 +310,9 @@ const routes = [
     path: '/SyncAuth',
     name: 'SyncAuth',
     component: () => import('./views/SyncAuth.vue'),
+    meta: {
+      noLogin: true,
+    }
   },
   {
     path: '/404',

src/styles/public.less

@@ -538,8 +538,9 @@ img {
     >img {
       width: 16vw;
       height: 16vw;
-      .y50;
+      border-radius: 50%;
       margin-right: 2.933vw;
+      object-fit: contain;
     }
 
     .text {

src/views/Account/Login.vue

@@ -164,6 +164,12 @@ export default {
         location.replace('#/')
         return
       }
+      if (!this.$isLogin) {
+        this.$showFailToast?.('登录状态异常，请重新登录')
+        // localStorage.removeItem('member_token')
+        location.replace('#/Login')
+        return
+      }
       // this.checkWxLogin();
       const code = JSON.stringify(this.$route.query.code);
       if (code) {

src/views/Merchant/Merchant.vue

@@ -149,7 +149,21 @@ export default {
   name: 'Merchant',
   components: { ManagerPopup },
   mounted() {
-    this.init()
+    this.$get('/v1/client/DUsersClient').then(res => {
+      this.id = res.data.id;
+      if (!res.data.isshop) {
+        this.$showFailToast('您不是商家账号！')
+        // localStorage.removeItem('member_token')
+        location.replace('#/My')
+        return
+      }
+      this.init();
+    }).catch(() => {
+      this.$showFailToast('登录状态异常，请重新登录')
+      // localStorage.removeItem('member_token')
+      location.replace('#/Login')
+    })
+
     window.addEventListener('showManagerPopup', this.onShowManagerPopup)
     window.addEventListener('closeManagerPopup', this.onCloseManagerPopup)
   },
@@ -160,7 +174,7 @@ export default {
   data() {
     return {
       managerPopupVisible: false,
-      id: this.$route.query.id,
+      id: this.$route.query.id || this.$ls.get('user_id'),
       data: {
         endTimes: new Date().toLocaleString('zh-CN', { hour12: false })
       },
@@ -203,5 +217,4 @@ export default {
 
 </script>
 
-<style lang="less">
+<style lang="less"></style>
-</style>

src/views/Platform/Business_School.vue

@@ -28,7 +28,7 @@
                             </div>
                             <div class="times">
                                 <span>{{ $formatGMT(item.addtime, 'yyyy-MM-dd HH:mm:ss') }}</span>
-                                <span>阅览量 {{ item.ReadCount }}</span>
+                                <span>阅览量 {{ item.click }}</span>
                             </div>
                         </div>
                     </div>

src/views/SyncAuth.vue

@@ -3,21 +3,27 @@
 </template>
 
 <script>
+import { useUserStore } from '@/stores/user'
+
 export default {
     mounted() {
-        if (this.token)
+        if (this.token) {
-            localStorage.setItem('member_token', this.token);
+            localStorage.setItem('member_token', this.token)
-        // if (this.miniopenid)
+            const userStore = useUserStore()
-        //     localStorage.setItem('miniopenid', this.miniopenid);
+            userStore.setToken(this.token)
-        if (this.target)
+            setTimeout(() => {
-            location.replace(`#/${this.target}`);
+                const target = this.target ? `/${this.target}` : '/Home'
-        else
+                // console.log(target);
-            location.replace('#/');
+
+                this.$router.replace(target)
+            }, 200)
+        } else {
+            this.$router.replace('/Home')
+        }
     },
     data() {
         return {
             token: decodeURIComponent(this.$route.query.token || ''),
-            // miniopenid: decodeURIComponent(this.$route.query.miniopenid || ''),
             target: decodeURIComponent(this.$route.query.target || ''),
         }
     },

src/views/User/My.vue

@@ -218,10 +218,15 @@ export default {
   components: { ManagerPopup },
   computed: {
   },
+  beforeRouteEnter(to, from, next) {
+    if (!localStorage.getItem('member_token')) {
+      next({ name: 'Login', query: { redirect: to.fullPath } });
+    } else {
+      next();
+    }
+  },
   mounted() {
     this.init();
-    window.addEventListener('showManagerPopup', this.onShowManagerPopup)
-    window.addEventListener('closeManagerPopup', this.onCloseManagerPopup)
   },
   beforeUnmount() {
     window.removeEventListener('showManagerPopup', this.onShowManagerPopup)
@@ -250,6 +255,13 @@ export default {
   },
   methods: {
     init() {
+      if (!this.$isLogin()) {
+        this.$showFailToast('登录状态异常，请重新登录')
+        location.replace('#/Login')
+        return
+      }
+      window.addEventListener('showManagerPopup', this.onShowManagerPopup)
+      window.addEventListener('closeManagerPopup', this.onCloseManagerPopup)
       Promise.all(
         [
           this.$get('/v1/client/DUsersClient').then(data => {