Merge branch 'data-page' of http://120.46.222.128:10021/elink-star/epmet-work-mp into lisu_V4.3.1

pages/index/index.js

@@ -217,7 +217,7 @@ onScrollToLower(e){
    this.clearOneMessage(e.currentTarget.dataset.item.id)
     if(e.currentTarget.dataset.item.msgType == 'resident_base_info'){
       wx.navigateTo({
-        url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.targetId}`,
+        url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.item.targetId}`,
       })
     }else if(e.currentTarget.dataset.item.msgType == 'community_house'){
       wx.navigateTo({

pages/resiAndHouse/resiAndHouse.wxml

@@ -20,7 +20,7 @@
         </view>
         <view class="inout_box">
             <image src="../../images/work/search.png" mode="" class="search_img" />
-            <input type="text" placeholder="姓名/手机/身份证" bindinput="handelBlurKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}" />
+            <input type="text" placeholder="{{selectVale === 'resi'?'姓名/手机/身份证':'小区/楼栋/单元'}}" bindinput="handelBlurKeyWord" bindblur="handelBlurKeyWord" value="{{keyWord}}" />
             <view class="btn_box" bind:tap="handelClickSearch">
                 <image src="../../images/cardIcon.png" mode="" wx:if="{{selectVale == 'resi'}}" class="OCR_img" bind:tap="handelClickToOcr" />
                 <text>搜索</text>

subpages/addhouse/pages/addhouse/addhouse.js

@@ -167,7 +167,7 @@ Page({
     getQuartersOptions(gridId){
         let parm = {
             gridId,
-            agencyId:this.data.agecyId
+            agencyId:app.globalData.user.agencyId
         }
         api.getQuartersOptions(parm).then(res=>{
             this.setData({