Skip to content

I
integral-mall
Commit 3dfa3545 by damodmg
Options

修改时间的

parent f3304b4a
Showing with 10 additions and 18 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.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
<!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.55425dd13e16437485e19158f500d378.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.406c473494728f467b50.js></script></body></html>
\ No newline at end of file
dist/static/js/app.2c5b189fce7bb13e2301.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.406c473494728f467b50.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
......@@ -238,8 +238,8 @@ export default {
}
if (this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange) {
//上一个时间存在添加
let time1 = new Date((new Date(this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange[0]).getTime() + 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange[0]).getTime() + 1000 * 60 * 3).valueOf());
let time1 = new Date((new Date(this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange[1]).getTime() + 1000 * 60 * 1).valueOf());
let time2 = new Date((new Date(this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange[1]).getTime() + 1000 * 60 * 2).valueOf());
this.form.timeRangeList.push({ timeRange: [time1, time2] });
} else {
this.form.timeRangeList.push({ timeRange: null });
......
src/views/setting/pickedAuto.vue
......@@ -34,7 +34,7 @@
<el-form-item label="买家自提时段" required></el-form-item>
<div style="margin-top:-45px;">
<el-form-item v-for="(v, i) in pickedModal.timeRangeList" :key="i" :prop="'timeRangeList.' + i + '.timeRange'" :rules="[{ validator: validateTime, trigger: 'change' }]">
<el-time-picker class="w-280" is-range v-model="v.timeRange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" value-format="HH:mm" format="HH:mm" :editable="false" placeholder="选择时间范围" @change="val => limitTimeSelect(i, val)"> </el-time-picker>
<el-time-picker class="w-280" is-range v-model="v.timeRange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" format="HH:mm" :editable="false" placeholder="选择时间范围" @change="val => limitTimeSelect(i, val)"> </el-time-picker>
<el-button v-if="i" type="text" @click="deleteTime(i)">删除</el-button>
<span v-if="!i" style="font-size:12px;color:#909399;line-height:12px;margin-left:10px;">请使用24小时制输入时间，格式如11:00至14:30</span>
</el-form-item>
......@@ -179,22 +179,14 @@ export default {
this.$message.error('最多五个时间段');
return false;
}
if (this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange) {
if (this.pickedModal.timeRangeList[this.pickedModal.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());
let time1 = new Date((new Date(this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[1]).getTime() + 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[1]).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) {
......@@ -215,8 +207,8 @@ export default {
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());
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];
}
//和后一个的开始时间比较
......
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