Skip to content

I
integral-mall
Commit 15cef5bd by damodmg
Options

更新

parent 491d10c8
Showing with 11 additions and 11 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.a09302cec32f66a0dabd33dcea6951bc.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.51195313bb3d7cfa0c26.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.a9ea6b7d8923c186c4996ec775f4e283.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.8656c89d2e0752c35d04.js></script></body></html>
\ No newline at end of file
src/views/setting/pickedAuto.vue
......@@ -202,19 +202,19 @@ export default {
//不是第一个
// 和前面的时间比较
for (let i = index - 1; i >= 0; i--) {
if (this.this.pickedModal.timeRangeList[i].timeRange) {
let selectTimePrev = new Date(this.this.pickedModal.timeRangeList[i].timeRange[1]).valueOf();
if (this.pickedModal.timeRangeList[i].timeRange) {
let selectTimePrev = new Date(this.pickedModal.timeRangeList[i].timeRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
this.$message.error('时间不可重叠！');
this.this.pickedModal.timeRangeList[index].timeRange = null;
this.pickedModal.timeRangeList[index].timeRange = null;
}
}
}
//和后面的时间比较
for (let j = index + 1; j < this.this.pickedModal.timeRangeList.length; j++) {
if (this.this.pickedModal.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.this.pickedModal.timeRangeList[j].timeRange[0]).valueOf();
for (let j = index + 1; j < this.pickedModal.timeRangeList.length; j++) {
if (this.pickedModal.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.pickedModal.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
......@@ -224,9 +224,9 @@ export default {
}
} else {
//和后面的时间比较
for (let j = index + 1; j < this.this.pickedModal.timeRangeList.length; j++) {
if (this.this.pickedModal.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.this.pickedModal.timeRangeList[j].timeRange[0]).valueOf();
for (let j = index + 1; j < this.pickedModal.timeRangeList.length; j++) {
if (this.pickedModal.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.pickedModal.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
......
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