From 6b4cb7b82673e10216fab8fee550e4730ebdab4d 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: Mon, 14 Oct 2024 09:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=89=E6=B1=82=E7=B1=BB=E5=88=AB=E7=9A=84?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=EF=BC=8C=E9=A6=96=E9=A1=B5=E7=9A=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=85=E6=B0=91=E8=AE=AE=E4=BA=8B=EF=BC=8C=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/event/index.vue    | 65 ++++++++++------------------
 src/views/home/index.vue     | 84 ++++++++++++++++++++++++++++--------
 src/views/register/index.vue |  5 ++-
 src/views/userInfo/index.vue | 11 +++--
 4 files changed, 98 insertions(+), 67 deletions(-)

diff --git a/src/views/event/index.vue b/src/views/event/index.vue
index 89df915..14b5ecb 100644
--- a/src/views/event/index.vue
+++ b/src/views/event/index.vue
@@ -29,7 +29,7 @@
             <!-- <Picker  label="诉求类别" placeholder="请选择准确的类型便于派单" v-model="streetId" :items="streetOptions"
               @change="e => setVal('street', e, 'getChildAgencyByPid')" /> -->
             <van-cell required is-link title="诉求类别" @click="onShowPicker()">
-              <div>{{ selectedValue }}</div>
+              <div>{{ cascaderValue }}</div>
             </van-cell>
           </div>
           <div class="block">
@@ -53,9 +53,9 @@
     </van-tabs>
 
     <van-popup v-model="showType" position="bottom">
-      <van-cascader v-model="cascaderValue" title="请选择所在地区" :options="cateOptions" @close="show = false"
-        :field-names="{ text: 'categoryName', value: 'categoryCode', children: 'children', }" @change="onChange"
-        @finish="onFinish" />
+      <van-cascader v-model="cascaderValue" title="请选择所属类别" :options="cateOptions" @close="show = false"
+        :field-names="{ text: 'categoryName', value: 'categoryCode', children: 'children', }" @finish="onChange"
+         />
       <!-- <van-cascader :options="cateOptions"
          :height="400"
           @close="close1" @change="onChange" /> -->
