Skip to content

I
integral-mall
Commit 05e7ab68 by damodmg
Options

更新

parent 6de01b57
Showing with 8 additions and 8 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.79b9587f2861ee96b7a6ccb615ae0e5e.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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.df7e05e121e33f334b32.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.3d9072c03caf6587f3ea67e807ea6591.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.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.f6debfb8d34ec194896f.js></script></body></html>
\ No newline at end of file
dist/static/js/app.df7e05e121e33f334b32.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.f6debfb8d34ec194896f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/setting/editDeliver.vue
......@@ -400,7 +400,7 @@ export default {
if (this.form.dataRangeList[i].dataRange) {
let selectTimePrev = new Date(this.form.dataRangeList[i].dataRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
if (selectTime <= selectTimePrev) {
this.$message.error('日期不可重叠！');
this.form.dataRangeList[index].dataRange = null;
}
......@@ -411,7 +411,7 @@ export default {
if (this.form.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.form.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠！');
this.form.dataRangeList[index].dataRange = null;
}
......@@ -423,7 +423,7 @@ export default {
if (this.form.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.form.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠！');
this.form.dataRangeList[index].dataRange = null;
}
......
src/views/setting/pickedAuto.vue
......@@ -370,7 +370,7 @@ export default {
if (this.pickedModal.dataRangeList[i].dataRange) {
let selectTimePrev = new Date(this.pickedModal.dataRangeList[i].dataRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
if (selectTime <= selectTimePrev) {
this.$message.error('日期不可重叠！');
this.pickedModal.dataRangeList[index].dataRange = null;
}
......@@ -381,7 +381,7 @@ export default {
if (this.pickedModal.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.pickedModal.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠！');
this.pickedModal.dataRangeList[index].dataRange = null;
}
......@@ -393,7 +393,7 @@ export default {
if (this.pickedModal.dataRangeList[j].dataRange) {
let selectTimeAfter = new Date(this.pickedModal.dataRangeList[j].dataRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
if (selectTime >= selectTimeAfter || selectTimeEnd >= selectTimeAfter) {
this.$message.error('日期不可重叠！');
this.pickedModal.dataRangeList[index].dataRange = null;
}
......
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