diff --git a/constant/UrlConstant.js b/constant/UrlConstant.js index db4bea1..61338d7 100644 --- a/constant/UrlConstant.js +++ b/constant/UrlConstant.js @@ -25,7 +25,7 @@ const queryOwnerMembers = baseUrl + 'app/owner.queryOwnerMembers'; //投诉建议列表 const listComplaints = baseUrl + 'app/complaint.listComplaints'; //添加投诉建议 -const saveComplaint = baseUrl + 'app/complaint.saveComplaint'; +const saveComplaint = baseUrl + 'app/complaint'; //查询业主房间 const queryRoomsByOwner = baseUrl + 'app/room.queryRoomsByOwner'; diff --git a/context/Java110Context.js b/context/Java110Context.js index 1179fd3..c2840e2 100644 --- a/context/Java110Context.js +++ b/context/Java110Context.js @@ -198,6 +198,7 @@ const getRooms = function() { }, success: function(res) { if (res.statusCode == 200) { + //将业主信息和房屋信息一起返回 res.data['owner'] = _owner; resolve(res); } diff --git a/pages/complaint/complaint.js b/pages/complaint/complaint.js index a12dd2d..a0a391e 100644 --- a/pages/complaint/complaint.js +++ b/pages/complaint/complaint.js @@ -25,6 +25,7 @@ Page({ userId: '', storeId: '', photos: [], + communityId:"" }, /** @@ -33,7 +34,6 @@ Page({ onLoad: function(options) { let that = this; context.getRooms().then(res=>{ - console.log(res) let arr = res.data.rooms; let roomCloums = []; let roomIdArr = []; @@ -44,7 +44,8 @@ Page({ that.setData({ roomCloums: roomCloums, roomIdArr: roomIdArr, - userId: res.data.owner.appUserId + userId: res.data.owner.appUserId, + communityId: res.data.owner.communityId }) }) }, @@ -126,7 +127,7 @@ Page({ "photos": [], "context": this.data.context, "userId": this.data.userId, - "storeId": this.data.storeId + "communityId": this.data.communityId } let _photos = this.data.photos; diff --git a/pages/complaintList/complaintList.js b/pages/complaintList/complaintList.js index 2afbec0..23092b2 100644 --- a/pages/complaintList/complaintList.js +++ b/pages/complaintList/complaintList.js @@ -49,35 +49,62 @@ Page({ onShow: function () { let that = this; }, - getTable: function (page, override) { - console.log(888888888); - let that = this; - this.setData({ - loading: true - }) - return this.request({ - storeTypeCd: '800900000003', - storeId: '402019032924930007', - userName: 'wuxw', - userId: '30518940136629616640', - complaintId: '111', - typeCd: '809002', - complaintName: '111', - page: '1', - row: '10', - communityId: '7020181217000001' - // "page": page, - // "row": 10 - }).then(res => { - console.log(res,9999999999999) - that.setData({ - tableData: override ? res.data.complaints : this.data.tableData.concat(res.data.complaints), - totalPage: res.data.records, - page: page, - loading: false + getTable:function(){ + context.getRooms().then(res=>{ + console.log(res,898989); + context.request({ + url: constant.url.listComplaints, + header: context.getHeaders(), + method: "GET", + // data: data, + data: { + // state: 10001, + roomId: res.data.rooms[0].roomId, + page: 1, + row: 10, + communityId: res.data.owner.communityId + }, + success: function (res) { + if (res.statusCode == 200) { + console.log(res, 88888888888); + } + }, + fail: function (req) { + console.log(constant.url.listComplaints, req); + } }) }) + }, + // getTable: function (page, override) { + // console.log(888888888); + // let that = this; + // this.setData({ + // loading: true + // }) + // return this.request({ + // storeTypeCd: '800900000003', + // storeId: '402019032924930007', + // userName: 'wuxw', + // userId: '30518940136629616640', + // complaintId: '111', + // typeCd: '809002', + // complaintName: '111', + // page: '1', + // row: '10', + // communityId: '7020181217000001' + // // "page": page, + // // "row": 10 + // }).then(res => { + // console.log(res,9999999999999) + // that.setData({ + // tableData: override ? res.data.complaints : this.data.tableData.concat(res.data.complaints), + // totalPage: res.data.records, + // page: page, + // loading: false + // }) + // }) + // }, goAdd: function (e) { wx.navigateTo({ url: "/pages/complaint/complaint"