From 8d6ad92615820596a811d46fb2c6496abf8e8be9 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 4 Jan 2020 17:56:53 +0800 Subject: [PATCH 1/2] fee init --- pages/fee/fee.js | 8 ++++++++ pages/fee/fee.json | 1 + pages/fee/fee.wxml | 5 +++++ pages/fee/fee.wxss | 0 pages/index/index.js | 3 ++- 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pages/fee/fee.js create mode 100644 pages/fee/fee.json create mode 100644 pages/fee/fee.wxml create mode 100644 pages/fee/fee.wxss diff --git a/pages/fee/fee.js b/pages/fee/fee.js new file mode 100644 index 0000000..41fab30 --- /dev/null +++ b/pages/fee/fee.js @@ -0,0 +1,8 @@ +Page({ + data: { + items: [ + { name: "商品A",fee: 20}, + { name: "商品B",fee: 30 } + ] + } +}) \ No newline at end of file diff --git a/pages/fee/fee.json b/pages/fee/fee.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/pages/fee/fee.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/pages/fee/fee.wxml b/pages/fee/fee.wxml new file mode 100644 index 0000000..5f1330b --- /dev/null +++ b/pages/fee/fee.wxml @@ -0,0 +1,5 @@ + + + {{index}}:{{item.name}}:{{item.fee}} + + \ No newline at end of file diff --git a/pages/fee/fee.wxss b/pages/fee/fee.wxss new file mode 100644 index 0000000..e69de29 diff --git a/pages/index/index.js b/pages/index/index.js index e07d4cf..672dab3 100644 --- a/pages/index/index.js +++ b/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" From cb48ccc2a7500cbea15938b0cc396f248f8ac837 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 4 Jan 2020 18:42:16 +0800 Subject: [PATCH 2/2] fee add --- pages/fee/fee.js | 123 +++++++++++++++++++++++++++++++++++++++++++-- pages/fee/fee.json | 4 +- pages/fee/fee.wxml | 21 +++++++- pages/fee/fee.wxss | 34 +++++++++++++ 4 files changed, 175 insertions(+), 7 deletions(-) diff --git a/pages/fee/fee.js b/pages/fee/fee.js index 41fab30..23e8d99 100644 --- a/pages/fee/fee.js +++ b/pages/fee/fee.js @@ -1,8 +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: { - items: [ - { name: "商品A",fee: 20}, - { name: "商品B",fee: 30 } - ] - } + 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); + } + }) + }) + }, }) \ No newline at end of file diff --git a/pages/fee/fee.json b/pages/fee/fee.json index 9e26dfe..331ad4f 100644 --- a/pages/fee/fee.json +++ b/pages/fee/fee.json @@ -1 +1,3 @@ -{} \ No newline at end of file +{ + "enablePullDownRefresh": true +} \ No newline at end of file diff --git a/pages/fee/fee.wxml b/pages/fee/fee.wxml index 5f1330b..2b0c7df 100644 --- a/pages/fee/fee.wxml +++ b/pages/fee/fee.wxml @@ -1,5 +1,24 @@ - + + + + + {{item.fee_type_cd}} + + + + 小区ID: {{item.community_id}} + 开始时间: {{item.start_time}} + 结束时间: {{item.end_time}} + 总金额: {{item.amount}} + + + + + + + \ No newline at end of file diff --git a/pages/fee/fee.wxss b/pages/fee/fee.wxss index e69de29..a151110 100644 --- a/pages/fee/fee.wxss +++ b/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; +}