diff --git a/src/api/discusion.js b/src/api/discusion.js
new file mode 100644
index 0000000..663db93
--- /dev/null
+++ b/src/api/discusion.js
@@ -0,0 +1,8 @@
+// axios
+import request from '@/utils/request'
+export function icEventOldDiscussDetil(id) {
+    return request({
+        url: `/governance/commonServiceType/selectList/${id}`,
+        method: 'get'
+      })
+  }
\ No newline at end of file
diff --git a/src/api/home.js b/src/api/home.js
index b64c8ec..6a0bb42 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -17,40 +17,15 @@ export function icEventOldDiscuss(data) {
     data
   })
 }
-<<<<<<< HEAD
-// 点赞
-export function handelClicsupport(data) {
-  return request({
-    url: `/governance/icEventOldDiscuss/addDiscuss`,
-    method: 'post',
-    data
-  })
-}
-  //搜索
-  export function keyWordSearch(data) {
-    return request({
-      url: `/actual/base/communityActivity/keyWordSearch`,
-=======
 
   // 【社区讯息】菜单
   export function advertisingTag(data) {
     return request({
       url: `/actual/base/advertisingTag/page`,
->>>>>>> b487435718ed41dce92441a54126caa0d073f824
       method: 'post',
       data
     })
   }
-<<<<<<< HEAD
-    //热门词语
-    export function popularSearch(data) {
-      return request({
-        url: `/actual/base/communityActivity/topWordList`,
-        method: 'post',
-        data
-      })
-    }
-=======
   // 【社区讯息】菜单
   export function communityPublicity(data) {
     return request({
@@ -59,6 +34,18 @@ export function handelClicsupport(data) {
       data
     })
   }
-
-  
->>>>>>> b487435718ed41dce92441a54126caa0d073f824
+//议事赞成/反对
+export function handelClicsupport(data) {
+  return request({
+    url: `/governance/icEventOldDiscuss/addDiscuss`,
+    method: 'post',
+    data
+  })
+}
+//议事详情
+export function andelClicDetail(id) {
+  return request({
+    url: `/governance/icEventOld/${id}`,
+    method: 'get'
+  })
+}
diff --git a/src/views/discussion/discusionDetail.vue b/src/views/discussion/discusionDetail.vue
index e840515..1265edd 100644
--- a/src/views/discussion/discusionDetail.vue
+++ b/src/views/discussion/discusionDetail.vue
@@ -61,16 +61,17 @@
 </template>
 
 <script>
-
+import { andelClicDetail, icEventOldDiscuss, advertisingTag, communityPublicity,handelClicsupport } from '@/api/home';
 export default {
     data() {
         return {
             substance: '最近重庆南路60号院改造，很多居民反应希望 政府给楼外加保护层，冬天温度太低。',
             datetime: '2002-01-05 12:00:00',
             signUp: [
-                { name: "", mobile: "", remark: "" },
+                { },
 
             ],
+            
             detimgs: [
                 { url: '@/assets/images/icons/resi.png' }
             ],
@@ -79,11 +80,20 @@ export default {
             oppose: false,
             supportNum: 40,
             opposeNum: 60,
-            disableAllButtons: false
+            disableAllButtons: false,
+            id:"",
+            ProblemDescription:{},
 
         };
 
     },
+    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()
+    },
     computed: {
         support1() {
             return this.supportNum / this.dataValue;
@@ -97,11 +107,45 @@ export default {
         oppose1Width() {
             return this.oppose1 * 225 + 'px';
         }
-    },
-    created() {
-
     },
     methods: {
+        async handelClicsupport(data){
+            let parm = {
+                eventId:data,
+                agencyId: this.agencyId,
+                userId: this.userId,
+                opinionFlag:0
+            }
+            console.log(parm);
+            let res = await handelClicsupport(parm)
+            this.icEventOldDiscussDetil1()
+        
+        },
+        async handelClicopposeNum(data){
+            let parm = {
+                eventId:data,
+                agencyId: this.agencyId,
+                userId: this.userId,
+                opinionFlag:1
+            }
+            console.log(parm);
+            let res = await handelClicsupport(parm)
+            this.icEventOldDiscuss()
+        
+        }, 
+        icEventOldDiscussDetil1(){
+            console.log(this.id,"this.id");
+            andelClicDetail(this.id).then(res => {
+                    this.ProblemDescription=res.map(item=>{
+                        return item
+                    })
+            
+                
+               
+    
+        } )
+        console.log(this.ProblemDescription,"res");
+    },
         handsupport() {
             this.support = true;
         },
diff --git a/src/views/discussion/index.vue b/src/views/discussion/index.vue
index d7c8bab..6937b61 100644
--- a/src/views/discussion/index.vue
+++ b/src/views/discussion/index.vue
@@ -2,21 +2,23 @@
     <div>
         <div class="flex flex-mean" style="background-color: #FFFFFF;">
             <van-search class=".flex flex-1" v-model="searchValue" left-icon="" shape="round" placeholder="请输入搜索关键词" />
-            <van-button round type="info" class="custom-button font-size13 m-top10 m-right12 ">查询</van-button>
+            <van-button round type="info" class="custom-button font-size13 m-top10 m-right12" @click="onSearch()">查询</van-button>
         </div>
         <div class='container'>
             <van-list  class="card" :offset="50">
                
                 <div class="activity_content " v-for="(item, index) in discussionList" :key="index"      >
           
-                    <div class="van-multi-ellipsis--l2 m-bottom10"     @click="$router.push({ path: `/discusionDetail` })">
+                    <div class="van-multi-ellipsis--l2 m-bottom10"     @click="$router.push({ path: `/discusionDetail`,query: { eventId:item.eventId} })">
                         {{ item.eventContent }}
                     </div>
                     <div class="flex flex-end">
-                        <div class=""><img src="@/assets/images/icons/resi.png" class="img_17"> 参加{{ item.total }}
+                        <div class="font-size13 AAA">
+                            <img src="@/assets/images/icons/resi.png" class="img_17">
+                             参加 {{ item.total }}
                         </div>
-                        <div><img src="@/assets/images/icons/support.png" class="img_17" @click="handelClicsupport(item.eventId)">支持{{ item.supportNum }}</div>
-                        <div><img src="@/assets/images/icons/oppose.png" class="img_17" @click="handelClicopposeNum(item.eventId)">反对{{ item.opposeNum }}</div>
+                        <div  class="font-size13 AAA"><img src="@/assets/images/icons/support.png" class="img_17" @click="handelClicsupport(item.eventId)">支持 {{ item.supportNum }}</div>
+                        <div class="font-size13 AAA"><img src="@/assets/images/icons/oppose.png" class="img_17" @click="handelClicopposeNum(item.eventId)">反对 {{ item.opposeNum }}</div>
                     </div>
                 </div>
             </van-list>
@@ -53,6 +55,24 @@ export default {
         this.icEventOldDiscuss();
     },
     methods: {
+        async onSearch(){
+            let parm = {
+                pageSize: 10,
+                pageNo: 1,
+                agencyId: null,
+                icEventId:null,
+                content:this.searchValue
+            }
+           
+            let res = await icEventOldDiscuss(parm)
+
+            if (res) {
+                
+              console.log(res);
+              this.discussionList = res.list
+            }
+           
+        },    
         async handelClicsupport(data){
             let parm = {
                 eventId:data,
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 9c13b36..da20355 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -85,10 +85,11 @@
                             {{ item.eventContent }}
                         </span>
                         <div class="flex flex-end flex-center gray m-top10 font-size13">
-                            <div class="flex flex-center"><img src="@/assets/images/icons/resi.png"
-                                    class="img_16 m-right7" alt=""><span>参与 {{ item.total }}</span></div>
-                            <div class="flex flex-center" @click="handelClicsupport(item.eventId)"><img src="@/assets/images/icons/support.png" alt=""
-                                    class="img_16 m-right7"><span>支持 {{ item.supportNum }}</span></div>
+                            <div class="flex flex-center"><img src="@/assets/images/icons/resi.png" class="img_16 m-right7" alt="">
+                                <span>参与 {{ item.total }}</span></div>
+                            <div class="flex flex-center" @click="handelClicsupport1(item.eventId)">
+                                <img src="@/assets/images/icons/support.png" alt="" class="img_16 m-right7">
+                                <span>支持 {{ item.supportNum }}</span></div>
                             <div class="flex flex-center" @click="handelClicopposeNum(item.eventId)" ><img src="@/assets/images/icons/oppose.png" alt=""
                                     class="img_16 m-right7"><span>反对 {{ item.opposeNum }}</span></div>
                         </div>
@@ -136,11 +137,7 @@
 
 <script>
 import registerDialog from '@/components/registerDialog';
-<<<<<<< HEAD
-import { communityActivity,icEventOldDiscuss,handelClicsupport} from '@/api/home';
-=======
-import { communityActivity, icEventOldDiscuss, advertisingTag, communityPublicity } from '@/api/home';
->>>>>>> b487435718ed41dce92441a54126caa0d073f824
+import { communityActivity, icEventOldDiscuss, advertisingTag, communityPublicity,handelClicsupport } from '@/api/home';
 export default {
     data() {
         return {
@@ -175,20 +172,16 @@ export default {
             activityList: [],
             eventList: [],
             showRegister: false,
-<<<<<<< HEAD
-            userId:""
-=======
             tagList: [],
             tagActive: 'new',
             tagId: null,
             PublicityList:[]
->>>>>>> b487435718ed41dce92441a54126caa0d073f824
         };
     },
     created() {
         console.log(this.$store.state.app);
         this.agencyId = this.$store.state.app.agencyId;
-        this.userId = this.$store.state.app.appId;
+        this.userId = this.$store.state.app.userInfo.id;
         this.communityActivity()//获取轮播图与活动列表 
         this.icEventOldDiscuss()//获取居民议事列表
         this.advertisingTag()//获取社区讯息菜单
@@ -204,10 +197,11 @@ export default {
             }
             console.log(parm);
             let res = await handelClicsupport(parm)
+            
             this.icEventOldDiscuss()
         
         },
-        async handelClicsupport(data){
+        async handelClicsupport1(data){
             let parm = {
                 eventId:data,
                 agencyId: this.agencyId,