diff --git a/api/MyBenefits/MyBenefits.js b/api/MyBenefits/MyBenefits.js index c2d6983..34e3077 100644 --- a/api/MyBenefits/MyBenefits.js +++ b/api/MyBenefits/MyBenefits.js @@ -9,9 +9,9 @@ export function personRevenue(nurseStationPersonId, monthStartTime, monthEndTime } // 个人中心 我的收益 订单列表分页 -export function personRevenueDetails(nurseStationPersonId, monthStartTime, monthEndTime) { +export function personRevenueDetails(nurseStationPersonId, monthTime, monthStartTime, monthEndTime) { return request({ - url: `/nurseApplet/personCenter/personRevenueDetails?nurseStationPersonId=${nurseStationPersonId}&&monthStartTime=${monthStartTime}&&monthEndTime=${monthEndTime}`, + url: `/nurseApplet/personCenter/personRevenueDetails?nurseStationPersonId=${nurseStationPersonId}&&monthTime=${monthTime}&&monthStartTime=${monthStartTime}&&monthEndTime=${monthEndTime}`, method: 'GET', }) } diff --git a/pages/MyBenefits/MyBenefits.vue b/pages/MyBenefits/MyBenefits.vue index 5cb5dc8..f13a4e2 100644 --- a/pages/MyBenefits/MyBenefits.vue +++ b/pages/MyBenefits/MyBenefits.vue @@ -43,7 +43,8 @@ - {{item.serviceDate}} {{item.serviceStartTime}} + + {{item.finishOrderTime}} @@ -113,6 +114,7 @@ tiemshow: false, //选择时间开关 newtime: null, //开局月份 newyear: null, //当前年份 + monthTime: null, //只选一个 monthStartTime: '', //开始时间 monthEndTime: '', //结束时间 toppricerlist: {}, //toplist @@ -121,37 +123,50 @@ }, onShow() { var that = this + that.nowtime(); const value = uni.getStorageSync('nursePersonId'); if (value) { that.nursePersonId = value that.personRevenueinfo(); that.personRevenueDetailsinfo(); } else {} - that.nowtime(); }, methods: { //收益详细 personRevenueDetailsinfo() { - personRevenueDetails(this.nursePersonId, this.monthStartTime, this.monthEndTime).then(res => { - this.Detailslist = res.data - }) + personRevenueDetails(this.nursePersonId, this.monthTime, this.monthStartTime, this.monthEndTime).then( + res => { + this.Detailslist = res.data + }) }, //我的收益 personRevenueinfo() { - personRevenue(this.nursePersonId, this.monthStartTime, this.monthEndTime).then(res => { + personRevenue(this.nursePersonId, this.monthTime, this.monthStartTime, this.monthEndTime).then(res => { this.toppricerlist = res.data }) }, - //选择时间 + //piker选择时间 timeconfirm(e) { this.tiemmask = false this.newtime = e.year + '.' + e.month - this.monthStartTime = e.year + '-' + e.month + this.monthTime = e.year + '-' + e.month + '-01' + this.personRevenueDetailsinfo(); + this.personRevenueinfo(); }, + //日历选择时间 ucalendarchange(e) { this.tiemmask = false + e.startMonth > 10 ? '' : e.startMonth = '0' + e.startMonth + e.startDay > 10 ? '' : e.startDay = '0' + e.startDay + e.endMonth > 10 ? '' : e.endMonth = '0' + e.endMonth + e.endDay > 10 ? '' : e.endDay = '0' + e.endDay this.newtime = e.startYear + '.' + e.startMonth + '.' + e.startDay + ' - ' + e.endYear + '.' + e.endMonth + '.' + e.endDay + this.monthStartTime = e.startYear + '-' + e.startMonth + '-' + e.startDay + this.monthEndTime = e.endYear + '-' + e.endMonth + '-' + e.endDay + this.monthTime = '' + this.personRevenueDetailsinfo(); + this.personRevenueinfo(); }, //time timechange(index) { @@ -171,13 +186,15 @@ month: nowDate.getMonth() + 1, //获取当前日期 }; + this.newyear = date.year //拼接 if (date.month < 10) { this.newtime = date.year + ".0" + date.month + this.monthTime = date.year + '-0' + date.month + '-01' } else { this.newtime = date.year + "." + date.month + this.monthTime = date.year + '-' + date.month + '-01' } - this.newyear = date.year }, } }