diff --git a/pages/pay/detail.js b/pages/pay/detail.js index 56cb248..9bbe7af 100644 --- a/pages/pay/detail.js +++ b/pages/pay/detail.js @@ -83,6 +83,14 @@ Page({ }) } }) + // 转账状态 + UTIL.httpRequest(API.URL_GET_GETDICTTYPE + 'transfer_status', {method:'GET'}, { + success: (res) => { + that.setData({ + transferStatusOptions:res.data, + }) + } + }) // 获取合同信息列表 UTIL.httpRequest(API.URL_GET_CONTRACTIONLIST , {method:'GET'}, { success: (res) => { @@ -123,8 +131,10 @@ Page({ res.data.transfers[index].num = UTIL.convertToChinaNum(index+1), res.data.transfers[index].expenditureAmount = parseFloat(res.data.transfers[index].expenditureAmount).toFixed(2) res.data.transfers[index].showTitle = false; + res.data.transfers[index].activeName = ''; res.data.transfers[index].payeeList.forEach( (response,i) => { res.data.transfers[index].payeeList[i].bankTypeText = UTIL.getTransform(response.bankType,that.data.bankTypeOptions); + res.data.transfers[index].payeeList[i].transferStatusText = UTIL.getTransform(response.transferStatus,that.data.transferStatusOptions); }) console.log(res.data.transfers[index].capitalExpenditureType); if(res.data.transfers[index].capitalExpenditureType == 2){ @@ -281,6 +291,12 @@ Page({ + }, + onChangePayee(event) { + console.log(event); + this.setData({ + ["form.transfers["+event.currentTarget.dataset.index+"].activeName"]:event.detail + }); }, goPayee(event){ wx.navigateTo({ diff --git a/pages/pay/detail.wxml b/pages/pay/detail.wxml index 5da3b58..3c77c2a 100644 --- a/pages/pay/detail.wxml +++ b/pages/pay/detail.wxml @@ -160,12 +160,13 @@ - + + - 查看更多 + + 查看更多 diff --git a/pages/pay/payee/payee.js b/pages/pay/payee/payee.js index 24e7e5e..5db64b0 100644 --- a/pages/pay/payee/payee.js +++ b/pages/pay/payee/payee.js @@ -1,6 +1,6 @@ // pages/pay/payee/payee.js -import * as UTIL from '../../../../../utils/util.js'; -import * as API from '../../../../../utils/API.js'; +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; const app = getApp(); Page({ @@ -10,14 +10,40 @@ Page({ data: { isIPX: app.globalData.isIPX, activeName:'', - value:'123', - list:{} + value:'', + list:{}, + array:{}, + checked:false }, onChange(event) { this.setData({ activeName: event.detail, }); }, + onChangeCheck(event) { + var that = this ; + this.setData({ + checked: !that.data.checked, + }); + + if(that.data.checked){ + let array = []; + for (let i = 0; i < that.data.list.length; i++) { + const element = that.data.list[i]; + if(element.transferStatus == '6'){ + array.push(element) + } + } + that.setData({ + array:array + }) + }else{ + that.setData({ + array:that.data.list + }) + } + + }, /** * 生命周期函数--监听页面加载 */ @@ -26,6 +52,7 @@ Page({ this.setData({ list: JSON.parse(options.options), + array: JSON.parse(options.options), }); }, diff --git a/pages/pay/payee/payee.wxml b/pages/pay/payee/payee.wxml index 143d2ca..ba1a6a1 100644 --- a/pages/pay/payee/payee.wxml +++ b/pages/pay/payee/payee.wxml @@ -12,15 +12,15 @@ clearable bind:change="goSearch" /> - - + + 仅显示失效 - + ¥{{ item.incomeAmount }} @@ -34,8 +34,8 @@ - + + diff --git a/project.private.config.json b/project.private.config.json index 6e5a476..387b6a8 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -1,6 +1,6 @@ { "setting": { - "compileHotReLoad": true + "compileHotReLoad": false }, "condition": { "miniprogram": {