00614d72 by simon

默认提交

1 parent 2e716e32
......@@ -150,6 +150,7 @@ export default {
curData.standards = 0;
let date = index + 1;
let buildDate = Date.parse(`${year}.${month}.${date}`);
if (buildDate) {
let nowDate = new Date();
let day = buildDate.getDay();
let isWeekend = day == 0 || day == 6;
......@@ -188,9 +189,12 @@ export default {
}, curData);
result.push(curData);
}
}
// 当月1号星期几 0-6 往前塞值
let dateStr = month + '.' + '1' + '.' + year;
let firstDate = Date.parse(dateStr);
if (firstDate) {
let firstDay = Date.parse(dateStr).getDay();
// 根据星期几在前面补空格 星期日0格子,星期一1格子,星期六6格子
......@@ -198,6 +202,8 @@ export default {
result.unshift(null);
}
this.fortmatMonthData = result;
}
},
// 加/减 月份
addMonths(value) {
......@@ -372,6 +378,7 @@ export default {
fortmatMonthData.forEach((element, idx) => {
if (element) {
let curDate = `${element.year}-${element.month}-${element.date}`;
curDate = Date.parse(curDate).toString("yyyy-MM-dd"); //转成yyyy-MM-dd
if (curDate == dateValue && element.disable == true) {
disable = true;
}
......
......@@ -21,6 +21,7 @@
@extend .bb;
max-width: 450px;
min-width: 100%;
height: 320px;
border-radius: $borderRadius;
background-color: wheat;
......
......@@ -60,7 +60,6 @@
.n-item {
cursor: pointer;
min-width: 14.75rem;
}
}
......@@ -99,7 +98,8 @@
// 公共组件
.n-item {
margin-bottom: 2rem;
padding-right: .833333rem ;
// padding-right: .833333rem ;
padding-right: 3rem ;
color: #dcdddd;
&:first-child {
......
@import '@/styles/_support';
.list-container {
overflow-x: scroll;
overflow-x: auto;
padding-bottom: 2rem;
}
......@@ -107,7 +107,7 @@
padding: 0 2.75rem;
// max-height: 41.666667rem;
transition: max-height ease-out 0.3s !important;
overflow: scroll;
overflow: auto;
.data-line {
// padding: 0 2.75rem;
......