From c7ab7693011ad48df3f1d794f08f6e8028bcb468 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 3 Jul 2024 18:47:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=89=E6=B1=82?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83,=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=AD=E7=A4=BE=E5=8C=BA=E8=AE=AF=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83,=E8=B7=AF=E7=94=B1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/event.js           |  10 +++-
 src/api/home.js            |  18 +++++++
 src/assets/css/index.less  |  25 +++++++++-
 src/views/appeal/index.vue |  14 ++----
 src/views/home/index.vue   | 100 +++++++++++++++++++++++++++++++++----
 5 files changed, 144 insertions(+), 23 deletions(-)

diff --git a/src/api/event.js b/src/api/event.js
index 25f7075..2ad4811 100644
--- a/src/api/event.js
+++ b/src/api/event.js
@@ -20,7 +20,15 @@ export function eventList(params) {
     params
   })
 }
-
+//我的诉求列表
+export function collects(params) {
+  return request({
+    url: `/governance/demandCollect/my/collects`,
+    method: 'get',
+    message: '获取诉求中...',
+    params
+  })
+}
 // 事件评价
 export function updateEvent(data) {
   return request({
diff --git a/src/api/home.js b/src/api/home.js
index adb57e0..88aeffb 100644
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -17,4 +17,22 @@ export function icEventOldDiscuss(data) {
     data
   })
 }
+
+  // 【社区讯息】菜单
+  export function advertisingTag(data) {
+    return request({
+      url: `/actual/base/advertisingTag/page`,
+      method: 'post',
+      data
+    })
+  }
+  // 【社区讯息】菜单
+  export function communityPublicity(data) {
+    return request({
+      url: `/actual/base/communityPublicity/page`,
+      method: 'post',
+      data
+    })
+  }
+
   
\ No newline at end of file
diff --git a/src/assets/css/index.less b/src/assets/css/index.less
index 9e38b54..05d6ba1 100644
--- a/src/assets/css/index.less
+++ b/src/assets/css/index.less
@@ -33,6 +33,14 @@ body #app {
     }
   }
 }
+.no-data{
+  height: 50px;
+  width: 100%;
+  color: #666666;
+  text-align: center;
+  line-height: 50px;
+  font-size: 15px;
+}
 .y66666{
   color: #666666;
 }
@@ -128,6 +136,9 @@ body #app {
   &-right10{
     margin-right: 10px;
   }
