From 13fb3630d582cfdd34916112422bcd44046643cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 4 Jul 2024 18:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home.js                          |  7 +--
 src/views/discussion/discusionDetail.vue | 67 ++++++++++++++----------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/api/home.js b/src/api/home.js
index c3ea8ee..633de42 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -43,10 +43,11 @@ export function handelClicsupport(data) {
   })
 }
 //议事详情
-export function andelClicDetail(id) {
+export function andelClicDetail(data) {
   return request({
-    url: `/governance/icEventOld/${id}`,
-    method: 'get'
+    url: `/governance/icEventOld/detail`,
+    method: 'post',
+    data
   })
 }
 //搜索
diff --git a/src/views/discussion/discusionDetail.vue b/src/views/discussion/discusionDetail.vue
index 1265edd..74f35db 100644
--- a/src/views/discussion/discusionDetail.vue
+++ b/src/views/discussion/discusionDetail.vue
@@ -1,17 +1,11 @@
 <template>
     <div class='container'>
         <div class="card flex flex-y ">
-            <div class="m-bottom5">{{ substance }}</div>
-            <div class="font-size13 gray">{{ datetime }}</div>
-            <div class="image-grid">
+            <div class="m-bottom5">{{ ProblemDescription.eventContent }}</div>
+            <div class="font-size13 gray">{{ProblemDescription.happenTime}}</div>
+            <div class="image-grid" v-for="item in ProblemDescription.imageList" :key="values">
                 <div class="grid-item ">
-                    <img src="@/assets/images/discusion/1.png" style="width: 105px; height: 75px;">
-                </div>
-                <div class="grid-item"><img src="@/assets/images/discusion/2.png" style="width: 105px; height: 75px;">
-                </div>
-                <div class="grid-item"><img src="@/assets/images/discusion/3.png" style="width: 105px; height: 75px;">
-                </div>
-                <div class="grid-item"><img src="@/assets/images/discusion/3.png" style="width: 105px; height: 75px;">
+                    <img :src="item" style="width: 105px; height: 75px;">
                 </div>
             </div>
             <div class="flex flex-y flex-center1 flex-center2 gray back_color  m-top15">
@@ -21,7 +15,7 @@
                         <div class="image-with-text ">
                             <img class="support_img1" :style="{ width: support1Width }"
                                 src="@/assets/images/discusion/c-l.png" />
-                            <div class="text-overlay">支持  {{ this.supportNum }}</div>
+                            <div class="text-overlay">支持  {{ vote.supportNum }}</div>
                         </div>
                         <div class="header_img_right">
                         </div></div>
@@ -34,7 +28,7 @@
                         <div class="image-with-text ">
                             <img class="support_img2" :style="{ width: oppose1Width }"
                                 src="@/assets/images/discusion/z-y.png" />
-                                <div class="text-overlay1">  {{ this.opposeNum }}  反对</div>
+                                <div class="text-overlay1">  {{ vote.opposeNum }}  反对</div>
                         </div>
                         <div class="z_img">
                             
@@ -42,18 +36,18 @@
                        
                     </div>
                 </div>
-                <div class="gray  font-size13 p-12">{{ this.dataValue }}人参与</div>
+                <div class="gray  font-size13 p-12">{{ vote.total }}人参与</div>
 
             </div>
         </div>
         <div class="bot_btn flex flex-x flex-mean m-bot50 back_color back_color">
             <van-button   :disabled="disableAllButtons"  round :class="supportNum ? 'support' : ''" :icon="require('@/assets/images/icons/support.png')"
-                type="info" @click="Onsupport">
+                type="info" @click="handelClicsupport">
                 支持
             </van-button>
         
             <van-button  :disabled="disableAllButtons" round class="support" :icon="require('@/assets/images/icons/oppose.png')"
-                type="info" @click="Onoppose">
+                type="info" @click="handelClicopposeNum">
                 反对
             </van-button>
         </div>
@@ -62,6 +56,7 @@
 
 <script>
 import { andelClicDetail, icEventOldDiscuss, advertisingTag, communityPublicity,handelClicsupport } from '@/api/home';
+import { values } from 'regenerator-runtime';
 export default {
     data() {
         return {
@@ -81,18 +76,20 @@ export default {
             supportNum: 40,
             opposeNum: 60,
             disableAllButtons: false,
-            id:"",
+            eventId:"",
             ProblemDescription:{},
+            vote:{}
 
         };
 
     },
     created(){
-        this.id=this.$route.query.eventId
+        this.eventId=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()
+        this.icEventOldDiscuss()
     },
     computed: {
         support1() {
@@ -109,21 +106,34 @@ export default {
         }
     },
     methods: {
-        async handelClicsupport(data){
+        async icEventOldDiscuss(){
             let parm = {
-                eventId:data,
+                pageSize: 10,
+                pageNo: 1,
+                icEventId:this.eventId
+            }
+            let res = await icEventOldDiscuss(parm)
+            console.log(res);
+            this.vote=res.list[0]
+            
+            console.log(  this.vote,"res1");
+
+        },
+        async handelClicsupport(){
+            let parm = {
+                eventId:this.eventId,
                 agencyId: this.agencyId,
                 userId: this.userId,
                 opinionFlag:0
             }
             console.log(parm);
             let res = await handelClicsupport(parm)
-            this.icEventOldDiscussDetil1()
+            this.icEventOldDiscuss()
         
         },
         async handelClicopposeNum(data){
             let parm = {
-                eventId:data,
+                eventId:this.eventId,
                 agencyId: this.agencyId,
                 userId: this.userId,
                 opinionFlag:1
@@ -133,17 +143,20 @@ export default {
             this.icEventOldDiscuss()
         
         }, 
-        icEventOldDiscussDetil1(){
+      async  icEventOldDiscussDetil1(){
             console.log(this.id,"this.id");
-            andelClicDetail(this.id).then(res => {
-                    this.ProblemDescription=res.map(item=>{
-                        return item
-                    })
+            let parm={
+                icEventId:this.eventId  
+            }
+            await andelClicDetail(parm).then(res => {
+                console.log(res,"res");
+                this.ProblemDescription = res
+            })
             
                 
                
     
-        } )
+        
         console.log(this.ProblemDescription,"res");
     },
         handsupport() {