From a4697a3973d29590474666cf3b32d4e776c74821 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Sat, 1 Dec 2018 17:24:37 +0800 Subject: [PATCH] . --- .../statementOfAccount/statementOfAccount.js | 132 +++--------------- .../statementOfAccount.wxml | 13 +- .../statementOfAccount.wxss | 2 +- 3 files changed, 28 insertions(+), 119 deletions(-) diff --git a/pages/statementOfAccount/statementOfAccount.js b/pages/statementOfAccount/statementOfAccount.js index 007d7b9..5f8090e 100644 --- a/pages/statementOfAccount/statementOfAccount.js +++ b/pages/statementOfAccount/statementOfAccount.js @@ -9,58 +9,42 @@ var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/AccountBalanceRpc/Get Page({ data: { - dates: new Date().getFullYear() + '-' + (new Date().getMonth() + 1), - list:[{ - Detail:[], - }], + dates: new Date().getFullYear() + '-' + (new Date().getMonth() + 1) }, - - bindDateChange: function (e) { + + bindDateChange: function(e) { this.setData({ - dates: e.detail.value, - list: [{ - Detail: [], - },], - }) - var year=this.data.dates.split('-')[0]; + dates: e.detail.value + }) + var year = this.data.dates.split('-')[0]; var month = this.data.dates.split('-')[1]; var i1 = parseInt(year) var i2 = parseInt(month) - var that=this; pageindex = 0; - var params = [i1, i2, pageindex,pagesize]; - this.getBalanceList(that, params); + var params = [i1, i2, pageindex, pagesize]; + this.getBalanceList(params, true); }, //滑动到底部加载 - addOtherTenOrder: function (event) { - var that = this; + addOtherTenOrder: function(event) { pageindex = pageindex + 1; var year = this.data.dates.split('-')[0]; var month = this.data.dates.split('-')[1]; var params = [year, month, pageindex, pagesize]; - this.getBalanceList(that, params); + this.getBalanceList(params, false); }, - onLoad: function (options) { - this.setData({ - list: [ - { - Detail:[], - }, - ], - }); - var that = this; + onLoad: function(options) { pageindex = 0; var year = this.data.dates.split('-')[0]; var month = this.data.dates.split('-')[1]; var params = [year, month, pageindex, pagesize]; - this.getBalanceList(that, params); + this.getBalanceList(params, true); }, - getBalanceList : function (that,params) { - var reslut = []; - network.requestLoading(method, params, function (res) { + getBalanceList: function(params, clear) { + let that = this; + network.requestLoading(method, params, function(res) { var array = JSON.parse(res.result); if (array.length <= 0) { wx.showToast({ @@ -71,86 +55,16 @@ Page({ } return; } - for (var i = 0; i < array.length; i++) { - array[i].Date = timechage.formatTimeTwo(array[i].Date.substring(6, 19), "Y/M/D"); - } - let arrLast = that.data.list.concat(array); - + for (var i = 0; i < array.length; i++) { + array[i].Date = timechage.formatTimeTwo(array[i].Date.substring(6, 19), "Y/M/D"); + } + let result = array; + if (!clear) + result = that.data.list.concat(array); + that.setData({ - list: arrLast, - // detailArr: arrLast.Detail + list: result, }) }) }, - - - /* - touchS: function (e) { - if (e.touches.length == 1) { - this.setData({ - //设置触摸起始点水平方向位置 - startX: e.touches[0].clientX - }); - } - }, - touchM: function (e) { - if (e.touches.length == 1) { - //手指移动时水平方向位置 - var moveX = e.touches[0].clientX; - //手指起始点位置与移动期间的差值 - var disX = this.data.startX - moveX; - var delBtnWidth = this.data.delBtnWidth; - var txtStyle = ""; - if (disX == 0 || disX < 0) {//如果移动距离小于等于0，说明向右滑动，文本层位置不变 - txtStyle = "left:0px"; - } else if (disX > 0) {//移动距离大于0，文本层left值等于手指移动距离 - txtStyle = "left:-" + disX + "px"; - if (disX >= delBtnWidth) { - //控制手指移动距离最大值为删除按钮的宽度 - txtStyle = "left:-" + delBtnWidth + "px"; - } - } - //获取手指触摸的是哪一项 - var index = e.currentTarget.dataset.index; - var list = this.data.list; - list[index].txtStyle = txtStyle; - //更新列表的状态 - this.setData({ - list: list - }); - } - }, - touchE: function (e) { - if (e.changedTouches.length == 1) { - //手指移动结束后水平位置 - var endX = e.changedTouches[0].clientX; - //触摸开始与结束，手指移动的距离 - var disX = this.data.startX - endX; - var delBtnWidth = this.data.delBtnWidth; - //如果距离小于删除按钮的1/2，不显示删除按钮 - var txtStyle = disX > delBtnWidth / 2 ? "left:-" + delBtnWidth + "px" : "left:0px"; - //获取手指触摸的是哪一项 - var index = e.currentTarget.dataset.index; - var list = this.data.list; - list[index].txtStyle = txtStyle; - //更新列表的状态 - this.setData({ - list: list - }); - } - }, - //点击删除按钮事件 - delItem: function (e) { - //获取列表中要删除项的下标 - var index = e.currentTarget.dataset.index; - var list = this.data.list; - //移除列表中下标为index的项 - list.splice(index, 1); - //更新列表的状态 - this.setData({ - list: list - }); - }, -*/ - }) \ No newline at end of file diff --git a/pages/statementOfAccount/statementOfAccount.wxml b/pages/statementOfAccount/statementOfAccount.wxml index 9b37b41..57b1e5b 100644 --- a/pages/statementOfAccount/statementOfAccount.wxml +++ b/pages/statementOfAccount/statementOfAccount.wxml @@ -7,9 +7,9 @@ - + - + 日期:{{item.Date}} 余额:{{item.Balance}} @@ -22,7 +22,7 @@ - + {{detailItem.BillType}} {{detailItem.ID}} @@ -31,10 +31,5 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/statementOfAccount/statementOfAccount.wxss b/pages/statementOfAccount/statementOfAccount.wxss index 21b2031..c6d37b1 100644 --- a/pages/statementOfAccount/statementOfAccount.wxss +++ b/pages/statementOfAccount/statementOfAccount.wxss @@ -22,7 +22,7 @@ page{ .listContainer { margin-top: 10px; - height: calc(100% - 50px); + height: calc(100%-50px); display: flex; flex-direction: column; }