From 0a0dab0ac23cb0ea204b764110a06e2c301834ba Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 3 Nov 2022 14:55:37 +0800
Subject: [PATCH] bug

---
 src/project/tianfuxing/AppHome/Activity.vue | 22 ++++++++++++++++++---
 src/project/tianfuxing/AppMy/AppMy.vue      |  2 ++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/project/tianfuxing/AppHome/Activity.vue b/src/project/tianfuxing/AppHome/Activity.vue
index ae5c46f..2e4bb34 100644
--- a/src/project/tianfuxing/AppHome/Activity.vue
+++ b/src/project/tianfuxing/AppHome/Activity.vue
@@ -50,6 +50,7 @@
 </template>
 
 <script>
+import { mapActions, mapState } from 'vuex'
   var QQMapWX = require('./libs/qqmap-wx-jssdk.js')
   export default {
     name: 'AppActivity',
@@ -69,6 +70,7 @@
     },
 
     computed: {
+      ...mapState(['token']),
       isClock () {
         if (!this.info.id) {
           return false
@@ -115,16 +117,30 @@
     },
 
     onLoad (query) {
-      this.id = query.id
+      if (decodeURIComponent(query.scene)) {
+        this.id = decodeURIComponent(query.scene)
+      }
+
+      if (query.id) {
+        this.id = query.id
+      }
+
+      if (this.token) {
+        this.getInfo()
+      } else {
+        this.autoLogin()
+      }
+
       this.qqmapsdk = new QQMapWX({
         key: process.env.NODE_ENV == 'production' ? 'RWWBZ-64BEJ-MVLFJ-FTHLQ-JTR6J-SAB2S' : '3RZBZ-LZUCF-CT6J5-NWKZH-FCWOQ-UUFKY'
       })
-
-      this.$loading()
     },
 
     methods: {
+      ...mapActions(['autoLogin']),
+
       getInfo () {
+        this.$loading()
         this.$instance.post(`/api/appactivityinfo/queryDetailById?id=${this.id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
diff --git a/src/project/tianfuxing/AppMy/AppMy.vue b/src/project/tianfuxing/AppMy/AppMy.vue
index ec6e3b7..39d7e85 100644
--- a/src/project/tianfuxing/AppMy/AppMy.vue
+++ b/src/project/tianfuxing/AppMy/AppMy.vue
@@ -69,6 +69,8 @@
       if (this.token) {
         this.getUserInfo()
         this.getList()
+      } else {
+        this.autoLogin()
       }
 
       uni.$on('updateUserInfo', () => {