Skip to content

I
integral-mall
Commit 2f34a8a7 by damodmg
Options

更新自提点时间点的判断

parent 679c1ffa
Showing with 117 additions and 81 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.7734200c32cfc26a2f2487f055c1f880.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.c9c19c8493a211053f8b.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.2859834946f6ba1c501a33f6c45d1a1d.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.265af63bd259b85143c7.js></script></body></html>
\ No newline at end of file
dist/static/js/app.265af63bd259b85143c7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.c9c19c8493a211053f8b.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/importCoupon.vue
......@@ -101,6 +101,7 @@ export default {
this.dialogFormVisible = true;
this.loading = false;
if (file.result.total) {
//文本卡券导入的总数
this.$emit('getSuceessNum', file.result.total);
} else {
this.$emit('getSuceessNum', 0);
......
src/views/order/orderDetail.vue
......@@ -134,10 +134,10 @@
<span>提货时间：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡号：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
<span>卡号：</span><span class="order-item-detail-mess">{{ orderDetail.cardNumber ? orderDetail.cardNumber : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡密/券码：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
<span>卡密/券码：</span><span class="order-item-detail-mess">{{ orderDetail.cardPassWord ? orderDetail.cardPassWord : '--' }}</span>
</p>
</div>
<div class="order-operate">
......
src/views/setting/editDeliver.vue
......@@ -203,7 +203,7 @@ export default {
timeHours: '', //小时
timeMinuter: '', //分钟
timeDay: '',
timeRangeList: [{ timeRange: ['00：00', '00：30'] }],
timeRangeList: [{ timeRange: '' }],
orderTimeHours: '',
validateTime
},
......@@ -227,12 +227,13 @@ export default {
this.integralMallPickUpPointId = this.$route.query.integralMallPickUpPointId;
if (this.integralMallPickUpPointId !== '-1') {
this.getInfo();
} else {
//新增时候的时间段选择
let currentTime = new Date(new Date().valueOf());
let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
}
// else {
// //新增时候的时间段选择
// let currentTime = new Date(new Date().valueOf());
// let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
// }
},
methods: {
//添加时间段
......@@ -252,46 +253,42 @@ export default {
},
//时间限制
limitTimeSelect(index, val) {
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
if (index !== 0) {
//不是第一个
if (this.form.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.form.timeRangeList[index - 1].timeRange[1]).valueOf(); //选中的前一个的结束时间
//和前一个的结束时间比较
// 和前面的时间比较
for (let i = index - 1; i >= 0; i--) {
if (this.form.timeRangeList[i].timeRange) {
let selectTimePrev = new Date(this.form.timeRangeList[i].timeRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
this.$message.error('时间不可重叠！');
let time1 = new Date((new Date(this.form.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.form.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 3).valueOf());
this.form.timeRangeList[index].timeRange = [time1, time2];
this.$message.error('时间不可重叠1111！');
this.form.timeRangeList[index].timeRange = null;
}
//和后一个的开始时间比较
if (this.form.timeRangeList.length - 1 > index) {
let selectTimeAfter = new Date(this.form.timeRangeList[index + 1].timeRange[0]).valueOf(); //选中的后一个的开始时间
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
let time1 = new Date((new Date(this.form.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 1).valueOf());
let time2 = new Date((new Date(this.form.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 1).valueOf());
this.form.timeRangeList[index].timeRange = [time1, time2];
}
}
}
//和后面的时间比较
for (let j = index + 1; j < this.form.timeRangeList.length; j++) {
if (this.form.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.form.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠2222！');
this.form.timeRangeList[index].timeRange = null;
}
}
}
} else {
if (this.form.timeRangeList.length !== 1) {
//时间段不止一个情况下设置第一个
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
let selectTimeAfter = new Date(this.form.timeRangeList[index + 1].timeRange[0]).valueOf();
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
let time1 = new Date((new Date(this.form.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.form.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 1).valueOf());
this.form.timeRangeList[index].timeRange = [time1, time2];
//和后面的时间比较
for (let j = index + 1; j < this.form.timeRangeList.length; j++) {
if (this.form.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.form.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠2222！');
this.form.timeRangeList[index].timeRange = null;
}
}
}
}
......@@ -447,7 +444,6 @@ export default {
}
url = '/api-integral-mall/update-pick-up-points';
}
this.$refs[form].validate(valid => {
if (valid) {
this.submitLoading = true;
......
src/views/setting/pickedAuto.vue
......@@ -155,7 +155,7 @@ export default {
timeHours: '', //小时
timeMinuter: '', //分钟
timeDay: '',
timeRangeList: [{ timeRange: ['00：00', '00：30'] }],
timeRangeList: [{ timeRange: '' }],
orderTimeHours: ''
},
validateTime,
......@@ -169,11 +169,11 @@ export default {
clearableBtn: 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];
},
// 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() {
......@@ -196,49 +196,88 @@ export default {
},
//时间限制
limitTimeSelect(index, val) {
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
if (index !== 0) {
//不是第一个
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(); //选中的前一个的结束时间
//和前一个的结束时间比较
// 和前面的时间比较
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 (selectTime < selectTimePrev) {
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 * 2).valueOf());
this.pickedModal.timeRangeList[index].timeRange = [time1, time2];
this.$message.error('时间不可重叠1111！');
this.this.pickedModal.timeRangeList[index].timeRange = null;
}
//和后一个的开始时间比较
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];
}
}
}
//和后面的时间比较
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();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠2222！');
this.this.pickedModal.timeRangeList[index].timeRange = null;
}
}
}
} 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];
//和后面的时间比较
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();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠2222！');
this.this.pickedModal.timeRangeList[index].timeRange = null;
}
}
}
}
// if (index !== 0) {
// //不是第一个
// 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 * 1).valueOf());
// let time2 = new Date((new Date(this.pickedModal.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 2).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];
// }
// }
// }
// }
// } 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];
// }
// }
// }
},
submit(pickedModal) {
this.$refs[pickedModal].validate(valid => {
......
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