From 75a814944ec63f0fdb6fe7badae75b44410430df Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 4 Jul 2024 20:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activity/detail.vue            | 29 ++++++++++++++----------
 src/views/activity/index.vue             |  8 +++----
 src/views/discussion/discusionDetail.vue |  1 -
 src/views/message/index.vue              |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue
index 31e6f99..9fd6188 100644
--- a/src/views/activity/detail.vue
+++ b/src/views/activity/detail.vue
@@ -1,23 +1,21 @@
 <template>
     <div class='container m-bot50'>
         <div class="card">
-            <img  :src="item.coverPic" alt="" style="width: 100%;">
+            <img  :src="info.coverPic" alt="" style="width: 100%;">
             <div class="m-top15 p0">
-                <h2 style="margin: 0; font-size: 21px;">{{ item.activityName }}</h2>
+                <h2 style="margin: 0; font-size: 21px;">{{ info.activityName }}</h2>
                 <van-cell class="m-top15" :border="false" :title-style="{ 'max-width': '80px' }" title="活动时间："
-                    value="2024-03-12 09:00 至 2024-03-12 17:00"></van-cell>
+                    :value="`${info.startTime} 至 ${info.endTime}`"></van-cell>
                 <van-cell :border="false" :title-style="{ 'max-width': '115px' }" title="报名开始时间："
-                    value=" item.startTime "></van-cell>
+                    :value=" info.startTime "></van-cell>
                 <van-cell :border="false" :title-style="{ 'max-width': '115px' }" title="报名截止时间："
-                    value="2024-03-12 09:00"></van-cell>
+                    :value="info.endTime"></van-cell>
                 <van-cell :border="false" :title-style="{ 'max-width': '80px' }" title="活动地点："
-                    value="item.address"></van-cell>
+                    :value="info.address"></van-cell>
                 <van-cell :border="false" :title-style="{ 'max-width': '65px' }" title="举办方："
-                    value="嘉定山社区 重庆路小学"></van-cell>
+                   :value="info.assistingParty"></van-cell>
                 <van-divider />
-                <div
-                    v-html="`<p>&nbsp; &nbsp; 春风催心律，正是指数是。为积极响应茂名市全民义务旅意，我是将于近期开展2021“绿名贸易”好心林工艺素知书货哦你的</p><p>&nbsp; &nbsp; &nbsp; &nbsp;刺死活动以再深入贯彻党的二十大精神和习近平生态文明思想，认真贯彻落实习近平总书记是擦广东的重要指示精神。</p><p>&nbsp; &nbsp; &nbsp; 持续性增强全民志绿护绿关铝的自觉性</p>`">
-                </div>
+                <div v-html="info.content"></div>
             </div>
         </div>
         <div class="card m-top10">
@@ -53,11 +51,18 @@ export default {
             activityList:[],
             signUp: [
                 { name: "", mobile: "", remark: "" },
-            ]
+            ],
+            info:{}
         };
     },
     created() {
-
+      
+    },
+    mounted(){
+        if(this.$route.query){
+            console.log(this.$route.query,'seee');
+            this.info = this.$route.query
+        }
     },
     methods: {
         handelAddResi() {
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index a6a4012..32336ad 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="$router.push({ path: `/activityDetail` })">
+            <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>
@@ -13,7 +13,7 @@
                             <span>报名人数：</span> <span class="font-size18 orange">{{ item.participants }}</span>/<span
                                 class="font-size14">{{ item.participants }}人</span>
                         </div>
-                        <van-button type="info" size="small" round @click="handelClickJump('activityDetail')"
+                        <van-button type="info" size="small" round @click="handelClickJump('activityDetail',item)"
                             :disabled="item.online !== 1">报名</van-button>
                     </div>
                 </div>
@@ -64,10 +64,10 @@ export default {
                 this.activityList = this.activityList.concat(res.list);
             }
         },
-        handelClickJump(path) {
+        handelClickJump(path,item) {
             if(path === 'activityDetail'){
                 if (this.$store.state.app.userInfo.mobile) {
-                this.$router.push({ path: `/${path}` });
+                    this.$router.push({ path: `/${path}`,query:item });
                 } else {
                     this.showRegister = true;
                 }
diff --git a/src/views/discussion/discusionDetail.vue b/src/views/discussion/discusionDetail.vue
index 1265edd..b895c46 100644
--- a/src/views/discussion/discusionDetail.vue
+++ b/src/views/discussion/discusionDetail.vue
@@ -89,7 +89,6 @@ export default {
     },
     created(){
         this.id=this.$route.query.eventId
-        console.log(this.id,"this.id");
         this.agencyId = this.$store.state.app.agencyId;
         this.userId = this.$store.state.app.appId;
         this.icEventOldDiscussDetil1()
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index c47fb71..261d451 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -44,7 +44,7 @@ export default {
       this.loading = true
       getWxmpEventAndDemandMessageList({
         phone: this.$store.state.app.userInfo.phone,
-        pageNo: this.pageNo,
+        pageNo: this.pageNo++,
         pageSize: this.pageSize
       }).then(res => {
         this.list.push(...res.list)