Commit bc3e96a0 by liang ce

时间为undefined bug

parent 55dcc062
...@@ -33,27 +33,27 @@ ...@@ -33,27 +33,27 @@
<view class="time {{timeStaus == '0' ? 'startTimeAction' : timeStaus == '1' ? 'endTimeAction' : 'AllTimeUnAction'}}"> <view class="time {{timeStaus == '0' ? 'startTimeAction' : timeStaus == '1' ? 'endTimeAction' : 'AllTimeUnAction'}}">
<view class="startTime" data-timeStaus="0" onTap="selectTime"> <view class="startTime" data-timeStaus="0" onTap="selectTime">
<view class="timeContainer"> <view class="timeContainer">
<view class="yearTime"> <view class="yearTime" style="{{timeStaus == '0' ? 'color: #ffffff' : ''}}">
{{time1.slice(5,7)}}月{{time1.slice(8,10)}}日 {{time1.slice(5,7)}}月{{time1.slice(8,10)}}日
</view> </view>
<view class="dayTime"> <view class="dayTime" style="{{timeStaus == '0' ? 'color: #ffffff' : ''}}">
{{time1.slice(11,16)}} {{time1.slice(11,16)}}
</view> </view>
</view> </view>
<view class="weekTime"> <view class="weekTime" style="{{timeStaus == '0' ? 'color: #ffffff' : ''}}">
{{week1}} {{week1}}
</view> </view>
</view> </view>
<view class="endTime" data-timeStaus="1" onTap="selectTime"> <view class="endTime" data-timeStaus="1" onTap="selectTime">
<view class="timeContainer"> <view class="timeContainer">
<view class="yearTime"> <view class="yearTime" style="{{timeStaus==1 ? 'color: #ffffff' : ''}}">
{{time2.slice(5,7)}}月{{time2.slice(8,10)}}日 {{time2.slice(5,7)}}月{{time2.slice(8,10)}}日
</view> </view>
<view class="dayTime"> <view class="dayTime" style="{{timeStaus==1 ? 'color: #ffffff' : ''}}">
{{time2.slice(11,16)}} {{time2.slice(11,16)}}
</view> </view>
</view> </view>
<view class="weekTime"> <view class="weekTime" style="{{timeStaus==1 ? 'color: #ffffff' : ''}}">
{{week2}} {{week2}}
</view> </view>
</view> </view>
......
...@@ -128,14 +128,16 @@ create.Page({ ...@@ -128,14 +128,16 @@ create.Page({
}, },
// 选择时间组件回调 // 选择时间组件回调
changeSelectTime(e) { changeSelectTime(e) {
console.log(e.time.substr(0,16))
let that = this let that = this
let timeStr = e.time.substr(0,16)
if (e.status === 1) { if (e.status === 1) {
var date1 = new Date(e.time); var date1 = new Date(timeStr.substr(0,16));
var weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] var weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
var w1 = weekList[date1.getDay()]; var w1 = weekList[date1.getDay()];
if (this.data.timeStaus == 0) { if (this.data.timeStaus == 0) {
if (new Date(e.time).getTime() > new Date(this.data.time2).getTime()) { if (new Date(timeStr).getTime() > new Date(this.data.time2).getTime()) {
var date = new Date(e.time); var date = new Date(timeStr);
date.setMinutes(date.getMinutes() + 30) date.setMinutes(date.getMinutes() + 30)
var y = date.getFullYear(); var y = date.getFullYear();
var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期,不足10补0 var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期,不足10补0
...@@ -144,7 +146,7 @@ create.Page({ ...@@ -144,7 +146,7 @@ create.Page({
var h = date.getHours() var h = date.getHours()
var min = date.getMinutes(); var min = date.getMinutes();
this.setData({ this.setData({
time1: `${e.time}:00`, time1: `${timeStr}:00`,
time2: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}:00`, time2: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}:00`,
isShowModal: false, isShowModal: false,
week1: w1, week1: w1,
...@@ -155,7 +157,7 @@ create.Page({ ...@@ -155,7 +157,7 @@ create.Page({
}) })
} else { } else {
this.setData({ this.setData({
time1: `${e.time}:00`, time1: `${timeStr}:00`,
isShowModal: false, isShowModal: false,
week1: w1, week1: w1,
timeStaus: '' timeStaus: ''
...@@ -164,7 +166,7 @@ create.Page({ ...@@ -164,7 +166,7 @@ create.Page({
}) })
} }
} else { } else {
if (new Date(e.time).getTime() <= new Date(this.data.time1).getTime()) { if (new Date(timeStr).getTime() <= new Date(this.data.time1).getTime()) {
dd.alert({ dd.alert({
title: '提示', title: '提示',
content: '会议结束时间不能小于等于开始时间', content: '会议结束时间不能小于等于开始时间',
...@@ -174,7 +176,7 @@ create.Page({ ...@@ -174,7 +176,7 @@ create.Page({
}); });
} else { } else {
this.setData({ this.setData({
time2: `${e.time}:00`, time2: `${timeStr}:00`,
isShowModal: false, isShowModal: false,
week2: w1, week2: w1,
timeStaus: '' timeStaus: ''
......
...@@ -39,6 +39,7 @@ page { ...@@ -39,6 +39,7 @@ page {
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
padding-top: 16rpx;
} }
.dateTime>view { .dateTime>view {
...@@ -46,7 +47,7 @@ page { ...@@ -46,7 +47,7 @@ page {
line-height: 24rpx; line-height: 24rpx;
font-weight: bolder; font-weight: bolder;
color: #191F25; color: #191F25;
/* margin-bottom: 8rpx; */ margin-bottom: 4rpx;
} }
.dateTime>text { .dateTime>text {
...@@ -83,6 +84,9 @@ page { ...@@ -83,6 +84,9 @@ page {
.NoSchedule > view:nth-of-type(1) text:nth-of-type(2) { .NoSchedule > view:nth-of-type(1) text:nth-of-type(2) {
color: #3296FA; color: #3296FA;
} }
.dataSchedule {
position: relative;
}
.dataSchedule .overdue { .dataSchedule .overdue {
background: #F6F6F6; background: #F6F6F6;
color: rgba(25, 31, 37, 0.56); color: rgba(25, 31, 37, 0.56);
...@@ -104,6 +108,9 @@ page { ...@@ -104,6 +108,9 @@ page {
height: 2rpx !important; height: 2rpx !important;
background: #F25643 !important; background: #F25643 !important;
overflow: visible !important; overflow: visible !important;
position: absolute;
left: 0;
top: -8rpx;
} }
.thisDayLine::after { .thisDayLine::after {
content: ''; content: '';
......
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
<block a:elif="{{item.type == 'today'}}"> <block a:elif="{{item.type == 'today'}}">
<view class="date"> <view class="date">
<view class="dateTime {{item.isThisDay}}"> <view class="dateTime {{item.isThisDay}}">
<view style="color"> <view style="color: rgb(50, 150, 250)">
{{item.value.week}} {{item.value.week}}
</view> </view>
<text style="color">{{item.value.day}}</text> <text style="color: rgb(50, 150, 250)">{{item.value.day}}</text>
</view> </view>
<view class="dataSchedule"> <view class="dataSchedule">
<view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view> <view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view>
......
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