From c4e729a8ffdd039e428d1382306f67a6949a0872 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 27 Jun 2024 16:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD=E5=9B=BE,?=
 =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home.js               |  9 +++++++
 src/utils/request.js          |  7 +++++-
 src/views/activity/detail.vue | 35 ++++++++++++++++-----------
 src/views/home/index.vue      | 45 +++++++++++++++++------------------
 vue.config.js                 |  2 +-
 5 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/src/api/home.js b/src/api/home.js
index cbe3ce2..adb57e0 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -9,3 +9,12 @@ export function communityActivity(data) {
       data
     })
   }
+  // 【居民议事】列表
+export function icEventOldDiscuss(data) {
+  return request({
+    url: `/governance/icEventOldDiscuss/pageList`,
+    method: 'post',
+    data
+  })
+}
+  
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 9ab7bd5..eab446f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -27,7 +27,12 @@ service.interceptors.request.use(
     if (store.state.app.appId) {
       config.headers['AppId'] = store.state.app.appId
     }
-
+    if (store.state.app.userInfo.customerId) {
+      config.headers['customerId'] = store.state.app.userInfo.customerId
+    }
+    if (store.state.app.userInfo.id) {
+      config.headers['userId'] = store.state.app.userInfo.id
+    }
     config.baseURL = config.baseURL + '/'
     return config
   },
diff --git a/src/views/activity/detail.vue b/src/views/activity/detail.vue
index 595bd96..8ba118c 100644
--- a/src/views/activity/detail.vue
+++ b/src/views/activity/detail.vue
@@ -22,14 +22,17 @@
         </div>
         <div class="card m-top10">
             <div class="title"><span>活动报名</span></div>
-            <van-cell-group v-for="(item,index) in signUp" :border="false">
-                <van-field v-model="signUp[index].name"  required :label="`姓名${index+1}`" placeholder="请输入用户名" />
-                <van-field v-model="signUp[index].mobile"  required label="联系电话" placeholder="请输入您的电话号码" />
-                <van-field v-model="signUp[index].remark"  required label="备注" placeholder="请输入" rows="3"  autosize type="textarea" />
+            <van-cell-group v-for="(item, index) in signUp" :border="false">
+                <van-field v-model="signUp[index].name" required :label="`姓名${index + 1}`" placeholder="请输入用户名" />
+                <van-field v-model="signUp[index].mobile" required label="联系电话" placeholder="请输入您的电话号码" />
+                <van-field v-model="signUp[index].remark" required label="备注" placeholder="请输入" rows="3" autosize
+                    type="textarea" />
             </van-cell-group>
             <div class="flex flex-center1 m-top12">
-                <div class="flex flex-center2 flex-center1 flex1" @click="handelAddResi"> <img src="@/assets/images/icons/add.png" alt="" class="img_20 m-right7">添加</div>
-                <div class="flex flex-center2 flex-center1 flex1" v-show="signUp.length>1" @click="handelDelResi"> <img src="@/assets/images/icons/del.png" alt="" class="img_20 m-right7">删除</div>
+                <div class="flex flex-center2 flex-center1 flex1" @click="handelAddResi"> <img
+                        src="@/assets/images/icons/add.png" alt="" class="img_20 m-right7">添加</div>
+                <div class="flex flex-center2 flex-center1 flex1" v-show="signUp.length > 1" @click="handelDelResi"> <img
+                        src="@/assets/images/icons/del.png" alt="" class="img_20 m-right7">删除</div>
             </div>
         </div>
         <div class="bot_btn flex flex-center2" style="height: 50px;">
