From e89e59482c9bb1c503f677cc71b93908ac1f3957 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 12 Jul 2024 08:58:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=B3=A8=E5=86=8C=E5=BC=B9?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js          | 2 ++
 src/views/activity/index.vue | 7 +++++--
 src/views/home/index.vue     | 8 ++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 1cf562f..aab19f0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -90,6 +90,8 @@ router.beforeEach((to, from, next) => {
               next({ path: '/selectAgency' })
             }
           }
+      }).catch(err=>{
+        next({ path: '/selectAgency' })
       })
     } else { 
       if (getQueryStringByName('code') && to.path != '/houseQR'&& to.path != '/event') {
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index 0e0ab22..47952d4 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -2,7 +2,7 @@
     <div class='container'>
         <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="communityActivity" class="card"
             :offset="50">
-            <div class="activity_content flex" v-for="(item, index) in activityList" :key="index"@click="handelClickJump('activityDetail',item)">
+            <div class="activity_content flex" v-for="(item, index) in activityList" :key="index" @click="handelClickJump('activityDetail',item)">
                 <img :src="item.coverPic" alt="" class="mr10 img_round" style="width: 75px;height: 95px;">
                 <div class="flex flex-y flex1 flex-end" style="overflow: hidden;">
                     <div class="van-ellipsis">{{ item.activityName }}</div>
@@ -19,11 +19,13 @@
                 </div>
             </div>
         </van-list>
+        <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
     </div>
 </template>
 
 <script>
 import { communityActivity } from '@/api/home';
+import registerDialog from '@/components/registerDialog';
 
 export default {
     data() {
@@ -65,6 +67,7 @@ export default {
             }
         },
         handelClickJump(path,item) {
+            console.log(path,item);
             if(path === 'activityDetail'){
                 if (this.$store.state.app.userInfo.mobile) {
                     this.$router.push({ path: `/${path}`,query:{id:item.id} });
@@ -75,7 +78,7 @@ export default {
 
         }
     },
-    components: {},
+    components: {registerDialog},
     computed: {},
     watch: {},
 }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 44d351e..811b6bc 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -56,7 +56,7 @@
                     <span>社区活动</span>
                     <span @click="$router.push('/activity')">更多</span>
                 </div>
-                <div class="activity_content flex" v-for="(item, index) in activityList" :key="index"  @click="$router.push({ path: `/activityDetail`,query: { id:item.id} })">
+                <div class="activity_content flex" v-for="(item, index) in activityList" :key="index"  @click="handelClickJump(`activityDetail`,item)">
                     <img :src="item.coverPic" alt="" class="mr10" style="width: 75px;height: 95px;">
                     <div class="flex flex-y flex1 flex-end" style="overflow: hidden;">
                         <div class="van-ellipsis">{{ item.activityName }}</div>
@@ -321,7 +321,11 @@ export default {
                     this.showRegister = true;
                 }
             } else {
-                this.$router.push({ path: `/${path}`,query:{id:item.id} })
+                if (this.$store.state.app.userInfo.mobile) {
+                    this.$router.push({ path: `/${path}`,query:{id:item.id} })
+                } else {
+                    this.showRegister = true;
+                }
             }
         },