Skip to content

Y
ydLife
Commit bfcac251 by sunchao
Options

日历安装dayjs

parent f64669d8
Showing with 63 additions and 49 deletions
package-lock.json
...@@ -2749,6 +2749,11 @@ ...@@ -2749,6 +2749,11 @@
"integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8=", "integrity": "sha1-MdW16iEc9f12TNOLr50DPffhJc8=",
"dev": true "dev": true
}, },
"dayjs": {
"version": "1.8.35",
"resolved": "https://registry.npm.taobao.org/dayjs/download/dayjs-1.8.35.tgz?cache=0&sync_timestamp=1599050605311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdayjs%2Fdownload%2Fdayjs-1.8.35.tgz",
"integrity": "sha1-ZxGDePFdMWI/PuKZL1JEuIdgaIg="
},
"debug": { "debug": {
"version": "2.6.9", "version": "2.6.9",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz", "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
......
package.json
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"@angular/router": "~7.2.0", "@angular/router": "~7.2.0",
"buffer": "^5.4.3", "buffer": "^5.4.3",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"dayjs": "^1.8.35",
"html2canvas": "^1.0.0-rc.5", "html2canvas": "^1.0.0-rc.5",
"ng-zorro-antd-mobile": "^0.12.5", "ng-zorro-antd-mobile": "^0.12.5",
"rxjs": "~6.3.3", "rxjs": "~6.3.3",
......
src/app/common/life-common.service.ts
...@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; ...@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { Meta, Title } from '@angular/platform-browser'; import { Meta, Title } from '@angular/platform-browser';
import { Subject } from "rxjs/index"; import { Subject } from "rxjs/index";
import * as dayjs from 'dayjs'
declare var wx: any; declare var wx: any;
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
...@@ -232,39 +233,51 @@ export class LifeCommonService { ...@@ -232,39 +233,51 @@ export class LifeCommonService {
} }
//获取本周日期 //获取本周日期
makeDate() { makeDate(date?:any) {
var date = new Date(); const now = dayjs(date);
var year = date.getFullYear(); return this.weekArr.map((day, idx) => {
var month = date.getMonth(); return {
var week = date.getDay(); week: now.day(idx).day(),
// if(week ==0){ day: now.day(idx).date(),
// week = 7; date: now.day(idx).format('YYYY-MM-DD')
};
});
// var date = new Date();
// var year = date.getFullYear();
// var month = date.getMonth();
// var week = date.getDay();
// // if(week ==0){
// // week = 7;
// // }
// var month = month + 1;
// //获取今天是几号
// var day = date.getDate();
// // 本周内今天的前几天的数量
// var leftNum = week;
// // 本周内今天的后几天的数量
// var rightNum = 6 - week;
// // 本周内今天的前几天
// for (var i = 1; i <= leftNum; i++) {
// this.weekArr[i].week = week- i
// this.weekArr[i].day = day - i;
// this.weekArr[i]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day - i);
// }
// // 本周内今天的后几天
// for (var i = 1; i <= rightNum; i++) {
// this.weekArr[i + week].week = week + i ;
// this.weekArr[i + week].day = day + i ;
// this.weekArr[i + week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day + i);
// } // }
var month = month + 1; // // 今天
//获取今天是几号 // this.weekArr[week].week = week;
var day = date.getDate(); // this.weekArr[week].day = day;
// 本周内今天的前几天的数量 // this.weekArr[week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + day;
var leftNum = week; // this.weekArr[week].selected = true;
// 本周内今天的后几天的数量 // return this.weekArr;
var rightNum = 6 - week;
// 本周内今天的前几天
for (var i = 1; i <= leftNum; i++) {
this.weekArr[i].week = week- i
this.weekArr[i].day = day - i;
this.weekArr[i]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day - i);
}
// 本周内今天的后几天
for (var i = 1; i <= rightNum; i++) {
this.weekArr[i + week].week = week + i ;
this.weekArr[i + week].day = day + i ;
this.weekArr[i + week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + (day + i);
}
// 今天
this.weekArr[week].week = week;
this.weekArr[week].day = day;
this.weekArr[week]['date'] = year + '-' + (month>9?month:'0'+month) + '-' + day;
this.weekArr[week].selected = true;
return this.weekArr;
} }
//获取星期 //获取星期
......
src/app/my/todo-list/todo-list.component.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<ul class="week"> <ul class="week">
<li *ngFor="let weekItem of weekArr;index as i;" [ngClass]="{'selected':weekItem.selected}" (click)="selectDay(weekItem)"> <li *ngFor="let weekItem of weekArr;index as i;" [ngClass]="{'selected':weekItem.date == trackDate}" (click)="selectDay(weekItem)">
<div>{{weekItem.day}}</div> <div>{{weekItem.day}}</div>
<span>{{lifeCommonService.getWeek(weekItem.week)}}</span> <span>{{lifeCommonService.getWeek(weekItem.week)}}</span>
</li> </li>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div class="taskTime"> <div class="taskTime">
<div class="title">时间</div> <div class="title">时间</div>
<ul> <ul>
<li *ngFor="let taskTimeItem of taskTimeList">{{taskTimeItem.time}}</li> <li *ngFor="let taskTimeItem of taskTimeList" >{{taskTimeItem.time}}</li>
</ul> </ul>
</div> </div>
<div class="taskContent"> <div class="taskContent">
......
src/app/my/todo-list/todo-list.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { LifeCommonService } from '../../common/life-common.service'; import { LifeCommonService } from '../../common/life-common.service';
import {MyService} from '../my.service'; import {MyService} from '../my.service';
import * as dayjs from 'dayjs'
@Component({ @Component({
selector: 'ydlife-todo-list', selector: 'ydlife-todo-list',
...@@ -47,12 +48,9 @@ export class TodoListComponent implements OnInit { ...@@ -47,12 +48,9 @@ export class TodoListComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.weekArr = this.lifeCommonService.makeDate(); this.weekArr = this.lifeCommonService.makeDate();
for(let i=0;i<this.weekArr.length;i++){ this.trackDate = dayjs().format('YYYY-MM-DD');
if(this.weekArr[i]['selected'] == true){
this.trackDate = this.weekArr[i]['date'];
}
}
this.queryScheduleTrackList(); this.queryScheduleTrackList();
console.log(dayjs)
} }
goBack(){ goBack(){
...@@ -103,19 +101,16 @@ export class TodoListComponent implements OnInit { ...@@ -103,19 +101,16 @@ export class TodoListComponent implements OnInit {
const { startDate, endDate } = value; const { startDate, endDate } = value;
this.state = { this.state = {
...this.state, ...this.state,
...{ show: false, startDate, endDate } show: false,
startDate,
endDate
}; };
this.triggerCancel(); this.triggerCancel();
this.trackDate = this.lifeCommonService.dateFormat(startDate,"yyyy-MM-dd") this.trackDate =dayjs(startDate).format('YYYY-MM-DD');
console.log(this.trackDate)
this.queryScheduleTrackList(); this.queryScheduleTrackList();
for(let i=0;i<this.weekArr.length;i++){ this.weekArr = this.lifeCommonService.makeDate(startDate);
this.weekArr[i].selected = false; console.log(this.weekArr)
if(this.trackDate == this.weekArr[i]['date']){
this.weekArr[i]['selected'] = true;
break;
}
}
} }
queryScheduleTrackList(){ queryScheduleTrackList(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment