Merge branch 'master' of https://github.com/java110/WechatOwnerService

pages/fee/fee.js

@@ -0,0 +1,121 @@
+const context = require('../../context/Java110Context.js');
+
+const constant = context.constant;
+
+// Page({
+//   data: {
+//     items: [
+//       { name: "商品A",fee: 20},
+//       { name: "商品B",fee: 30 }
+//     ]
+//   }
+// })
+
+Page({
+  data: {
+    tableData: [{
+      "fee_type_cd  ": "物业费",
+      "community_id": "双流小区",
+      "start_time": "2019-10",
+      "end_time": "2019-12",
+      "amount": "200"
+    }, {
+        "fee_type_cd  ": "停车费",
+        "community_id": "双流小区",
+        "start_time": "2019-06",
+        "end_time": "2019-07",
+        "amount": "20"
+    }, {
+        "fee_type_cd  ": "物业费",
+        "community_id": "山上小区",
+        "start_time": "2019-09",
+        "end_time": "2019-11",
+        "amount": "100"
+    }],
+    page: 1,
+    totalPage: 0,
+    loading: false
+  },
+  onLoad: function () {
+    this.getTable(1);
+  },
+
+  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
+      })
+    })
+  },
+  goAdd: function (e) {
+    wx.navigateTo({
+      url: "/pages/complaint/complaint"
+    })
+  },
+  gotoDetail: function (e) {
+    wx.navigateTo({
+      url: "/pages/repairList/detail/detail?item=" + JSON.stringify(e.currentTarget.dataset.item)
+    })
+  },
+  onPullDownRefresh: function () {
+    // 上拉刷新
+    if (!this.data.loading) {
+      this.getTable(1, true).then(() => {
+        // 处理完成后，终止下拉刷新
+        wx.stopPullDownRefresh()
+      })
+    }
+  },
+  onReachBottom: function () {
+    console.log(1, !this.data.loading, this.data.page < this.data.totalPage);
+    // 下拉触底，先判断是否有请求正在进行中
+    // 以及检查当前请求页数是不是小于数据总页数，如符合条件，则发送请求
+    if (!this.data.loading && this.data.page < this.data.totalPage) {
+      this.getTable(this.data.page + 1)
+    }
+  },
+  //封装请求
+  request: function (data) {
+    return new Promise((resolve, reject) => {
+      wx.request({
+        url: constant.url.listComplaints,
+        header: context.getHeaders(),
+        method: "GET",
+        data: data,
+        success: function (res) {
+          if (res.statusCode == 200) {
+            resolve(res);
+          }
+        },
+        fail: function (req) {
+          console.log(constant.url.listComplaints, req);
+        }
+      })
+    })
+  },
+})

pages/fee/fee.json

@@ -0,0 +1,3 @@
+{
+  "enablePullDownRefresh": true
+}

pages/fee/fee.wxml

@@ -0,0 +1,24 @@
+<!-- <view>
+  <block wx:for="{{items}}" wx:for-item="item" wx:key="index">
+    <view>{{index}}:{{item.name}}:{{item.fee}}</view>
+  </block>
+</view> -->
+<view class="user-container">
+  <view wx:for="{{tableData}}" wx:for-index="idx" wx:for-item="item" class="notice" data-item="{{item}}" bindtap="gotoDetail">
+    <view class="title">
+      <view>{{item.fee_type_cd}}</view>
+    </view>
+    <view class="main">
+      <view>
+        <view class="text"> 小区ID: {{item.community_id}}</view>
+        <view class="text"> 开始时间: {{item.start_time}}</view>
+        <view class="text"> 结束时间: {{item.end_time}}</view>
+        <view class="text"> 总金额: {{item.amount}}</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>
+    </view>
+  </view>
+</view>

pages/fee/fee.wxss

@@ -0,0 +1,34 @@
+.user-container {
+    padding: 25rpx 10rpx;
+    background-color: #F0F0F0;
+
+	/*border: 1px solid black;*/
+}
+.add_button{
+}
+.notice {
+    margin: 10rpx 7rpx;
+    padding: 25rpx;
+    background-color: #ffffff;
+    border-radius: 7rpx;
+    /* display: flex;
+    justify-content: space-between;
+    align-items: flex-end; */
+}
+.title {
+    border-bottom: 1rpx solid #dedede;
+    font-weight: 700;
+    font-size: 34rpx;
+    color: #5f5e5e;
+    display: flex;
+    justify-content: space-between;
+}
+.text{
+  padding: 4rpx 0;
+  font-size: 30rpx;
+}
+.main{
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+}

pages/index/index.js

@@ -31,7 +31,8 @@ Page({
     categoryList: {
       pageone: [{
         name: "物业费",
-        src: "/images/1.png"
+        src: "/images/1.png",
+        href: "/pages/fee/fee"
       }, {
         name: "停车费",
         src: "/images/2.png"