|
|
@ -128,7 +128,7 @@ export default { |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
computeNongliText(y, m, d) { |
|
|
|
let item = nongli.solar2lunar(y, m+1, d); |
|
|
|
let item = nongli.solar2lunar(y, m + 1, d); |
|
|
|
return item.festival || item.lunarFestival || item.Term || item.IDayCn; |
|
|
|
}, |
|
|
|
|
|
|
@ -164,8 +164,8 @@ export default { |
|
|
|
left: 0; |
|
|
|
right: 0; |
|
|
|
bottom: 0; |
|
|
|
border-left: 1px solid #eee; |
|
|
|
border-top: 1px solid #eee; |
|
|
|
border-left: 1px solid #e5e5e5; |
|
|
|
border-top: 1px solid #e5e5e5; |
|
|
|
pointer-events: none; |
|
|
|
} |
|
|
|
|
|
|
@ -178,7 +178,7 @@ export default { |
|
|
|
padding: 20px 0; |
|
|
|
font-size: 20px; |
|
|
|
font-weight: bold; |
|
|
|
background-color: #e6a23c; |
|
|
|
background-color: rgba(#ccc, 0.2); |
|
|
|
text-align: center; |
|
|
|
|
|
|
|
&::after { |
|
|
@ -189,9 +189,9 @@ export default { |
|
|
|
left: 0; |
|
|
|
right: 0; |
|
|
|
bottom: 0; |
|
|
|
border-right: 1px solid #eee; |
|
|
|
border-right: 1px solid #e5e5e5; |
|
|
|
pointer-events: none; |
|
|
|
border-bottom: 1px solid #eee; |
|
|
|
border-bottom: 1px solid #e5e5e5; |
|
|
|
} |
|
|
|
|
|
|
|
&.z-weekend { |
|
|
@ -222,8 +222,8 @@ export default { |
|
|
|
left: 0; |
|
|
|
right: 0; |
|
|
|
bottom: 0; |
|
|
|
border-right: 1px solid #eee; |
|
|
|
border-bottom: 1px solid #eee; |
|
|
|
border-right: 1px solid #e5e5e5; |
|
|
|
border-bottom: 1px solid #e5e5e5; |
|
|
|
pointer-events: none; |
|
|
|
} |
|
|
|
|
|
|
@ -235,12 +235,21 @@ export default { |
|
|
|
color: #3e8ef7; |
|
|
|
} |
|
|
|
|
|
|
|
.nongli{ |
|
|
|
.nongli { |
|
|
|
position: absolute; |
|
|
|
z-index: 0; |
|
|
|
left: 0; |
|
|
|
right: 0; |
|
|
|
text-align: center; |
|
|
|
color: #bbb; |
|
|
|
font-size: 16px; |
|
|
|
font-weight: bold; |
|
|
|
} |
|
|
|
|
|
|
|
&.z-weekend { |
|
|
|
.date { |
|
|
|
color: #ff3333; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
&.z-on { |
|
|
@ -267,12 +276,6 @@ export default { |
|
|
|
font-weight: 700; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
&.z-weekend { |
|
|
|
.date { |
|
|
|
color: #ff3333; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|