Merge branch 'v4.3.1_xiaowang_bug' into data-page

# Conflicts:
#	pages/resiAndHouse/resiAndHouse.wxml

pages/mine/mine.wxml

@@ -51,21 +51,21 @@
                 </view>
                 <view class="right"> <image src="../../images/right.png" mode=""/></view>
             </view> -->
-            <view class="item no-pseudo" bind:tap="toSettings" >
+            <view class="item " bind:tap="toSettings" >
                 <view class="left">
                         <image src="../../images/mine/sz.png" mode=""/>
                         <view>设置</view>
                     </view>
                     <view class="right"> <image src="../../images/right.png" mode=""/></view>
             </view>
-            <view class="item no-pseudo" bind:tap="toSettings" >
+            <view class="item " bind:tap="toSettings" >
                 <view class="left"  bind:tap="toChangePassword">
                         <image src="../../images/login/password.png" mode=""/>
                         <view>修改密码</view>
                     </view>
                     <view class="right"> <image src="../../images/right.png" mode=""/></view>
             </view>
-            <view class="item">
+            <view class="item no-pseudo">
                 <view class="left">
                     <image src="../../images/mine/gy.png" mode=""/>
                     <view>使用指南</view>

pages/resiAndHouse/resiAndHouse.wxss

@@ -458,7 +458,7 @@ page {
 }
 
 .box_18 {
-    width: 100%;
+    width: 400rpx;
     /* height: 36rpx; */
     flex-direction: row;
     align-items: center;
@@ -509,6 +509,8 @@ page {
 }
 
 .text-wrapper_9 {
+    position: absolute;
+    right: 0;
     display: flex;
     width: 280rpx;
     overflow: hidden;
@@ -1341,7 +1343,7 @@ page {
     min-width: 302rpx;
     flex: 1;
     overflow-x: scroll;
-    padding: 10rpx 0 0;
+
     box-sizing: border-box;
     margin-left: 16rpx;
     font-size: 24rpx;

subpages/addResi/pages/addResi/addResi.wxml

@@ -156,7 +156,7 @@
     </view>
     <view class="house_btn">
         <button bind:tap="addHouse">+</button>
-        <button bind:tap="delHouse" data-indexP="{{indexP}}" wx:if="{{form.resideInfoDtos.length>1}}"></button>
+        <button bind:tap="delHouse" data-indexP="{{indexP}}" wx:if="{{form.resideInfoDtos.length>1}}">-</button>
       </view>
   </view>
 

subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml

@@ -10,7 +10,7 @@
                     <view class="field-text">所属组织</view>
                   </view>
                   <view class="value-dl" bind:tap="showPicker">
-                    <view class="{{agencyName?'di-name':'di-name1'}}">{{agencyName?agencyName:'请选择-'}}</view>
+                    <view class="{{agencyName?'di-name':'di-name1'}}">{{agencyName?agencyName:'请选择'}}</view>
               
                     <image class="di-but" src="../../../../../images/right.png" mode="aspectFit" />
                   </view>
@@ -106,7 +106,7 @@
                     <view class="field-text">{{tabVal === '1'?'需求时间':'发生时间'}}</view>
                   </view>
                   <view class="value-dl" bind:tap="showTimePicker">
-                    <view class="di-name">{{showTime?showTime:'请选择'}}</view>
+                    <view class="{{agencyName?'di-name':'di-name1'}}">{{showTime?showTime:'请选择'}}</view>
                     <image class="di-but" src="../../../../../images/right.png" mode="aspectFit" />
                   </view>
             </view>
@@ -136,7 +136,7 @@
                     <view class="field-text" >{{tabVal === '1'?'需求人':'联系人'}}</view>
                   </view>
                     <navigator hover-class="backC" class="value-dl"  url="/subpages/demandCheck/pages/dissatisfied/searchResi/searchResi" >
-                      <view class="di-name" > 
+                      <view class="{{resiName?'di-name':'di-name1'}}" > 
                       {{resiName?resiName:'请选择'}}
                       </view>
                      <image class="di-but" src="../../../../../images/right.png" mode="aspectFit" />
@@ -145,7 +145,7 @@
             <view class="item">
                   <view class="field">
                     <text class="must">*</text>
-                    <view class="field-text">联系电话</view>
+                    <view  class="field-text">联系电话</view>
                   </view>
                   <view hover-class="backC" class="value-dl" >
                       <!-- <view class="di-name" > 

subpages/residentCategory/pages/residentCategory/residentCategory.wxml

@@ -14,7 +14,7 @@
   <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{lowerThreshold}}" bindscrolltolower="onScrollToLower">
   <view class="form_item" wx:for="{{waitList}}" :wx:key="{{index}}" bind:tap="toResiDetail" data-resiId="{{item.resiId}}">
   <view class="updata1">       <view class="box_18">
-                   <view style="display: flex;align-items: center;">
+                   <view style="display: flex;align-items: center; width: 400rpx;">
                     <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="" />

subpages/residentCategory/pages/residentCategory/residentCategory.wxss

@@ -492,8 +492,12 @@ page{
   display: flex;
   margin: 20rpx 0 0 0;
 }
-
+.van-ellipsis{
+  font-size: 32rpx;
+}
 .text-wrapper_9 {
+  position: absolute;
+  right: 20rpx;
   display: flex;
   width: 275rpx;
   overflow-wrap: break-word;

subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss

@@ -55,6 +55,8 @@ page{
   line-height: 52rpx;
 }
 .another_class{
+  width: 200rpx;
+  text-overflow: ellipsis;
   overflow-wrap: break-word;
   color: rgb(0, 0, 0);
   font-size: 30rpx;
@@ -63,6 +65,7 @@ page{
   text-align: left;
   white-space: nowrap;
   line-height: 52rpx;
+  overflow: hidden
 }
 .card_two{
   display: flex;

subpages/searchResult/pages/resiInfo/resiInfo.wxss

@@ -40,6 +40,7 @@ page {
 .card .title {
   position: relative;
   font-size: 34rpx;
+  font-weight: 600;
 }
 
 .card .title::after {

subpages/securityCheck/pages/securityCheck.js

@@ -2,11 +2,10 @@
 import {securityCheckk} from "../../../utils/api";
 Page({
     data: {
+      active:0,
       pageNo: 1,
-      pageSize:3,
+      pageSize:20,
       id: 0,
-      waitingCheckStyle: "color: #1974ec;border-bottom: 2px solid blue;",
-      qualifiedStyle: "",
       marsi:[
       //   
     ],
@@ -51,7 +50,9 @@ getList() {
     pageSize: this.data.pageSize,
     checkResultFlag: this.data.checkResultFlag
   }).then(({ data }) => {
+   
     data.list.forEach(item => {
+      console.log(item);
       if (item.hiddenDangeList) {
         if (item.hiddenDangeList.findIndex(itemC => itemC.hazardStatus === 2) === -1) {
           item.status = true;
@@ -71,6 +72,7 @@ getList() {
         nodata: true
       });
     }
+    console.log(this.data.flag1Array);
     if (this.data.flag1Array.length === 0) {
       this.setData({
         loadMoreVisible: false,
@@ -104,26 +106,26 @@ getList() {
       })
   },
   toggleColor(e) {
-    let value = e.currentTarget.dataset.value; // 获取点击选项的值
-    if (value === "1") {
-        this.setData({
-            waitingCheckStyle: "color: blue;border-bottom: 2px solid blue;",
-            qualifiedStyle: "",
-            flag0Array: []
-        });
-        this.data.checkResultFlag = 0
-        this.data.pageNo = 1
-        this.getList()
-    } else if (value === "2") {
-        this.setData({
-            waitingCheckStyle: "",
-            qualifiedStyle: "color: blue; border-bottom: 2px solid blue;",
-            flag1Array: []
-        });
-        this.data.checkResultFlag = 1
-        this.data.pageNo = 1
-        this.getList()
+    console.log(e.detail.index);
+    const let1 =e.detail.index
+    if (e.detail.index==0) {
+      this.setData({
+        checkResultFlag:let1
+      })
+      this.getList()
+      console.log(this.data.checkResultFlag);
+    }
+    else{
+      this.setData({
+        checkResultFlag:let1
+      })
+      this.getList()
+      console.log(this.data.checkResultFlag);
     }
+    this.setData({
+      active:let1
+    })
+
 },
     qualifed(){
       wx.navigateTo({

subpages/securityCheck/pages/securityCheck.json

@@ -1,4 +1,7 @@
 {
-    "usingComponents": {},
+    "usingComponents": {
+      "van-tab": "@vant/weapp/tab/index",
+      "van-tabs": "@vant/weapp/tabs/index"
+    },
     "navigationBarTitleText": "安检巡查"
 }

subpages/securityCheck/pages/securityCheck.wxml

@@ -1,67 +1,66 @@
 <!--subpages/gatherInformation/pages/gatherInformation/gatherInformation.wxml-->
 <view class="page">
-<view class="search">
-  <view class="row1">
-     <view class="filter" bind:tap="toggleColor" data-value="1" style="{{waitingCheckStyle}}">
-        待复核
-    </view>
-    <view class="filter" bind:tap="toggleColor" data-value="2" style="{{qualifiedStyle}}">
-        已合格
-    </view></view>
- 
-</view>
-<view class="">
-    <view class="section_5">
-      <scroll-view scroll-y="{{true}}"  scroll-into-view="scrollToHere" wx:if="{{waitingCheckStyle}}" style="width: 100%; height: 90vh;"
-      lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
-      <view class="list_1"  wx:for="{{flag0Array}}" bind:tap="toDetails" data-flag="{{item.checkResultFlag}}" data-resiId="{{item.id}}">
-        <view class="section_1-0"  id="scrollToHere">
-        <view class="title">{{item.name}}</view>
-        <view class="title_mall">检查时间: {{item.orderDate}}</view>
-        <view  class="title_mall">检查人员:  {{item.checkPersons}}</view>
-        <view class="title_mall">{{item.status?'未整改隐患':'隐患明细'}}：
-          <text  wx:for="{{item.hiddenDangeList0}}" wx:key="index">{{index+1}}.{{item.hazardDesc}}</text>
-        </view>
-        <view wx:if="{{!item.status}}">
-                <view class="title_mall"   wx:for="{{item.hiddenDangeList2}}" wx:key="index">
-                 整改要求：{{item.hazardDesc}}
-                </view>
-        </view>
-        <view wx:if="{{item.status && item.hiddenDangeList1.length != 0}}">
-          <view class="title_mall"  >
-           已整改隐患：<text wx:for="{{item.hiddenDangeList1}}" wx:key="indexC" wx:for-index='indexC'>{{indexC+1}}.{{item.hazardDesc}} </text>
-        </view>
-        </view>
-        <view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
+  <view class="search">
+    <view class="row1">
+      <van-tabs active="{{active}}" bind:change="toggleColor " title-active-color="#3974F6" color="#3974F6" >
+        <van-tab title="待复核" title-class="custom-tab-title" > 
+           <view class="section_5">
+            <scroll-view scroll-y="{{true}}" scroll-into-view="scrollToHere" style="width: 100%; height: 90vh;" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower"> 
+           <view class="list_1" wx:for="{{flag0Array}}" bind:tap="toDetails" data-flag="{{item.checkResultFlag}}" data-resiId="{{item.id}}">
+          <view class="section_1-0" id="scrollToHere">
+            <view class="title">{{item.name}}</view>
+            <view class="title_mall">检查时间: {{item.orderDate}}</view>
+            <view class="title_mall">检查人员: {{item.checkPersons}}</view>
+            <view class="title_mall">{{item.status?'未整改隐患':'隐患明细'}}：
+              <text wx:for="{{item.hiddenDangeList0}}" wx:key="index">{{index+1}}.{{item.hazardDesc}}</text>
+            </view>
+            <view wx:if="{{!item.status}}">
+              <view class="title_mall" wx:for="{{item.hiddenDangeList2}}" wx:key="index">
+                整改要求：{{item.hazardDesc}}
+              </view>
+            </view>
+            <view wx:if="{{item.status && item.hiddenDangeList1.length != 0}}">
+              <view class="title_mall">
+                已整改隐患：<text wx:for="{{item.hiddenDangeList1}}" wx:key="indexC" wx:for-index='indexC'>{{indexC+1}}.{{item.hazardDesc}} </text>
+              </view>
+            </view>
+            <view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
+          </view>
         </view>
+          <movable-area class="movable-area">
+          <movable-view class="movable-view" direction="all" x="250" y="300">
+            <image src="../../../images/xuncha3.png" class="image-wrapper" catchtouchend="handleTap"></image>
+          </movable-view>
+        </movable-area>
+           </scroll-view> 
     </view>
-    <movable-area class="movable-area">
-        <movable-view class="movable-view" direction="all" x="250" y="300">
-          <image src="../../../images/xuncha3.png" class="image-wrapper" catchtouchend="handleTap"></image>
-        </movable-view>
-      </movable-area>
-  </scroll-view>
-
-
-  <scroll-view scroll-y="{{true}}"  scroll-into-view="scrollToHere"  wx:if="{{qualifiedStyle}}" style="width: 100%; height: 90vh;" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower"> 
-      <view class="list_1"  wx:for="{{flag1Array}}"  data-resiId="{{item.id}}" bind:tap="toDetails" data-flag="{{item.checkResultFlag}}">
-        <view class="section_1-0"  id="scrollToHere" >
-        <view class="title">{{item.name}}</view>
-        <view class="title_mall">检查时间: {{item.createdTime}}</view>
-        <view  class="title_mall">检查人员:  {{item.checkPersons}}</view>
-        <view  class="title_mall">检查结论:  合格</view>
+        </van-tab>
+        <van-tab title="已合格"> 
+          <view class="section_5">
+      <scroll-view scroll-y="{{true}}" scroll-into-view="scrollToHere"style="width: 100%; height: 90vh;" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
+        <view class="list_1" wx:for="{{flag1Array}}" data-resiId="{{item.id}}" bind:tap="toDetails" data-flag="{{item.checkResultFlag}}">
+          <view class="section_1-0" id="scrollToHere">
+            <view class="title">{{item.name}}</view>
+            <view class="title_mall">检查时间: {{item.createdTime}}</view>
+            <view class="title_mall">检查人员: {{item.checkPersons}}</view>
+            <view class="title_mall">检查结论: 合格</view>
 
             <view class="title_mall">合格时间: {{item.orderDate}}</view>
+          </view>
         </view>
-    </view>
-      <movable-area class="movable-area">
-        <movable-view class="movable-view"  direction="all" x="250" y="300">
-          <image src="../../../images/xuncha.png" class="image-wrapper" catchtouchend="handleTap"></image>
-        </movable-view>
-      </movable-area>
+        <movable-area class="movable-area">
+          <movable-view class="movable-view" direction="all" x="250" y="300">
+            <image src="../../../images/xuncha3.png" class="image-wrapper" catchtouchend="handleTap"></image>
+          </movable-view>
+        </movable-area>
 
 
-  </scroll-view>
+      </scroll-view>
+    </view>
+        </van-tab>
+      </van-tabs>
+    </view>
   </view>
-</view>
+    
+
 </view>

subpages/securityCheck/pages/securityCheck.wxss

@@ -9,16 +9,14 @@ page{
     /* 按照行排序 */
     flex-direction: column;
 }
+.custom-tab-title .van-tab__title {
+  font-size: 32rpx;
+}
 .search{
-  height: 110rpx;
   width: 100%;
-  padding:0 22rpx;
   box-sizing: border-box;
-  background-color: #fff;
-  display: flex;
   align-items: center;
   /* justify-content: space-between; */
-  padding-top: 20rpx;
   box-sizing: border-box;
   justify-content: center;
 }
@@ -28,8 +26,6 @@ page{
   margin-right: 60rpx;
 }
 .row1{
-  display: flex;
-  flex-direction: row;
   font-size: 30rpx
 }
 .box_2 {
@@ -53,11 +49,11 @@ page{
   overflow-y: auto; 
 } */
 .section_5 {
-  width: 100%;
   height: 1395rpx;
   display: flex;
   flex-direction: column;
   overflow: hidden; 
+  padding: 20rpx;
 }
 .content_1{
   display: flex;
@@ -108,19 +104,20 @@ page{
   margin-left: 332rpx;
 }
 .list_1 {
-  /* width: 710rpx; */
+  width: 700rpx;
   /* height: 603rpx; */
   /* display: flex; */
   /* flex-direction: column; */
   /* justify-content: space-between; */
-  margin: 20rpx 0 0 20rpx;
+  display: flex;
   /* width: 100%; */
+  margin-bottom: 20rpx;
 }
 .section_1-0 {
   background-color: rgba(255,255,255,1.000000);
   border-radius: 20rpx;
   /* height: 410rpx; */
-  /* width: 710rpx; */
+  width: 710rpx;
   display: flex;
   flex-direction: column;
   padding-bottom: 10px; 
@@ -186,6 +183,7 @@ margin-left: 30rpx;
 .image-wrapper{
   width: 190rpx;
   height: 190rpx; 
+
 }