Skip to content

I
integral-mall
Commit f3304b4a by damodmg
Options

修改时间限制重叠问题

parent 766a86c3
Showing with 64 additions and 30 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.bfc34155e8425524da07b8a0e8b57023.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.14274a2a4017f0919863.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.5b792b0c0cd51774f90b011401f7ca7c.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.2c5b189fce7bb13e2301.js></script></body></html>
\ No newline at end of file
dist/static/js/app.14274a2a4017f0919863.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.2c5b189fce7bb13e2301.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/setting/pickedAuto.vue
......@@ -167,7 +167,11 @@ export default {
submitLoading: false
};
},
created() {
let currentTime = new Date(new Date().valueOf());
let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
},
methods: {
//添加时间段
addTime() {
......@@ -175,14 +179,22 @@ export default {
this.$message.error('最多五个时间段');
return false;
}
// this.pickedModal.timeRangeList.push({ timeRange: ['00:00', '23:59'] });
let currentYear = new Date().getFullYear();
let currentMonth = new Date().getMonth() + 1;
let currentDate = new Date().getDate();
let time = new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[1] + ':00').valueOf();
let temTime1 = new Date(time + 30 * 60 * 1000).getHours() + ':' + new Date(time + 30 * 60 * 1000).getMinutes();
let temTime2 = new Date(time + 60 * 60 * 1000).getHours() + ':' + new Date(time + 60 * 60 * 1000).getMinutes();
this.pickedModal.timeRangeList.push({ timeRange: [temTime1, temTime2] });
if (this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange) {
//上一个时间存在添加
let time1 = new Date((new Date(this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[0]).getTime() + 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[0]).getTime() + 1000 * 60 * 3).valueOf());
this.pickedModal.timeRangeList.push({ timeRange: [time1, time2] });
} else {
this.pickedModal.timeRangeList.push({ timeRange: [] });
}
// // this.pickedModal.timeRangeList.push({ timeRange: ['00:00', '23:59'] });
// let currentYear = new Date().getFullYear();
// let currentMonth = new Date().getMonth() + 1;
// let currentDate = new Date().getDate();
// let time = new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[1] + ':00').valueOf();
// let temTime1 = new Date(time + 30 * 60 * 1000).getHours() + ':' + new Date(time + 30 * 60 * 1000).getMinutes();
// let temTime2 = new Date(time + 60 * 60 * 1000).getHours() + ':' + new Date(time + 60 * 60 * 1000).getMinutes();
// this.pickedModal.timeRangeList.push({ timeRange: [temTime1, temTime2] });
},
//删除时间段
deleteTime(index) {
......@@ -191,23 +203,45 @@ export default {
//时间限制
limitTimeSelect(index, val) {
if (index !== 0) {
let currentYear = new Date().getFullYear();
let currentMonth = new Date().getMonth() + 1;
let currentDate = new Date().getDate();
let currentTime = new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + val[0]).valueOf();
let Time = new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + this.pickedModal.timeRangeList[index - 1].timeRange[1]).valueOf();
if (currentTime < Time) {
this.$message.error('时间不可重叠！');
let temTime = String(new Date(Time + 60 * 1000).getHours()) + ':' + String(new Date(Time + 60 * 1000).getMinutes());
this.pickedModal.timeRangeList[index].timeRange = [temTime, this.pickedModal.timeRangeList[index].timeRange[1]];
//不是第一个
if (this.pickedModal.timeRangeList[index - 1].timeRange) {
//前一个存在
if (val) {
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
let selectTimePrev = new Date(this.pickedModal.timeRangeList[index - 1].timeRange[1]).valueOf(); //选中的前一个的结束时间
//和前一个的结束时间比较
if (selectTime < selectTimePrev) {
this.$message.error('时间不可重叠！');
let time1 = new Date((new Date(this.pickedModal.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.pickedModal.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 3).valueOf());
this.pickedModal.timeRangeList[index].timeRange = [time1, time2];
}
//和后一个的开始时间比较
if (this.pickedModal.timeRangeList.length - 1 > index) {
let selectTimeAfter = new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).valueOf(); //选中的后一个的开始时间
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
let time1 = new Date((new Date(this.pickedModal.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 1).valueOf());
let time2 = new Date((new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 1).valueOf());
this.pickedModal.timeRangeList[index].timeRange = [time1, time2];
}
}
}
}
if (this.pickedModal.timeRangeList.length - 1 > index) {
let currentTime2 = new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + val[1]).valueOf();
let Time2 = new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + this.pickedModal.timeRangeList[index + 1].timeRange[0]).valueOf();
if (currentTime2 > Time2) {
this.$message.error('时间不可重叠2！');
let temTime2 = String(new Date(Time2 - 60 * 1000).getHours()) + ':' + String(new Date(Time2 - 60 * 1000).getMinutes());
this.pickedModal.timeRangeList[index].timeRange = [this.pickedModal.timeRangeList[index].timeRange[0], temTime2];
} else {
if (this.pickedModal.timeRangeList.length !== 1) {
//时间段不止一个情况下设置第一个
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
let selectTimeAfter = new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).valueOf();
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
let time1 = new Date((new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 1).valueOf());
this.pickedModal.timeRangeList[index].timeRange = [time1, time2];
}
}
}
......@@ -228,10 +262,10 @@ export default {
};
let arrObj = [];
for (let item of this.pickedModal.timeRangeList) {
if (item.timeRange[1]) {
if (item.timeRange) {
arrObj.push({
start: item.timeRange[0],
end: item.timeRange[1]
start: this.getHours(item.timeRange[0]),
end: this.getHours(item.timeRange[1])
});
}
}
......
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