Merge branch 'v1.1' into dev

subpages/searchResult/pages/searchResult/searchResult.js

@@ -1,5 +1,5 @@
 // subpages/searchResult/pages/searchResult/searchResult.js
-import  {getCommunityHouse,getResidentBaseInfo} from "../../../../utils/api"
+import  {getCommunityHouse,getResidentBaseInfoPage} from "../../../../utils/api"
 const app = getApp()
 Page({
 
@@ -91,12 +91,12 @@ Page({
             loadMoreType: "more",
           })
         let parm ={
-            searchKey:this.data.keyWord,
+            name:this.data.keyWord,
             pageSize:this.data.pageSize,
             pageNo:this.data.pageNo
         }
         if(this.data.type == 'resi'){
-            getResidentBaseInfo(parm).then(res=>{
+          getResidentBaseInfoPage(parm).then(res=>{
                 this.setData({
                     loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
                     tableData: this.data.tableData.concat(res.data.list),