diff --git a/pages/electricQuery/index.js b/pages/electricQuery/index.js index afcffc0..7a0375d 100644 --- a/pages/electricQuery/index.js +++ b/pages/electricQuery/index.js @@ -77,8 +77,20 @@ Page({ this.init() }, async init() { - const { queryType, timeType, meterId } = this.data; - const { code, message, data } = await getElectricityList({ type: queryType, meter: meterId, time: timeType }) + const { queryType, timeType, meterId, year, yearMonth, yearMonthDay } = this.data; + let time; + switch(timeType) { + case 1: + time = yearMonth; + break; + case 2: + time = year; + break; + default: + time = yearMonthDay; + break; + } + const { code, message, data } = await getElectricityList({ type: queryType, meter: meterId, time: time }) this.setData({ list: data }) }, async getReadingList() { diff --git a/pages/electricQuery/index.wxml b/pages/electricQuery/index.wxml index 36689f2..de2f2cd 100644 --- a/pages/electricQuery/index.wxml +++ b/pages/electricQuery/index.wxml @@ -80,7 +80,7 @@ - +