@@ -47,8 +50,8 @@
 export default {
     data() {
         return {
-            signUp:[
-                {name:"",mobile:"",remark:""},
+            signUp: [
+                { name: "", mobile: "", remark: "" },
             ]
         };
     },
@@ -56,10 +59,10 @@ export default {
 
     },
     methods: {
-        handelAddResi(){
-            this.signUp.push({name:"",mobile:"",remark:""})
+        handelAddResi() {
+            this.signUp.push({ name: "", mobile: "", remark: "" })
         },
-        handelDelResi(){
+        handelDelResi() {
             this.signUp.pop()
         }
     },
@@ -76,16 +79,20 @@ export default {
 :deep(.van-cell) {
     padding: 16px 8px;
 }
-
 :deep(.van-cell__title) {
     color: #666666;
+    display: flex;
+    &>span {
+        flex: 1;
+    }
 }
 
 :deep(.van-cell__value) {
     text-align: left;
 }
-:deep(.van-cell--required){
-    &::before{
+
+:deep(.van-cell--required) {
+    &::before {
         left: -5px;
     }
 }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 13a46b2..894e55b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -18,11 +18,9 @@
             </div>
             <div class="swipe">
                 <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
-                    <van-swipe-item><img src="@/assets/images/zhishu.png" alt=""
-                            style="width: 100%; margin: 0 auto;"></van-swipe-item>
-                    <van-swipe-item>2</van-swipe-item>
-                    <van-swipe-item>3</van-swipe-item>
-                    <van-swipe-item>4</van-swipe-item>
+                    <van-swipe-item v-for="item in activityList">
+                        <img :src="item.coverPic" alt="" style="width: 100%;height: 150px; margin: 0 auto;border-radius: 15px;">
+                    </van-swipe-item>
                 </van-swipe>
             </div>
             <div class="card flex flex-end flex-center2 m-top15 notice">
@@ -83,15 +81,15 @@
                 <div class="activity_content flex" v-for="(item, index) in eventList">
                     <div class="flex flex-y flex1 flex-end" style="overflow: hidden;">
                         <span class="van-multi-ellipsis--l2">
-                            {{ item.title }}
+                            {{ 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"><img src="@/assets/images/icons/support.png" alt=""
-                                    class="img_16 m-right7"><span>支持 {{ item.support }}</span></div>
+                                    class="img_16 m-right7"><span>支持 {{ item.supportNum }}</span></div>
                             <div class="flex flex-center"><img src="@/assets/images/icons/oppose.png" alt=""
-                                    class="img_16 m-right7"><span>反对 {{ item.oppose }}</span></div>
+                                    class="img_16 m-right7"><span>反对 {{ item.opposeNum }}</span></div>
                         </div>
                     </div>
                 </div>
@@ -103,7 +101,7 @@
 
 <script>
 import registerDialog from '@/components/registerDialog';
-import { communityActivity } from '@/api/home';
+import { communityActivity,icEventOldDiscuss } from '@/api/home';
 export default {
     data() {
         return {
@@ -136,26 +134,14 @@ export default {
                 }
             ],
             activityList: [],
-            eventList: [
-                {
-                    total: 100,
-                    support: 50,
-                    title: '社区活动测试测试测试时杀死社区活动测试测试测试时杀死还是上海市普陀区金沙江路还是上海市普陀区金沙江路',
-                    oppose: 10
-                },
-                {
-                    total: 100,
-                    support: 50,
-                    title: '社区活动测试测试测试时杀死社区活动测试测试测试时杀死还是上海市普陀区金沙江路还是上海市普陀区金沙江路',
-                    oppose: 10
-                }
-            ],
+            eventList: [],
             showRegister: false
         };
     },
     created() {
         this.agencyId = this.$store.state.app.agencyId;
         this.communityActivity()//获取轮播图与活动列表 
+        this.icEventOldDiscuss()//获取居民议事列表
     },
     methods: {
         async communityActivity() {
@@ -176,6 +162,19 @@ export default {
                 this.activityList = res.list.slice(0, 2);
             }
         },
+        async icEventOldDiscuss(){
+            let parm = {
+                pageSize: 10,
+                pageNo: 1,
+                agencyId: null,
+                icEventId:null
+            }
+            let res = await icEventOldDiscuss(parm)
+            if (res) {
+              console.log(res);
+              this.eventList = res.list.slice(0, 2)
+            }
+        },
         handelClickJump(path) {
             if (path === 'event' || path === 'service' || path === 'activity') {
                 if (this.$store.state.app.userInfo.mobile) {
diff --git a/vue.config.js b/vue.config.js
index b2a2739..09b5b76 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -31,7 +31,7 @@ module.exports = defineConfig({
     proxy: {
       //配置跨域
       '/api': {
-        target: `http://219.146.91.110:30801`,
+        target: `http://192.168.1.144`,
         // target: `http://127.0.0.1:8080`,
         changeOrigin: true,
         ws: false,