跳转逻辑修改,删除多余图片

app.json

@@ -55,6 +55,13 @@
                 "pages/checkLog/checkLog"
             ]
         },
+        {
+            "root": "subpages/residentCategory",
+            "name": "residentCategory",
+            "pages": [
+                "pages/residentCategory/residentCategory"
+            ]
+        },
         {
             "root": "subpages/addResi",
             "name": "addResi",

pages/index/index.js

@@ -77,19 +77,12 @@ onScrollToLower(e){
         res.data.list.forEach(item => {
           if (item.msgType === 'resident_base_info') {
               item.typeName = '居民信息采集'
-          } else if (item.categoryName === 'community_house') {
+          } else if (item.msgType === 'community_house') {
               item.typeName = '房屋信息采集'
-          } else if (item.categoryName === 'resident_categiry') {
+          } else if (item.msgType === 'resident_categiry') {
               item.typeName='数据更新提醒'
-            
           }
       })
-      // res.data.list = res.data.list.map(item => {
-      //   if (item.createdByName && item.createdByName.length >= 3) {
-      //     item.createdByName = item.createdByName.slice(1,3);
-      //   }
-      //   return item;
-      // });
         
       this.setData({
         loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
@@ -185,12 +178,16 @@ onScrollToLower(e){
    this.clearOneMessage(e.currentTarget.dataset.item.id)
     if(e.currentTarget.dataset.item.msgType == 'resident_base_info'){
       wx.navigateTo({
-        url: `/subpages/addResi/pages/editResi/editResi?type=edit&resiId=${e.currentTarget.dataset.item.targetId}`,
+        url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.targetId}`,
       })
-    }else{
+    }else if(e.currentTarget.dataset.item.msgType == 'community_house'){
       wx.navigateTo({
         url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.targetId}`,
       })
+    }else if(e.currentTarget.dataset.item.msgType == 'resident_category'){
+      wx.navigateTo({
+        url: `/subpages/residentCategory/pages/residentCategory/residentCategory?category=${e.currentTarget.dataset.item.category}`,
+      })
     }
     this.setData({
       [`tableData[${e.currentTarget.dataset.index}].readFlag`]:'1'

pages/resiAndHouse/resiAndHouse.wxml

@@ -51,6 +51,7 @@
         <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
             <view class="form_item" wx:for="{{tableData}}" :wx:key="{{index}}" bind:tap="toResiDetail" data-resiId="{{item.resiId}}">
                 <view class="box_18">
+                   <view style="display: flex;align-items: center;">
                     <view style="display: flex;">
                         <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='1'&&item.age>18 &&item.age<60}}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/1e21790833b04e9abe61e2a8f40446cb.png" mode="" />
                         <image style="width: 40rpx;height: 40rpx;margin-right: 16rpx;" wx:if="{{item.gender=='1'&& item.age<18 }}" src="https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20240402/62c2b6a1ce834f8dae081b562b2579b9.png" mode="" />
@@ -64,8 +65,9 @@
                     <view class="resi_tag " wx:if="{{item.categoryNameStr}}">
                         <view wx:for="{{item.categoryNameStr}}" wx:for-item="itemC" wx:for-index="indexxxxxxxx" wx:key="indexxxxxxxx" class="{{itemC === '党员'?'hong':itemC==='群众'?'lan':itemC === '共青团员'?'ju':itemC ==='残疾人员'?'qing':itemC =='慢病'?'zi':itemC ==='死亡'?'hui':itemC=='老年人'?'lan':itemC=='低保人员'?'lv':itemC =='退役军人'?'hong':itemC === '保障房人员'?'huang':itemC =='育龄妇女'?'fen':itemC=='特扶人员'?'zi':itemC=='安置帮教'?'zi':itemC=='吸毒人员'?'hong':itemC =='社区矫正'?'qing':itemC=='不良青少年'?'huang':itemC=='肇事肇祸精神病'?'zi':itemC =='邪教人员'?'ju':itemC=='统战人员'?'lv':itemC=='信访人员'?'honsg':itemC=='志愿者'?'fen':itemC == '楼长'?'lan':itemC=='单元长'?'qing':itemC=='公益岗'?'fen':itemC==='大病'?'hong':'lan'}}">{{itemC}}</view>
                     </view>
+                   </view>
                     <view class="text-wrapper_9">
-                        <!-- <view class="label">信息完整度：</view><view class="value">{{item.synthesizeScore}}</view>  -->
+                        <view class="label">信息完整度：</view><view class="value">{{item.synthesizeScore}}</view> 
                     </view>
                 </view>
                 <view class="text-wrapper_13">

pages/resiAndHouse/resiAndHouse.wxss

@@ -462,7 +462,7 @@ page {
     /* height: 36rpx; */
     flex-direction: row;
     align-items: center;
-    justify-content: start;
+    justify-content: space-between;
     display: flex;
     margin: 20rpx 0 0 0;
 }
@@ -1387,7 +1387,7 @@ page {
     /* justify-content: start; */
     /* max-width: 302rpx; */
     overflow-x: scroll;
-    padding: 10rpx 0;
+    padding: 10rpx 0 0;
     box-sizing: border-box;
     margin-left: 16rpx;
     font-size: 24rpx;

pages/work1/work1.js

@@ -1,66 +0,0 @@
-// pages/work1/work1.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

pages/work1/work1.wxml

@@ -1,2 +0,0 @@
-<!--pages/work1/work1.wxml-->
-<text>pages/work1/work1.wxml</text>