diff --git a/src/project/fengdu/AppStore/EvaluateForm.vue b/src/project/fengdu/AppStore/EvaluateForm.vue
index 674f956..95bed5c 100644
--- a/src/project/fengdu/AppStore/EvaluateForm.vue
+++ b/src/project/fengdu/AppStore/EvaluateForm.vue
@@ -30,7 +30,7 @@
     <div class="line-bg"></div>
     <div class="form-info">
       <div class="form-title">评价清单</div>
-      <div class="mini-title" v-if="positiveTypeList.length">一、正面清单</div>
+      <!-- <div class="mini-title" v-if="positiveTypeList.length">一、正面清单</div> -->
       <div class="item" v-for="(item, index) in positiveTypeList" :key="index">
         <div class="label">({{index+1}})、{{item.listType}}</div>
         <div class="value">
@@ -66,9 +66,9 @@
           </div>
         </div>
       </div>
-      <div class="mini-title" v-if="negativeTypeList.length">二、负面清单</div>
+      <!-- <div class="mini-title" v-if="negativeTypeList.length">二、负面清单</div> -->
       <div class="item" v-for="(item, index) in negativeTypeList" :key="index">
-        <div class="label">({{index+1}})、{{item.listType}}</div>
+        <div class="label">({{positiveTypeList.length+1}})、{{item.listType}}</div>
         <div class="value">
           <!-- <div class="radio" @click="negativeRadioClick(index, 1)">
             <img src="https://cdn.cunwuyun.cn/wechat/fd-store/evaluate-form-xz.png" alt="" v-if="item.status == 1">
