Skip to content

I
integral-mall
Commit c854cc29 by damodmg
Options

更新编辑下自提点关闭时候默认数据

parent df9d1aea
Showing with 24 additions and 12 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.c227510babc330a85deae110c796ac07.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.30084d8c7f731b5b83e4.js></script></body></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.290c765f9764b55debeb3e79ff138310.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.43b10b6eb1b411627cda.js></script></body></html>
\ No newline at end of file \ No newline at end of file
src/views/setting/editDeliver.vue
...@@ -311,20 +311,32 @@ export default { ...@@ -311,20 +311,32 @@ export default {
this.form.pickUpPointImageList = res.data.result.pickUpPointImageList; this.form.pickUpPointImageList = res.data.result.pickUpPointImageList;
this.form.pickUpPointOpenTime = res.data.result.pickUpPointOpenTime; this.form.pickUpPointOpenTime = res.data.result.pickUpPointOpenTime;
this.form.pickUpPointCloseTime = res.data.result.pickUpPointCloseTime; this.form.pickUpPointCloseTime = res.data.result.pickUpPointCloseTime;
if (res.data.result.settingDTO.canChooseTime === 0) {
//自提时间关闭
this.form.radio = 1;
} else {
this.form.radio = res.data.result.settingDTO.delayTimeType;
}
this.form.status = res.data.result.settingDTO.canChooseTime === 1 ? true : false; this.form.status = res.data.result.settingDTO.canChooseTime === 1 ? true : false;
this.form.timeHours = res.data.result.settingDTO.delayHour; this.form.timeHours = res.data.result.settingDTO.delayHour;
this.form.timeMinuter = res.data.result.settingDTO.delayMinute; this.form.timeMinuter = res.data.result.settingDTO.delayMinute;
this.form.timeDay = res.data.result.settingDTO.delayDay; this.form.timeDay = res.data.result.settingDTO.delayDay;
this.form.radio = res.data.result.settingDTO.delayTimeType; if (res.data.result.settingDTO.canChooseTime === 0) {
if (res.data.result.settingDTO.choosenTime) { //自提时间关闭
this.form.timeRangeList = []; let currentTime = new Date(new Date().valueOf());
for (let item of res.data.result.settingDTO.choosenTime) { let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
let currentYear = new Date().getFullYear(); this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
let currentMonth = new Date().getMonth() + 1; } else {
let currentDate = new Date().getDate(); if (res.data.result.settingDTO.choosenTime) {
let time1 = new Date(new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + item.start + ':00').valueOf()); this.form.timeRangeList = [];
let time2 = new Date(new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + item.end + ':00').valueOf()); for (let item of res.data.result.settingDTO.choosenTime) {
this.form.timeRangeList.push({ timeRange: [time1, time2] }); let currentYear = new Date().getFullYear();
let currentMonth = new Date().getMonth() + 1;
let currentDate = new Date().getDate();
let time1 = new Date(new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + item.start + ':00').valueOf());
let time2 = new Date(new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + item.end + ':00').valueOf());
this.form.timeRangeList.push({ timeRange: [time1, time2] });
}
} }
} }
} else { } else {
......
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