@@ -83,7 +83,7 @@ export default {
   components: {Recording,Audio,Picker, Perfect, Map, appeal},
   data() {
     return {
-      cascaderValue:"",
+      cascaderValue:"",//诉求类别
       cateOptions:[],
       showType:false,
       streetId:"",
@@ -125,49 +125,33 @@ export default {
     this.agencyId = this.$store.state.app.agencyId;
   },
   methods: {
-    onChange(value,selectedOptions) {
-      console.log(value,selectedOptions,"skjlkfdjs");
-      const lastOption = this.findSelectedOption(value, this.cateOptions);
-      if (!lastOption || !lastOption.children || lastOption.children.length === 0) {
-        this.selectedValue = value;
-        this.showType = false; 
-        console.log('选中项:', lastOption);
-      }
+    onChange(value) {
+      console.log(value ,"skjlkfdjs");
+      this.cascaderValue = value.selectedOptions[value.tabIndex].categoryName;
+      logic(value.selectedOptions[value.tabIndex].categoryName,"skdlsklfjslkfjl");
+      this.showType=false
+      
+      // const lastOption = this.findSelectedOption(value, this.cateOptions);
+      // if (!lastOption || !lastOption.children || lastOption.children.length === 0) {
+      //   this.selectedValue = value;
+      //   this.showType = false; 
+      //   console.log('选中项:', lastOption);
+      // }
     },
     //获取时间类型
     async getCateOptions() {
       const url = '/governance/icEvent/getCategoryTree';
       let params = {};
       getCategoryTree(params).then(res => {
-        // let treeDataNew = this.deepTree(res.data, "children");
+        //对子集为空数据的做null处理
+        let treeDataNew = this.deepTree(res.data, "children");
         if (res.code === 0) {
-          //组织级联数据
-          // ++this.iscascaderShow;
-          // this.cateOptions = [];
-          this.cateOptions = res.data;
-          console.log(this.cateOptions,"SDSDKLJLKSDFJLK");
-          
+          this.cateOptions = [];
+          this.cateOptions = treeDataNew;
         } else {
           this.$message.error(msg);
         }
-        // if (this.eventDetailCopy.parentCategoryId) {
-        //   const pids = this.eventDetailCopy.parentCategoryId.split(',');
-        //   pids.push(this.eventDetailCopy.categoryId);
-        //   let nodes = this.cateOptions;
-        //   for (let i = 0; i < pids.length; i++) {
-        //     nodes = this.buildNode(nodes, pids[i])
-        //   }
-        //   if (nodes) {
-        //     this.formData.categoryList.push(nodes)
-        //   }
-        // }
-   
-        
       })
-      console.log(this.cateOptions,"SDSDKLJLKSDFJLK");
-      // const { data, code, msg } = await requestPost(url, params);
-    
-      
     },
     //重构树，去除网格
     deepTree(arr, children) {
@@ -175,11 +159,8 @@ export default {
         return arr.map((item) => {
           return {
             ...item,
-            [children]:
-              (item[children] &&
-                item[children].length > 0 &&
-                this.deepTree(item[children], children)) ||
-              null,
+            [children]:item[children] &&item[children].length > 0?this.deepTree(item[children], children):null
+     
           };
         });
       }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1509ceb..60bb993 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -87,28 +87,78 @@
                     </div>
                     <span @click="$router.push('/discussion')">更多</span>
                 </div>
-                <div class="activity_content flex" v-for="(item, index) in eventList" :key="index"
-                    @click="$router.push({ path: `/discusionDetail`,query: { eventId:item.eventId} })">
-                    <div class="flex flex-y flex1 flex-end" style="overflow: hidden;">
-                        <span class="van-multi-ellipsis--l2">
-                            {{ 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 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"
+                                    @click="$router.push({name:'communityPublicityDetail',query:{id:item.id}})">
+                                    <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="flex1 text-align-right">{{item.releaseTime}}</div>
+                                        </div>
+                                        <div class="flex flex-center" @click.stop="communityPublicityGiveLike(item.id)">
+                                            <img src="@/assets/images/icons/support.png" alt=""
+                                                class="img_16 m-right7"><span>{{ item.likes || 0}}</span>
+                                        </div>
+
+                                    </div>
+                                </div>
                             </div>
-                            <div class="flex flex-center" @click.stop="handelClicsupport1(item.eventId)">
-                                <img src="@/assets/images/icons/support.png" alt="" class="img_16 m-right7">
-                                <span>支持 {{ item.supportNum }}</span>
+                            <div v-else class="no-data">
+                                暂无数据~
                             </div>
-                            <div class="flex flex-center" @click.stop="handelClicopposeNum(item.eventId)"><img
-                                    src="@/assets/images/icons/oppose.png" alt="" class="img_16 m-right7"><span>反对
-                                    {{ item.opposeNum }}</span></div>
-                        </div>
+                        </van-tab>
+                    </van-tabs>
+                </div>
+
+            </div>
+            <div class="card m-top10">
+                <div class="title">
+                    <div class="flex flex-center2">
+                        <img style="height:20px;" src="@/assets/images/home/biaoqian.png" alt="">
+                        <span class="m-left5" style=" color: black;   font-family:pingfang-bold;
+      font-size: 17px;">居民议事</span>
                     </div>
+                    <span @click="$router.push('/communityPublicity')">更多</span>
                 </div>
+
+                            <div class="activity_content flex" v-for="(item, index) in eventList" :key="index"
+                                @click="$router.push({ path: `/discusionDetail`, query: { eventId: item.eventId } })">
+                                <div class="flex flex-y flex1 flex-end" style="overflow: hidden;">
+                                    <span class="van-multi-ellipsis--l2">
+                                        {{ 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.stop="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.stop="handelClicopposeNum(item.eventId)">
+                                            <img src="@/assets/images/icons/oppose.png" alt=""
+                                                class="img_16 m-right7"><span>反对
+                                                {{ item.opposeNum }}</span></div>
+                                    </div>
+                                </div>
+                            </div>
+ 
+      
             </div>
+
             <div class="card m-top10">
                 <div class="title">
                     <div class="flex flex-center2">
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index abf8508..fbcaeb7 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -13,9 +13,10 @@
           <van-button block class="button" type="info" round @click="submit">注册</van-button>
         </div>
       </van-tab>
-      <van-tab title="实名认证">
+      <van-tab title="志愿者注册">
         <div class="block container">
-          <van-field v-model="realName" label="真实姓名" placeholder="请输入" required />
+          <van-field v-model="realName" label="昵称" placeholder="请输入" required />
+          <van-field v-model="realName" label="姓名" placeholder="请输入" required />
           <van-field v-model="idNum" label="身份证号" placeholder="请输入" required/>
           <van-field v-model="phone" label="手机号" placeholder="请输入" required />
           <van-field v-model="smsCode" label="验证码" placeholder="请输入" required>
diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue
index 884405f..f93daef 100644
--- a/src/views/userInfo/index.vue
+++ b/src/views/userInfo/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div>  <div class="container">
     <div class="block">
-      <van-cell title="头像" required>
+      <!-- <van-cell title="头像" required>
         <template>
           <van-image width="37" height="37" :src="userInfo.headImgUrl" round />
         </template>
-      </van-cell>
-      <van-field label="姓名"  v-model="surName" placeholder="请输入" />
-      <van-cell title="性别">
+      </van-cell> -->
+      <van-field label="真实姓名"  v-model="surName" placeholder="请输入" />
+      <!-- <van-cell title="性别">
         <van-radio-group class="gender" v-model="gender">
           <van-radio :name="0">男</van-radio>
           <van-radio :name="1" style="margin-left: 50px">女</van-radio>
         </van-radio-group>
-      </van-cell>
+      </van-cell> -->
       <van-field label="身份证号码"  v-model="idNum" placeholder="请输入" />
       <template>
         <van-field label="手机号"  v-model="mobile" placeholder="请输入" />
@@ -348,7 +348,6 @@ export default {
     // 获取街道
     getAllAgencyStreet() {
       getAllAgencyStreet({}).then(res => {
-    
         this.streetOptions = res.data
           ? res.data.map(item => {
             return {