diff --git a/src/project/weiyang/AppPatrolReport/Add.vue b/src/project/weiyang/AppPatrolReport/Add.vue
index 986180c..346efa1 100644
--- a/src/project/weiyang/AppPatrolReport/Add.vue
+++ b/src/project/weiyang/AppPatrolReport/Add.vue
@@ -93,8 +93,8 @@ export default {
     this.typeList()
     this.forms.girdId = this.user.girdInfos2G[0].girdId
     this.forms.girdName = this.user.girdInfos2G[0].girdName
-    this.forms.girdMemberId = this.user.girdMemberId
-    this.forms.girdMemberName = this.user.name
+    // this.forms.girdMemberId = this.user.girdMemberId
+    // this.forms.girdMemberName = this.user.name
   },
   onShow() {
     this.forms.name = this.user.name
@@ -134,14 +134,9 @@ export default {
       })
     },
     typeList() {
-      this.$instance.post(`/app/apppatrolreportgroupv2/list`, null, {
-        params: {
-          size: 9999,
-        },
-      }).then((res) => {
+      this.$instance.post(`/app/apppatrolreportgroupv2/list?current=1&size=9999`).then((res) => {
         if (res.code == 0) {
           this.myList = res.data.records
-          this.$forceUpdate()
         }
       })
     },
diff --git a/src/project/weiyang/AppPeopleList/DetailCard.vue b/src/project/weiyang/AppPeopleList/DetailCard.vue
index 4ba5294..f950d9b 100644
--- a/src/project/weiyang/AppPeopleList/DetailCard.vue
+++ b/src/project/weiyang/AppPeopleList/DetailCard.vue
@@ -16,7 +16,8 @@
       <div class="hints">家庭成员 {{ data.family && data.family.length }}人</div>
       <div v-if="data.family && data.family.length > 0">
         <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
-          <img src="https://cdn.sinoecare.com/i/2024/07/16/669622c50d6be.png" alt="" class="bg-img">
+          <img src="https://cdn.sinoecare.com/i/2024/07/16/669622c50d6be.png" alt="" class="bg-img" v-if="item.sex == 1">
+          <img src="https://cdn.sinoecare.com/i/2024/07/16/669622c5b284c.png" alt="" class="bg-img" v-else>
           <div class="user-info">
             <div class="photos">
               <img :src="item.photo" alt="" v-if="item.photo" />
@@ -42,6 +43,7 @@
                 <span>身份证号：</span>
                 <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
               </div>
+              <span class="item-tag" v-for="(items, indexs) in item.residentLabelList" :key="indexs">{{ items.labelName }}</span>
               <!-- <div class="spacial" v-if="item.idNumber == data.resident.idNumber">
                 <span v-for="(e,index) in spacialList" :key="index">{{e.applicationName}}</span>
               </div> -->
@@ -121,7 +123,7 @@ export default {
   }
 
   .middle {
-    margin: 16px 32px 0 32px;
+    margin: 0 32px 0 32px;
     padding: 32px;
     background-color: #fff;
     box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
@@ -164,9 +166,7 @@ export default {
       box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.08);
       border-radius: 16px;
       margin-bottom: 32px;
-      position: relative;
       width: 100%;
-      height: 192px;
       .bg-img {
         width: 100%;
         height: 100px;
@@ -174,11 +174,10 @@ export default {
       .user-info {
         display: flex;
         padding: 48px 32px;
-        position: absolute;
-        top: 0;
-        left: 0;
+        position: relative;
         width: 100%;
         box-sizing: border-box;
+        margin-top: -100px;
       }
       .photos {
         img {
@@ -188,8 +187,6 @@ export default {
         }
       }
       .right {
-        display: flex;
-        flex-direction: column;
         margin-left: 40px;
         width: 100%;
         .rightTop {
@@ -244,13 +241,24 @@ export default {
           }
         }
         .rightBottom {
-          margin-top: 20px;
+          margin: 20px 0 16px 0;
           font-family: PingFangSC-Regular;
           font-weight: 400;
           font-size: 26px;
           color: #333;
           letter-spacing: 0;
         }
+        .item-tag {
+          display: inline-block;
+          line-height: 44px;
+          padding: 0 10px;
+          background-color: #F0F2F5;
+          font-family: PingFangSC-Regular;
+          font-size: 24px;
+          color: #8891A1;
+          margin: 0 12px 8px 0;
+          border-radius: 6px;
+        }
         // .spacial {
         //   margin-top: 10px;
         //   white-space: wrap;
diff --git a/src/project/weiyang/AppPeopleList/DetailPeople.vue b/src/project/weiyang/AppPeopleList/DetailPeople.vue
index 1094f87..08ee1a8 100644
--- a/src/project/weiyang/AppPeopleList/DetailPeople.vue
+++ b/src/project/weiyang/AppPeopleList/DetailPeople.vue
@@ -19,6 +19,7 @@
           </span>
         </div>
         <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
+        <span class="item-tag" v-for="(items, indexs) in data.resident.residentLabelList" :key="indexs">{{items.labelName}}</span>
       </div>
     </div>
     <div class="user-content">
@@ -249,7 +250,7 @@ export default {
     padding: 48px 32px 32px 32px;
     box-sizing: border-box;
     width: calc(100% - 64px);
-    margin: 16px 0 32px 32px;
+    margin: 0 0 32px 32px;
     border-radius: 16px;
     background-color: #fff;
     .photos {
@@ -260,8 +261,8 @@ export default {
       }
     }
     .right {
-      display: flex;
-      flex-direction: column;
+      // display: flex;
+      // flex-direction: column;
       width: 100%;
       margin-left: 24px;
       .rightTop {
@@ -293,12 +294,23 @@ export default {
         }
       }
       .rightBottom {
-        margin-top: 8px;
+        margin: 8px 0 16px 0;
         line-height: 40px;
         font-family: PingFangSC-Regular;
         font-size: 28px;
         color: #999;
       }
+      .item-tag {
+        display: inline-block;
+        line-height: 44px;
+        padding: 0 10px;
+        background-color: #F0F2F5;
+        font-family: PingFangSC-Regular;
+        font-size: 24px;
+        color: #8891A1;
+        margin: 0 12px 8px 0;
+        border-radius: 6px;
+      }
     }
   }
 
diff --git a/src/project/weiyang/AppPeopleList/PeopleList.vue b/src/project/weiyang/AppPeopleList/PeopleList.vue
index af50bf3..c43e510 100644
--- a/src/project/weiyang/AppPeopleList/PeopleList.vue
+++ b/src/project/weiyang/AppPeopleList/PeopleList.vue
@@ -39,8 +39,9 @@
           </div>
           <div class="rightBottom">
             <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
-            <span>{{ item.phone }}</span>
+            <span>{{ item.phone || ''}}</span>
           </div>
+          <span class="item-tag" v-for="(items, indexs) in item.residentLabelList" :key="indexs">{{items.labelName}}</span>
         </div>
       </div>
       <AiEmpty v-if="!datas.length" />
@@ -54,7 +55,7 @@
       <div class="popup-content">
         <div class="title">选择标签</div>
         <div class="tag-list">
-          <div class="item" :class="item.isCheck ? 'active' : ''" v-for="(item, index) in tagList" :key="index">{{ item.labelName }}</div>
+          <div class="item" :class="item.isCheck ? 'active' : ''" v-for="(item, index) in tagList" :key="index" @click="tagClick(index)">{{ item.labelName }}</div>
         </div>
         <div class="poup-btn">
           <div>取消</div>
@@ -213,6 +214,9 @@ export default {
       if(!this.showBtn) return
       this.getTagList()
     },
+    tagClick(index) {
+      this.tagList[index].isCheck = !this.tagList[index].isCheck
+    },
     getTagList() {
       this.$instance.post('app/appresidentlabelinfo/list?current=1&size=2000').then((res) => {
         if (res.code == 0) {
@@ -228,14 +232,14 @@ export default {
       var residentId = [], residentLabelList = []
       this.datas.map((item) => {
         if(item.isCheck) {
-          residentId.push(id)
+          residentId.push(item.id)
         }
       })
       this.tagList.map((item) => {
         residentLabelList.push(item)
       })
-      this.$instance.post('/app/appresidentlabel/update', {
-        residentId: residentId.join(','),
+      this.$instance.post('app/appresidentlabel/batchUpdate', {
+        residentIds: residentId,
         residentLabelList
       }).then((res) => {
         if (res.code == 0) {
@@ -406,7 +410,7 @@ export default {
     margin: 320px 0 0 32px;
     .datass {
       display: flex;
-      padding: 24px 0;
+      padding: 20px 0 12px 0;
       width: 100%;
       background: #fff;
       .left {
@@ -428,8 +432,8 @@ export default {
       }
 
       .right {
-        display: flex;
-        flex-direction: column;
+        // display: flex;
+        // flex-direction: column;
         width: calc(100% - 208px);
         padding: 0 32px 20px 0;
         box-sizing: border-box;
@@ -456,7 +460,7 @@ export default {
         .rightBottom {
           display: flex;
           justify-content: space-between;
-          margin-top: 8px;
+          margin: 8px 0;
           font-size: 28px;
           font-family: PingFangSC-Regular;
           color: #999;
@@ -466,6 +470,18 @@ export default {
             font-size: 26px;
           }
         }
+
+        .item-tag {
+          display: inline-block;
+          line-height: 44px;
+          padding: 0 10px;
+          background-color: #F0F2F5;
+          font-family: PingFangSC-Regular;
+          font-size: 24px;
+          color: #8891A1;
+          margin: 0 12px 8px 0;
+          border-radius: 6px;
+        }
       }
     }
     .datass:nth-last-of-type(1) {
diff --git a/src/project/weiyang/AppPhotoReport/AppPhotoReport.vue b/src/project/weiyang/AppPhotoReport/AppPhotoReport.vue
index 871108a..ba842af 100644
--- a/src/project/weiyang/AppPhotoReport/AppPhotoReport.vue
+++ b/src/project/weiyang/AppPhotoReport/AppPhotoReport.vue
@@ -56,6 +56,7 @@ export default {
     return {
       list: [],
       current: 1,
+      pages: 2,
       total: 0,
       itemOptions: [
         {text: '删除', style: {backgroundColor: '#f46'}}
@@ -73,6 +74,7 @@ export default {
 
   onShow() {
     this.current = 1
+    this.pages = 2
     this.getList()
   },
   onLoad() {
@@ -83,14 +85,9 @@ export default {
       this.$linkTo('./PhotoForm')
     },
     getList() {
-      if (this.current == 1) {
-        //当current=1时,意味着重新刷新数据
-        this.list = []
-      } else if (this.list.length >= this.total && this.total > 0) {
-        return //当数据总量和列表总量一样时,不用再加载数据
-      }
+      if (this.current > this.pages) return 
       this.$loading()
-      this.$instance.post(`/app/appresidentreportinfo/listByApplet`, null, {
+      this.$instance.post(`/app/apppatrolreportinfov2/listByApplet`, null, {
         params: {
           current: this.current, size: 15
         }
@@ -99,18 +96,20 @@ export default {
           const list = res.data.records.map(v => ({...v, statusName: this.$dict.getLabel('clapEventStatus', v.eventStatus)}))
           this.list = this.current == 1 ? list : [this.list, list].flat()
           this.total = res.data.total
+          this.pages = res.data.pages
           this.current++
         }
       }).finally(() => uni.hideLoading())
     },
     handleDelete(ids) {
-      this.$dialog.confirm({content: "是否要进行删除?"}).then(() => {
-        this.$instance.post("/app/appresidentreportinfo/delete", null, {
+      this.$dialog.confirm({content: "确定删除该数据?"}).then(() => {
+        this.$instance.post("/app/apppatrolreportinfov2/delete", null, {
           params: {ids}
         }).then(res => {
           if (res?.code == 0) {
             this.$u.toast("删除成功!")
             this.current = 1
+            this.pages = 2
             this.getList()
           }
         })
@@ -137,7 +136,7 @@ export default {
   }
 
   .photo-list__wrapper {
-    padding: 16px 0 252px 0;
+    padding: 0 0 252px 0;
   }
 
   .photo-item {
diff --git a/src/project/weiyang/AppPhotoReport/PhotoDetail.vue b/src/project/weiyang/AppPhotoReport/PhotoDetail.vue
index fb8f5d4..fa7a262 100644
--- a/src/project/weiyang/AppPhotoReport/PhotoDetail.vue
+++ b/src/project/weiyang/AppPhotoReport/PhotoDetail.vue
@@ -123,7 +123,7 @@ export default {
     },
     getInfo() {
       this.$loading()
-      this.$instance.post(`/app/appresidentreportinfo/queryDetailById?id=${this.id}`).then(res => {
+      this.$instance.post(`/app/apppatrolreportinfov2/queryDetailById?id=${this.id}`).then(res => {
         if (res?.data) {
           this.info = res.data
           if (res.data.eventStatus > 1) {
diff --git a/src/project/weiyang/AppPhotoReport/PhotoForm.vue b/src/project/weiyang/AppPhotoReport/PhotoForm.vue
index 4b2243f..35bb03e 100644
--- a/src/project/weiyang/AppPhotoReport/PhotoForm.vue
+++ b/src/project/weiyang/AppPhotoReport/PhotoForm.vue
@@ -185,7 +185,7 @@ export default {
       })
     },
     getDict() {
-      this.$instance.post(`/app/appresidentreportgroup/list?current=1&size=100000`).then(res => {
+      this.$instance.post(`/app/apppatrolreportgroupv2/list?current=1&size=9999`).then(res => {
         if (res.code == 0) {
           this.dictList = res.data.records.map(v => {
             return {
@@ -221,7 +221,7 @@ export default {
       if (this.flag) return
       
       this.$loading()
-      this.$instance.post(`/app/appresidentreportinfo/addByApplet`, {
+      this.$instance.post(`/app/apppatrolreportinfov2/addByGirdMember`, {
         ...this.form,
         openid: this.user.openid,
         portrait: this.user.avatarUrl,
diff --git a/src/project/weiyang/AppResidentFile/AppResidentFile.vue b/src/project/weiyang/AppResidentFile/AppResidentFile.vue
index ffef253..7aa7f72 100644
--- a/src/project/weiyang/AppResidentFile/AppResidentFile.vue
+++ b/src/project/weiyang/AppResidentFile/AppResidentFile.vue
@@ -457,18 +457,17 @@ uni-page-body {
   height: 100%;
   .header-content-bg {
     width: 100%;
-    position: relative;
+    position: fixed;
+    z-index: -1;
     img {
       width: 100%;
       height: 592px;
-      position: absolute;
-      z-index: -1;
     }
   }
   .statistics-content {
     padding-bottom: 216px;
     .top-tabs {
-      padding: 32px;
+      padding: 0 32px 32px;
       box-sizing: border-box;
       ::v-deep .u-tabs {
         border-radius: 16px;
@@ -612,6 +611,11 @@ uni-page-body {
           width: calc(100% - 136px);
         }
       }
+      .item:nth-last-of-type(1) {
+        .right-info {
+          border-bottom: none;
+        }
+      }
     }
   }