flat: 国庆节暂存

2024-10-09 10:14:51 +08:00
parent 6504a558ac
commit a4ffe68ec2
32 changed files with 2663 additions and 2135 deletions
--- a/pages/news/news.vue
+++ b/pages/news/news.vue
@@ -27,7 +27,9 @@
    import {
        mapGetters
    } from 'vuex'
-
+    import {
+        GoLogin
+    } from '@/untils/AxiosUtils.js';
    export default {
        data() {
            return {
@@ -36,14 +38,21 @@
        },
        onLoad() {},
        onShow() {
-            if (!this.$store.state.user.token) {
-                uni.redirectTo({
-                    url: "/pages/login/login"
+            if (/token/g.test(location.href)) {
+                this.$api.sleep(2000).then(() => {
+                    if (!this.$api.haslogin()) {
+                        GoLogin()
+                    } else {
+                        uni.$emit('newsReadChange')
+                    }
                })
            } else {
-                uni.$emit('newsReadChange')
+                if (!this.$api.haslogin()) {
+                    GoLogin()
+                } else {
+                    uni.$emit('newsReadChange')
+                }
            }
-            console.log(this.news)
        },
        onPullDownRefresh() {
            this.loading = true