diff --git a/pages/complaintList/complaintList.js b/pages/complaintList/complaintList.js
index 23092b2..ad584a7 100644
--- a/pages/complaintList/complaintList.js
+++ b/pages/complaintList/complaintList.js
@@ -4,40 +4,8 @@ const constant = context.constant;
 
 Page({
   data: {
-    tableData: [{
-      "complaintId": "882019110351910002",
-      "complaintName": "测试工作流",
-      "context": "测试工作流",
-      "roomId": "752019100965690010",
-      "state": "10001",
-      "stateName": "处理中",
-      "storeId": "402019032924930007",
-      "tel": "17797173945",
-      "typeCd": "809001",
-      "typeCdName": "投诉"
-    }, {
-      "complaintId": "882019110394400002",
-      "complaintName": "测试工作流",
-      "context": "测试工作流",
-      "roomId": "752019100758260005",
-      "state": "10001",
-      "stateName": "处理中",
-      "storeId": "402019032924930007",
-      "tel": "18909874444",
-      "typeCd": "809001",
-      "typeCdName": "投诉"
-    }, {
-      "complaintId": "882019110312520003",
-      "complaintName": "吴学文",
-      "context": "测试工作流",
-      "roomId": "752019102597030030",
-      "state": "10001",
-      "stateName": "处理中",
-      "storeId": "402019032924930007",
-      "tel": "18909782345",
-      "typeCd": "809001",
-      "typeCdName": "投诉"
-    }],
+    tableData: [],
+    active:"10001",
     page: 1,
     totalPage: 0,
     loading: false
@@ -50,6 +18,7 @@ Page({
     let that = this;
   },
   getTable:function(){
+    let that = this;
     context.getRooms().then(res=>{
       console.log(res,898989);
       context.request({
@@ -58,7 +27,7 @@ Page({
         method: "GET",
         // data: data,
         data: {
-          // state: 10001,
+          state: that.data.active,
           roomId: res.data.rooms[0].roomId,
           page: 1,
           row: 10,
@@ -67,6 +36,9 @@ Page({
         success: function (res) {
           if (res.statusCode == 200) {
             console.log(res, 88888888888);
+            that.setData({
+              tableData: res.data.complaints
+            })
           }
         },
         fail: function (req) {
@@ -105,6 +77,14 @@ Page({
   //     })
   //   })
   // },
+  onChange(e){
+    console.log(e.detail.name);
+    this.setData({
+      active: e.detail.name,
+      tableData:[]
+    })
+    this.getTable();
+  },
   goAdd: function (e) {
     wx.navigateTo({
       url: "/pages/complaint/complaint"
@@ -112,7 +92,7 @@ Page({
   },
   gotoDetail: function (e) {
     wx.navigateTo({
-      url: "/pages/repairList/detail/detail?item=" + JSON.stringify(e.currentTarget.dataset.item)
+      url: "/pages/complaint/complaint?row=" + JSON.stringify(e.currentTarget.dataset.item)
     })
   },
   onPullDownRefresh: function () {
diff --git a/pages/complaintList/complaintList.wxml b/pages/complaintList/complaintList.wxml
index 6b235a2..d69984e 100644
--- a/pages/complaintList/complaintList.wxml
+++ b/pages/complaintList/complaintList.wxml
@@ -4,40 +4,40 @@
   </view> -->
 
   <van-tabs active="{{ active }}" bind:change="onChange">
-    <van-tab title="正在处理">
-      <view wx:for="{{tableData}}" wx:for-index="idx" wx:for-item="item" class="notice" data-item="{{item}}" bindtap="gotoDetail">
+    <van-tab title="正在处理" name="10001">
+      <view wx:for="{{tableData}}" wx:for-index="idx" wx:for-item="item" class="notice" data-item="{{item}}">
         <view class="title">
           <view>{{item.complaintName}}</view>
           <view>{{item.tel}}</view>
         </view>
         <view class="main">
-          <view>
-            <view class="text"> 状态: {{item.stateName}}</view>
-            <view class="text"> 房间: {{item.roomId}}</view>
+          <view class="main_left">
+            <view class="text"> 房间: {{item.floorNum + "号楼" + item.unitNum + "单元" + item.roomNum + "室"}}</view>
             <view class="text"> 类型: {{item.typeCdName}}</view>
+            <view class="text"> 状态: {{item.stateName}}</view>
           </view>
-          <view>
-            <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">修改</button>
-            <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">删除</button>
+          <view class="main_right">
+            <!-- <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">修改</button> -->
+            <!-- <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">删除</button> -->
           </view>
         </view>
       </view>
     </van-tab>
-    <van-tab title="处理完成">
-      <view wx:for="{{tableData}}" wx:for-index="idx" wx:for-item="item" class="notice" data-item="{{item}}" bindtap="gotoDetail">
+    <van-tab title="处理完成" name="10002">
+       <view wx:for="{{tableData}}" wx:for-index="idx" wx:for-item="item" class="notice" data-item="{{item}}">
         <view class="title">
           <view>{{item.complaintName}}</view>
           <view>{{item.tel}}</view>
         </view>
         <view class="main">
-          <view>
-            <view class="text"> 状态: {{item.stateName}}</view>
-            <view class="text"> 房间: {{item.roomId}}</view>
+          <view class="main_left">
+            <view class="text"> 房间: {{item.floorNum + "号楼" + item.unitNum + "单元" + item.roomNum + "室"}}</view>
             <view class="text"> 类型: {{item.typeCdName}}</view>
+            <view class="text"> 状态: {{item.stateName}}</view>
           </view>
-          <view>
-            <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">修改</button>
-            <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">删除</button>
+          <view class="main_right">
+            <!-- <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">修改</button>
+            <button class="button" size="mini" type="default" catchtap="gotoDetail" data-item="{{item}}">删除</button> -->
           </view>
         </view>
       </view>
diff --git a/pages/complaintList/complaintList.wxss b/pages/complaintList/complaintList.wxss
index a151110..f6b4b54 100644
--- a/pages/complaintList/complaintList.wxss
+++ b/pages/complaintList/complaintList.wxss
@@ -28,7 +28,16 @@
   font-size: 30rpx;
 }
 .main{
-  display: flex;
+  /* display: flex;
   justify-content: space-between;
-  align-items: flex-end;
+  align-items: flex-end; */
+  position: relative;
+}
+.main_right{
+  position: absolute;
+  right: 0px;
+  bottom: 0px;
+}
+.button{
+  margin-right: 10px;
 }