Merge branch 'work_tab_bar' into data-page

pages/message/message.js

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

pages/message/message.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

pages/message/message.wxml

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

pages/message/message.wxss

@@ -0,0 +1 @@
+/* pages/message/message.wxss */

pages/resiAndHouse/resiAndHouse.js

@@ -29,6 +29,7 @@ Page({
         pageNo:1,
         pageSize:10,
         lowerThreshold:'10',
+        cascaderValue:'同德路社区居委会',
         loadMoreVisible:false,
         loadMoreType: "none",
         selectVale:'resi',
@@ -135,8 +136,11 @@ Page({
         // }
         api.getAgencygridtree().then(res => {
             this.setData({
-                angencyList: [res.data]
+                angencyList: [res.data],
+         
             })
+            console.log('zuzhishu',angencyList)
+            
         }).catch(err => {
             console.log(err);
         })
@@ -181,7 +185,7 @@ Page({
     getAllOrgCategoryCount(){
         let parm ={
             residentInfo:this.data.keyWord,
-            agencyId: this.data.agencyId,
+            agencyId: this.data.searchOrgIdPath,
             orgId:'e723c89ee5ed0cc382576833e7c6a220',
             level:'community'
         }
@@ -204,14 +208,23 @@ Page({
           })
     },
     onFinish(e){
-      const selectedValues = e.detail
-      
+      const selectedValues = e.detail.type
       console.log("123",selectedValues)
       this.setData({
-        angencyName:selectedValues.selectedOptions.map(item=>item.agencyName).join(","),
-        showCascader: false 
+        cascaderValue:selectedValues,
+        showAngenCascader: false 
       });
-        console.log('123121',e.detail.selectedOptions);
+      let parm={
+        searchOrgIdPath:e.detail.value,
+        searchKey:this.data.keyWord,
+        pageSize:this.data.pageSize,
+        pageNo:this.data.pageNo
+      }
+      getResidentBaseInfo(parm).then(res=>{
+        this.setData({
+          'resiList':res.data.list
+        })
+      })
     },
     onClose(){
         this.setData({
@@ -278,17 +291,18 @@ Page({
       }
       
       getResidentBaseInfo(parm).then(res=>{
-        // res.data.list = res.data.list.map(item => {
-        //   if (item.createdByName && item.createdByName.length >= 3) {
-        //     item.createdByName = item.createdByName.slice(1,3);
-        //   }
-        //   return item;
-        // });
+        res.data.resiList = res.data.resiList.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',
+          loadMoreType: res.data.resiList.length === this.data.pageSize ? 'more' : 'none',
           resiList: this.data.resiList.concat(res.data.list),
 
         })
+        if(TouchList)
           console.log(resiList)
           if (this.data.resiList.length == 0) {
               this.setData({

pages/resiAndHouse/resiAndHouse.wxml

@@ -31,7 +31,7 @@
     
     <view class="section_2">
         <view class="box_16">
-            <text lines="1" class="text_4"   wx:for="{{selectedText}}" wx:key="{{index}}">{{agencyName}}</text>
+            <text lines="1" class="text_4">{{cascaderValue}}</text>
             <view class="image-text_9">
                 <text lines="1" class="text_5" bind:tap="handelClickShowTree">切换</text>
                 <image src="../../images/swapHorizontal.png" class="image_8"></image>
@@ -102,6 +102,7 @@
     <van-cascader
     field-names="{{fieldName}}"
     wx:if="{{ showAngenCascader }}"
+
     value="{{ cascaderValue }}"
     title="请选择"
     options="{{ angencyList }}"