From 0973c71e444247faf17fffbb577f51bdfb003349 Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Wed, 17 Jul 2024 08:58:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/addClock.vue | 11 ++++------- pages/index/currentIncome.vue | 11 ++++------- pages/index/currentPoints.vue | 11 ++++------- pages/index/currentYeji.vue | 11 ++++------- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue index 588e3e4..42c9ad5 100644 --- a/pages/index/addClock.vue +++ b/pages/index/addClock.vue @@ -212,14 +212,11 @@ let day = now.getDate(); let currentDate = year + '-' + monthJia + '-' + day; let dayEnd = new Date(now.getFullYear(), monthJia, 0).getDate(); - if(day>=1&&day<=10){ + if(day>=1&&day<=15){ this.startTime=year + '-' + monthJia + '-01'; - this.endTime=year + '-' + monthJia + '-' + 10; - }else if(day>=11&&day<=20){ - this.startTime=year + '-' + monthJia + '-' + 11; - this.endTime=year + '-' + monthJia + '-' + 20; - }else if(day>=21&&day<=dayEnd){ - this.startTime=year + '-' + monthJia + '-' + 21 + this.endTime=year + '-' + monthJia + '-' + 15; + }else if(day>=16&&day<=dayEnd){ + this.startTime=year + '-' + monthJia + '-' + 16 this.endTime=year + '-' + monthJia + '-' + dayEnd; } }, diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue index 73118f2..b9794dc 100644 --- a/pages/index/currentIncome.vue +++ b/pages/index/currentIncome.vue @@ -131,14 +131,11 @@ let day = now.getDate(); let currentDate = year + '-' + monthJia + '-' + day; let dayEnd = new Date(now.getFullYear(), monthJia, 0).getDate(); - if(day>=1&&day<=10){ + if(day>=1&&day<=15){ this.startTime=year + '-' + monthJia + '-01'; - this.endTime=year + '-' + monthJia + '-' + 10; - }else if(day>=11&&day<=20){ - this.startTime=year + '-' + monthJia + '-' + 11; - this.endTime=year + '-' + monthJia + '-' + 20; - }else if(day>=21&&day<=dayEnd){ - this.startTime=year + '-' + monthJia + '-' + 21 + this.endTime=year + '-' + monthJia + '-' + 15; + }else if(day>=16&&day<=dayEnd){ + this.startTime=year + '-' + monthJia + '-' + 16 this.endTime=year + '-' + monthJia + '-' + dayEnd; } if(!this.orderType){ diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue index 2a3623f..a73ac3c 100644 --- a/pages/index/currentPoints.vue +++ b/pages/index/currentPoints.vue @@ -243,14 +243,11 @@ let day = now.getDate(); let currentDate = year + '-' + monthJia + '-' + day; let dayEnd = new Date(now.getFullYear(), monthJia, 0).getDate(); - if(day>=1&&day<=10){ + if(day>=1&&day<=15){ this.startTime=year + '-' + monthJia + '-01'; - this.endTime=year + '-' + monthJia + '-' + 10; - }else if(day>=11&&day<=20){ - this.startTime=year + '-' + monthJia + '-' + 11; - this.endTime=year + '-' + monthJia + '-' + 20; - }else if(day>=21&&day<=dayEnd){ - this.startTime=year + '-' + monthJia + '-' + 21 + this.endTime=year + '-' + monthJia + '-' + 15; + }else if(day>=16&&day<=dayEnd){ + this.startTime=year + '-' + monthJia + '-' + 16 this.endTime=year + '-' + monthJia + '-' + dayEnd; } if(!this.orderType){ diff --git a/pages/index/currentYeji.vue b/pages/index/currentYeji.vue index 8a9ef00..3b3e47b 100644 --- a/pages/index/currentYeji.vue +++ b/pages/index/currentYeji.vue @@ -126,14 +126,11 @@ let day = now.getDate(); let currentDate = year + '-' + monthJia + '-' + day; let dayEnd = new Date(now.getFullYear(), monthJia, 0).getDate(); - if(day>=1&&day<=10){ + if(day>=1&&day<=15){ this.startTime=year + '-' + monthJia + '-01'; - this.endTime=year + '-' + monthJia + '-' + 10; - }else if(day>=11&&day<=20){ - this.startTime=year + '-' + monthJia + '-' + 11; - this.endTime=year + '-' + monthJia + '-' + 20; - }else if(day>=21&&day<=dayEnd){ - this.startTime=year + '-' + monthJia + '-' + 21 + this.endTime=year + '-' + monthJia + '-' + 15; + }else if(day>=16&&day<=dayEnd){ + this.startTime=year + '-' + monthJia + '-' + 16 this.endTime=year + '-' + monthJia + '-' + dayEnd; } if(!this.orderType){