+  &-right26{
+    margin-right: 26px;
+  }
   
   &-top15{
     margin-top: 15px;
@@ -187,7 +198,19 @@ body #app {
 .mr10 {
   margin-right: 10px;
 }
-
+.text{
+  &-align{
+    &-center{
+      text-align: center;
+    }
+    &-right{
+      text-align: right;
+    }
+    &-left{
+      text-align: left;
+    }
+  }
+}
 .primary-color {
   color: @blue;
 }
diff --git a/src/views/appeal/index.vue b/src/views/appeal/index.vue
index 35ce099..427477b 100644
--- a/src/views/appeal/index.vue
+++ b/src/views/appeal/index.vue
@@ -77,7 +77,7 @@
 </template>
 
 <script>
-import { eventList } from '@/api/event'
+import { collects } from '@/api/event'
 import { ImagePreview } from 'vant'
 import { requirementList } from '@/api/demand'
 export default {
@@ -105,16 +105,8 @@ export default {
   },
   methods: {
     getEventList() {
-      eventList({
-        mobile: this.$store.state.app.userInfo.phone
-      }).then(res => {
-        res = res.map(item => {
-          return {
-            ...item,
-            imageList: item.imageList.map(item2 => item2.url)
-          }
-        })
-        this.eventList = res
+      collects().then(res => {
+        this.eventList = res.list;
       })
     },
     getDemandList() {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 894e55b..6af7abc 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -19,7 +19,8 @@
             <div class="swipe">
                 <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
                     <van-swipe-item v-for="item in activityList">
-                        <img :src="item.coverPic" alt="" style="width: 100%;height: 150px; margin: 0 auto;border-radius: 15px;">
+                        <img :src="item.coverPic" alt=""
+                            style="width: 100%;height: 150px; margin: 0 auto;border-radius: 15px;">
                     </van-swipe-item>
                 </van-swipe>
             </div>
@@ -67,8 +68,8 @@
                                 <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('activity')" :disabled="item.online !== 1">报名</van-button>
+                            <van-button type="info" size="small" round @click="handelClickJump('activity')"
+                                :disabled="item.online !== 1">报名</van-button>
                         </div>
                     </div>
                 </div>
@@ -94,6 +95,40 @@
                     </div>
                 </div>
             </div>
+            <div class="card m-top10">
+                <div class="title">
+                    <span>社区讯息</span>
+                    <span @click="$router.push('/discussion')">更多</span>
+                </div>
+                <div class="activity_content flex">
+                    <van-tabs v-model="tagActive" style="width: 100%;" @change="handelChangeTags">
+                        <van-tab v-for="item in tagList" :key="item.id" :title="item.tagName">
+                            <div class="flex flex-y flex1 flex-end" v-if="PublicityList.length !== 0">
+                                <div class="activity_content flex flex-y" v-for="(item, index) in PublicityList" :key="index">
+                                    <div class="flex  flex1 ">
+                                        <span class="van-multi-ellipsis--l2 flex1" style="line-height: 28px;" >
+                                            {{ item.title }}
+                                        </span>
+                                        <img v-if="item.coverPic" :src="item.coverPic" style="width: 100px;height: 60px;" alt="">
+                                    </div>
+                                    <div class="flex flex-end flex-center gray m-top10 font-size13">
+                                        <div class="flex">
+                                            <div class="flex flex-center m-right26" v-if="item.tagId && tagList">{{filterTagId(item.tagId)}}</div>
+                                            <div class="flex flex-center"><img src="@/assets/images/icons/support.png"
+                                                    alt="" class="img_16 m-right7"><span>{{ item.likes }}</span>
+                                            </div>
+                                        </div>
+                                        <div class="flex1 text-align-right">{{item.releaseTime}}</div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="no-data">
+                                    暂无数据~
+                            </div>
+                        </van-tab>
+                    </van-tabs>
+                </div>
+            </div>
         </div>
         <register-dialog v-if="showRegister" @close="showRegister = false"></register-dialog>
     </div>
@@ -101,7 +136,7 @@
 
 <script>
 import registerDialog from '@/components/registerDialog';
-import { communityActivity,icEventOldDiscuss } from '@/api/home';
+import { communityActivity, icEventOldDiscuss, advertisingTag, communityPublicity } from '@/api/home';
 export default {
     data() {
         return {
@@ -135,13 +170,19 @@ export default {
             ],
             activityList: [],
             eventList: [],
-            showRegister: false
+            showRegister: false,
+            tagList: [],
+            tagActive: 'new',
+            tagId: null,
+            PublicityList:[]
         };
     },
     created() {
         this.agencyId = this.$store.state.app.agencyId;
         this.communityActivity()//获取轮播图与活动列表 
         this.icEventOldDiscuss()//获取居民议事列表
+        this.advertisingTag()//获取社区讯息菜单
+        this.communityPublicity()//获取讯息列表
     },
     methods: {
         async communityActivity() {
@@ -162,18 +203,57 @@ export default {
                 this.activityList = res.list.slice(0, 2);
             }
         },
-        async icEventOldDiscuss(){
+        async icEventOldDiscuss() {
             let parm = {
                 pageSize: 10,
                 pageNo: 1,
                 agencyId: null,
-                icEventId:null
+                icEventId: null
             }
             let res = await icEventOldDiscuss(parm)
             if (res) {
-              console.log(res);
-              this.eventList = res.list.slice(0, 2)
+                console.log(res);
+                this.eventList = res.list.slice(0, 2)
+            }
+        },
+        async advertisingTag() {
+            let parm = {
+                pageSize: 10,
+                pageNo: 1,
+                status: 0,
+                tagName: null
             }
+            let res = await advertisingTag(parm)
+            if (res) {
+                this.tagList = res.list;
+                this.tagList.unshift({ tagName: '最新', id: 'new' })
+            }
+        },
+        async communityPublicity() {
+            let parm = {
+                pageSize: 10,
+                pageNo: 1,
+                title: '',
+                tagId: this.tagId,
+                startTime: '',
+                endTime: '',
+                agencyId: this.agencyId
+            }
+            let res = await communityPublicity(parm)
+            if (res) {
+                this.PublicityList = res.list
+            }
+        },
+        handelChangeTags(val,title){
+            if(val !== 0){
+                this.tagId = this.tagList[val].id;
+            }else{
+                this.tagId = '';
+            }
+            this.communityPublicity()
+        },
+        filterTagId(tagId){
+            return this.tagList.filter(item=>item.id === tagId)[0].tagName || '--';
         },
         handelClickJump(path) {
             if (path === 'event' || path === 'service' || path === 'activity') {
@@ -184,7 +264,7 @@ export default {
                 }
             } else {
                 this.$router.push({ path: `/${path}` })
-                console.log("1111"+path);
+                console.log("1111" + path);
             }
         }
     },

From bb4e36a439a1df10f84f1e0cee9d59a1260ef0e1 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 3 Jul 2024 18:50:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=AE=AF=E6=81=AF?=
 =?UTF-8?q?=E6=88=AA=E5=8F=96=E4=B8=A4=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 6af7abc..07079f6 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -212,7 +212,6 @@ export default {
             }
             let res = await icEventOldDiscuss(parm)
             if (res) {
-                console.log(res);
                 this.eventList = res.list.slice(0, 2)
             }
         },
@@ -241,7 +240,7 @@ export default {
             }
             let res = await communityPublicity(parm)
             if (res) {
-                this.PublicityList = res.list
+                this.PublicityList = res.list.slice(0, 2)
             }
         },
         handelChangeTags(val,title){

From b487435718ed41dce92441a54126caa0d073f824 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 4 Jul 2024 10:16:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=AE=AF=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/index.less              |   3 +
 src/router/router.config.js            |  11 +-
 src/views/communityPublicity/index.vue | 220 +++++++++++++++++++++++++
 src/views/home/index.vue               |   2 +-
 4 files changed, 232 insertions(+), 4 deletions(-)
 create mode 100644 src/views/communityPublicity/index.vue

diff --git a/src/assets/css/index.less b/src/assets/css/index.less
index 05d6ba1..3aae2c9 100644
--- a/src/assets/css/index.less
+++ b/src/assets/css/index.less
@@ -41,6 +41,9 @@ body #app {
   line-height: 50px;
   font-size: 15px;
 }
+.oh{
+  overflow: hidden;
+}
 .y66666{
   color: #666666;
 }
diff --git a/src/router/router.config.js b/src/router/router.config.js
index 38c2789..e22be55 100644
--- a/src/router/router.config.js
+++ b/src/router/router.config.js
@@ -73,17 +73,17 @@ export const constantRouterMap = [
     name: 'search',
     component: () => import('@/views/search'),
     meta: { title: '搜索', keepAlive: false }
-  },{
+  }, {
     path: '/selectAgency',
     name: 'selectAgency',
     component: () => import('@/views/selectAgency'),
     meta: { title: '选择所在社区', keepAlive: false }
-  },{
+  }, {
     path: '/houseQR',
     name: 'houseQR',
     component: () => import('@/views/houseQR'),
     meta: { title: '电子门牌', keepAlive: false }
-  },{
+  }, {
     path: '/activity',
     name: 'activity',
     component: () => import('@/views/activity'),
@@ -130,6 +130,11 @@ export const constantRouterMap = [
     name: 'detailServices',
     component: () => import('@/views/Enjoyableservices/detail'),
     meta: { title: '服务详情', keepAlive: false }
+  },{
+    path: '/communityPublicity',
+    name: 'communityPublicity',
+    component: () => import('@/views/communityPublicity'),
+    meta: { title: '社区讯息', keepAlive: false }
   }
 ]
 
diff --git a/src/views/communityPublicity/index.vue b/src/views/communityPublicity/index.vue
new file mode 100644
index 0000000..aeea759
--- /dev/null
+++ b/src/views/communityPublicity/index.vue
@@ -0,0 +1,220 @@
+<template>
+    <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" @click="handleSearch">查询</van-button>
+        </div>
+        <div class='container'>
+            <van-tabs v-model="tagActive" style="width: 100%;" @change="handelChangeTags">
+                <van-tab v-for="item in tagList" :key="item.id" :title="item.tagName">
+                    <div class="flex flex-y flex1 flex-end" v-if="PublicityList.length !== 0">
+                        <van-list v-model="loading" :finished="finished" finished-text="没有更多了"
+                            @load="communityPublicity" class="card" :offset="50">
+                            <div class="activity_content flex flex-y" v-for="(item, index) in PublicityList"
+                                :key="index">
+                                <div class="flex  flex1 oh">
+                                    <div class="flex flex-y flex1 m-right10 oh">
+                                        <span class="van-multi-ellipsis--l2 " style="line-height: 28px;">
+                                            {{ item.title }}
+                                        </span>
+                                        <span class="van-ellipsis y66666 font-size15">
+                                            {{ item.content }}
+                                        </span>
+                                    </div>
+                                    <img v-if="item.coverPic" :src="item.coverPic" style="width: 100px;height: 60px;"
+                                        alt="">
+                                </div>
+                                <div class="flex flex-end flex-center gray m-top10 font-size13">
+                                    <div class="flex flex-center"><img src="@/assets/images/icons/support.png" alt=""
+                                            class="img_16 m-right7"><span>{{ item.likes }}</span>
+                                    </div>
+                                    <div class="flex1 text-align-right">{{ item.releaseTime }}</div>
+                                </div>
+                            </div>
+                        </van-list>
+                    </div>
+                    <div v-else class="no-data">
+                        暂无数据~
+                    </div>
+                </van-tab>
+            </van-tabs>
+        </div>
+    </div>
+
+
+</template>
+
+<script>
+import { advertisingTag, communityPublicity } from '@/api/home';
+
+export default {
+    data() {
+        return {
+            PublicityList: [],
+            tagList: [],
+            tagActive: 'new',
+            tagId: null,
+            pageSize: 5,
+            pageNo: 1,
+            agencyId: null,
+            finished: false,
+            loading: true,
+            showRegister: false,
+            searchValue: ""
+        };
+    },
+    created() {
+        this.agencyId = this.$store.state.app.agencyId;
+        this.advertisingTag();//获取社区讯息菜单
+        this.communityPublicity()//获取讯息列表
+    },
+    methods: {
+        handleSearch(){
+            this.PublicityList = [];
+            this.pageNo = 1;
+            this.communityPublicity()
+        },
+        filterTagId(tagId) {
+            return this.tagList.filter(item => item.id === tagId)[0].tagName || '--';
+        },
+        async advertisingTag() {
+            let parm = {
+                pageSize: 10,
+                pageNo: 1,
+                status: 0,
+                tagName: null
+            }
+            let res = await advertisingTag(parm)
+            if (res) {
+                this.tagList = res.list;
+                this.tagList.unshift({ tagName: '最新', id: 'new' })
+            }
+        },
+        async communityPublicity() {
+            let parm = {
+                pageSize: 10,
+                pageNo: 1,
+                title: this.searchValue,
+                tagId: this.tagId,
+                startTime: '',
+                endTime: '',
+                agencyId: this.agencyId
+            }
+            let res = await communityPublicity(parm)
+            if (res) {
+                this.loading = false;
+                res.list.forEach(item => {
+                    if (item.content) {
+                        item.content = this.extractChineseCharactersAndPunctuation(item.content)
+                    }
+                })
+                if (res.list.length < this.pageSize) {
+                    this.finished = true;
+                }
+                this.PublicityList = this.PublicityList.concat(res.list);
+            }
+        },
+        extractChineseCharactersAndPunctuation(str) {
+            const chineseCharsAndPunctuation = str.match(/[\u4e00-\u9fa5\u3000-\u303F\uff00-\uffef]/g);
+            return chineseCharsAndPunctuation ? chineseCharsAndPunctuation.join('') : '';
+        },
+        handelChangeTags(val, title) {
+            if (val !== 0) {
+                this.tagId = this.tagList[val].id;
+                this.PublicityList = [];
+            } else {
+                this.tagId = '';
+            }
+            this.communityPublicity()
+        },
+    },
+    components: {},
+    computed: {},
+    watch: {},
+}
+</script>
+
+<style lang='less' scoped>
+.custom-button {
+    width: 60px;
+    height: 33px;
+}
+
+.activity_content {
+    padding-bottom: 10px;
+    box-sizing: border-box;
+    width: 100%;
+    border-bottom: 1px solid #EAEAEA;
+    margin-top: 14px;
+    min-height: 50px;
+
+    .img {
+        width: 231px;
+        height: 33px;
+        margin: 5px 3px 0 3px;
+    }
+
+    &:last-child {
+        border-bottom: none;
+    }
+
+
+    .content {
+
+        width: 325px;
+        height: 40px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        font-size: 16px;
+        color: #333333;
+        line-height: 23px;
+    }
+
+    .dianzan {
+        width: 325px;
+        height: 20px;
+        display: flex;
+        font-size: 13px;
+        color: #AAAAAA;
+        flex-direction: row;
+        justify-content: space-evenly;
+        align-items: center;
+
+        .img {
+            width: 14.5px;
+            height: 15px;
+        }
+    }
+
+
+}
+
+.header {}
+
+.header .input_search {
+    width: 279px;
+    height: 33px;
+    background: rgba(193, 193, 193, 0.16);
+    border-radius: 17px;
+    // flex: 1;
+    color: #333333;
+    border: none;
+    /* 取消边框 */
+    margin-left: 10px;
+}
+
+.header .btn_search {
+    width: 60px;
+    height: 33px;
+    background: #3974F6;
+    border-radius: 17px;
+    font-family: PingFang SC;
+    font-weight: 500;
+    font-size: 14px;
+    color: #FFFFFF;
+    line-height: 23px;
+    border: none;
+    /* 取消边框 */
+    margin-right: 10px;
+}
+</style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 07079f6..eaad135 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -98,7 +98,7 @@
             <div class="card m-top10">
                 <div class="title">
                     <span>社区讯息</span>
-                    <span @click="$router.push('/discussion')">更多</span>
+                    <span @click="$router.push('/communityPublicity')">更多</span>
                 </div>
                 <div class="activity_content flex">
                     <van-tabs v-model="tagActive" style="width: 100%;" @change="handelChangeTags">