tabBar顺序修改,修改bug

components/custom-tab-bar/index.js

@@ -23,6 +23,14 @@ Component({
                 "selectedIconPath": "/images/home/resiAndHouseSelected.png",
                 show: true
 
+            },
+            {
+                "pagePath": "/pages/work2/work2",
+                "text": "工作",
+                "iconPath": "/images/home/work.png",
+                "selectedIconPath": "/images/home/workSelected.png",
+                show: true
+    
             },
             {
                 "pagePath": "/pages/statistics/statistics",
@@ -32,14 +40,7 @@ Component({
                 show: false
 
             },
-            {
-                "pagePath": "/pages/work2/work2",
-                "text": "工作",
-                "iconPath": "/images/home/work.png",
-                "selectedIconPath": "/images/home/workSelected.png",
-                show: true
            
-            },
             {
                 "pagePath": "/pages/mine/mine",
                 "text": "我的",
@@ -63,13 +64,13 @@ Component({
             getOwnedRolesOfStaffId(res.data.id).then(res2 => {
                 app.globalData.user = res.data
                 this.setData({
-                    "list[2].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
+                    "list[3].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
                 })
             })
         })
         } else {
             this.setData({
-                "list[2].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
+                "list[3].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
             })
         }
         console.log(app.globalData.roleList, 'userss')

pages/resiAndHouse/resiAndHouse.js

@@ -386,6 +386,7 @@ Page({
             tableData: []
         })
         this.getTableData()
+        this.getAllOrgCategoryCount()
     },
     onClose() {
         this.setData({

pages/work2/work2.wxml

@@ -42,7 +42,7 @@
         </view>
         <view class="section_1-0">
           <view class="text-wrapper_7-0">
-            <text lines="1" class="text_2-0">信息服务</text>
+            <text lines="1" class="text_2-0">为民服务</text>
           </view>
           <view class="house">
           <view>

subpages/house/pages/housePortrait/housePortrait.wxml

@@ -69,10 +69,10 @@
                             <text class="logs-content-title">操作人：</text>
                             <text class="logs-content-txt">{{item.operatorName}}</text>
                         </view>
-                        <view>
+                        <!-- <view>
                             <text class="logs-content-title">备注：</text>
                             <text class="logs-content-txt">{{item.resiName}}</text>
-                        </view>
+                        </view> -->
                     </view>
                 </view>
             </view>

subpages/searchResult/pages/resiInfo/resiInfo.js

@@ -646,7 +646,8 @@ Page({
             list.push({
                 name:'关系图谱',
                 id:"graph"
-            })
+            },
+           )
         this.setData({
             tabList: list
         })
@@ -656,7 +657,6 @@ Page({
                 item.name == "拓展信息" ||item.name == "居住信息" ||
                 item.name == "基本信息")
         );
-
         let arrs = []
         arrs = this.data.originalExpandList.filter((itemA) => {
             return arr.some((itemB) => itemB.name === itemA.title);

subpages/searchResult/pages/resiInfo/resiInfo.wxml

@@ -16,11 +16,11 @@
             <view class="jm-btn" bind:tap="toAddResi">编辑</view>
         </view>
     </view>
-    <view class="form">
+    <!-- <view class="form">
         <view class="form_label">地址：</view>
         <view class="form_value"><text>{{form
         .resideInfoDtos[0].agencyName}}</text>{{form.resideInfoDtos[0].homeName}}</view>
-    </view>
+    </view> -->
     <view class="form">
         <view class="form_label">创建时间：</view>
         <view class="form_value">{{form.baseInfoDto.createdTime}}</view>
@@ -30,8 +30,8 @@
         <view class="form_value">{{form.baseInfoDto.updatedTime}}</view>
     </view>
     <view class="tabs">
-        <view class="tab_item {{activeType === index ? 'border_bto' : ''}}" wx:for="{{tabList}}" bind:tap="handelClickTab" data-item="{{item}}" data-index="{{index}}" wx:key="index" wx:if="{{item.filledQty!=0}}">
+        <view class="tab_item {{activeType === index ? 'border_bto' : ''}}" wx:for="{{tabList}}" bind:tap="handelClickTab" data-item="{{item}}" data-index="{{index}}" wx:key="index" wx:if="{{item.id=='ext'||item.filledQty!=0  }}">
-            {{item.name}} <text style="color:{{item.filledQty!==item.totalQty?'#f27225':'#1ebfb5'}}" wx:if="{{item.filledQty}}">（{{ item.filledQty }}/{{ item.totalQty }}）</text>
+            {{item.name}} <text style="color:{{item.filledQty!==item.totalQty?'#f27225':'#1ebfb5'}}" wx:if="{{item.filledQty ||item.id=='ext'}}">（{{ item.filledQty }}/{{ item.totalQty }}）</text>
         </view>
     </view>
 </view>
@@ -116,13 +116,21 @@
         </view>
         <view class="item">
             <text class="must">*</text>
-            <view class="label">人房状况：</view>
+            <view class="label">人户状况：</view>
-            <View class="value">{{item.agencyName}}{{item.homeName }}</View>
+            <view class="value" wx:if="{{item.householdSituation && dicts.householdSituationArr}}">
+                <block wx:for="{{dicts.householdSituationArr}}" wx:for-item="selectItem" wx:key="index">
+                    <block wx:if="{{selectItem.value === item.householdSituation}}">
+                        {{selectItem.label}}
+                    </block>
+                </block>
             </view>
+            <view wx:else>--</view>
+        </view>
+
+
         <view class="item">
-            <text class="must">*</text>
             <view class="label">户籍所在地：</view>
-            <View class="value"> {{ item.placeOfDomicile || "--" }}</View>
+            <View class="value"> {{ item.placeOfDomicile === 'null'?'--':item.placeOfDomicile}}</View>
         </view>
         <view class="item">
             <text class="must">*</text>

subpages/searchResult/pages/resiInfo/resiInfo.wxss

@@ -68,6 +68,11 @@ page {
   color: #999999;
 
 }
+
+.info .item .value {
+    flex: 1;
+    overflow-x: hidden;
+}
 .must{
   font-size: 32rpx;
   font-weight: 500;
@@ -113,12 +118,14 @@ page {
 }
 
 .btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   box-sizing: border-box;
   text-align: center;
   height: 76rpx;
   border-radius: 39rpx;
   margin: 30rpx  0;
-  line-height: 76rpx;
   border-radius: 76rpx;
   border: 1rpx solid #999999;
   width: 226rpx;