|
|
|
|
@ -22,13 +22,13 @@ |
|
|
|
|
<van-swipe-item> |
|
|
|
|
<van-calendar class="can_box" ref="calendar" first-day-of-week="1" v-model="show" |
|
|
|
|
@confirm="onConfirm" :poppable="false" :show-mark="false" :show-title="false" |
|
|
|
|
:show-subtitle="false" :show-confirm="false" :min-date="minDate" :max-date="maxDate" |
|
|
|
|
:show-confirm="false" :min-date="minDate" :max-date="maxDate" |
|
|
|
|
:formatter="formatter" :default-date="new Date(selectDate)" /> |
|
|
|
|
</van-swipe-item> |
|
|
|
|
<van-swipe-item> |
|
|
|
|
<van-calendar class="can_box" ref="calendar1" first-day-of-week="1" v-model="show" |
|
|
|
|
@confirm="onConfirm1" :poppable="false" :show-mark="false" :show-title="false" |
|
|
|
|
:show-subtitle="false" :show-confirm="false" :min-date="minDate1" :max-date="maxDate1" |
|
|
|
|
:show-confirm="false" :min-date="minDate1" :max-date="maxDate1" |
|
|
|
|
:formatter="formatter1" :default-date="new Date(selectDate)" /> |
|
|
|
|
</van-swipe-item> |
|
|
|
|
</van-swipe> |
|
|
|
|
@ -120,10 +120,8 @@ export default { |
|
|
|
|
let year = new Date().getFullYear(); |
|
|
|
|
let month = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1; //当前月份 |
|
|
|
|
let month1 = parseInt(month) + 1 < 10 ? '0' + (parseInt(month) + 1) : parseInt(month) + 1; //当前月份的下一月份 |
|
|
|
|
console.log(month1) |
|
|
|
|
let now = new Date(); |
|
|
|
|
this.yesterDay = dateFormat(new Date(now.setDate(now.getDate() - 1)),'yyyy/MM/dd') ; |
|
|
|
|
|
|
|
|
|
this.yesterDay = dateFormat(new Date(now.setDate(now.getDate() - 1)),'yyyy/MM/dd'); |
|
|
|
|
let day1 = year + '-' + month + '-' + this.today; |
|
|
|
|
this.selectDate = year + '/' + month + '/' + this.today; |
|
|
|
|
this.weekArr = this.getWeekTime(day1) |
|
|
|
|
@ -695,6 +693,10 @@ export default { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
::v-deep { |
|
|
|
|
.van-calendar__header-subtitle{ |
|
|
|
|
font-size: 0.32rem; |
|
|
|
|
// margin-top: -0.5rem; |
|
|
|
|
} |
|
|
|
|
.van-calendar__header { |
|
|
|
|
box-shadow: none !important; |
|
|
|
|
} |
|
|
|
|
|