Skip to content

I
integral-mall
Commit ddd52f0f by dyf
Options

新功能

parent c396b1bd
Showing with 71 additions and 11 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.40ae052048073d49f4ab08a14747f270.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.11.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.35.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.aa3f4d4cc552c563e91e.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.960c4db3f5e47a7fe0d3abf64d3e436e.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.11.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.35.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.fada962dbfe666dfe843.js></script></body></html>
\ No newline at end of file
src/views/setting/editDeliver.vue
......@@ -80,6 +80,21 @@
</div>
</template>
</el-form-item>
<el-form-item label="提货有效期" prop="overTime">
<span>备货完成</span>
<el-input v-model="form.overTime" style="width:120px"></el-input>
<span>天后，停止自提</span>
</el-form-item>
<el-form-item label="超期订单处理" required>
<template>
<div>
<el-radio v-model="form.overTimeType" :label="1">超期后，订单自动完成，不退款</el-radio>
</div>
<div>
<el-radio v-model="form.overTimeType" :label="2">超期后，订单自动维权，自动向买家退款</el-radio>
</div>
</template>
</el-form-item>
<el-form-item label="买家自提时段" required></el-form-item>
<div style="margin-top:-45px;">
<el-form-item v-for="(v, i) in form.timeRangeList" :key="i" :prop="'timeRangeList.' + i + '.timeRange'" :rules="[{ validator: validateTime, trigger: 'change' }]">
......@@ -190,6 +205,14 @@ export default {
callback();
}
};
let overTimeValidator = (rule, value, callback) => {
var reg = /^\+?[1-9][0-9]*$/;
if (!reg.test(Number(value))) {
callback(new Error('请输入大于0的整数'));
} else {
callback();
}
};
return {
fixedWidth: document.documentElement.clientWidth - 200,
getHours: getInputVal.getHours,
......@@ -206,6 +229,8 @@ export default {
timeHours: '', //小时
timeMinuter: '', //分钟
timeDay: '',
overTime: '',
overTimeType: 1,
timeRangeList: [{ timeRange: '' }],
orderTimeHours: '',
validateTime
......@@ -214,7 +239,8 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }]
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
},
validateTime,
// 门店控件
......@@ -359,6 +385,8 @@ export default {
}
}
}
this.form.overTime = res.data.result.settingDTO.overTime;
this.form.overTimeType = res.data.result.settingDTO.overTimeType || 1;
} else {
this.$message.error(res.data.message);
}
......@@ -421,7 +449,9 @@ export default {
delayHour: this.form.timeHours ? Number(this.form.timeHours) : null,
delayMinute: this.form.timeMinuter ? Number(this.form.timeMinuter) : null,
delayDay: this.form.timeDay ? Number(this.form.timeDay) : null,
choosenTime: []
choosenTime: [],
overTime: Number(this.form.overTime),
overTimeType: this.form.overTimeType
}
};
......@@ -452,7 +482,9 @@ export default {
delayHour: this.form.timeHours ? Number(this.form.timeHours) : null,
delayMinute: this.form.timeMinuter ? Number(this.form.timeMinuter) : null,
delayDay: this.form.timeDay ? Number(this.form.timeDay) : null,
choosenTime: []
choosenTime: [],
overTime: Number(this.form.overTime),
overTimeType: this.form.overTimeType
}
};
let arrObj = [];
......
src/views/setting/pickedAuto.vue
......@@ -31,6 +31,21 @@
</div>
</template>
</el-form-item>
<el-form-item label="提货有效期" prop="overTime">
<span>备货完成</span>
<el-input v-model="pickedModal.overTime" style="width:120px"></el-input>
<span>天后，停止自提</span>
</el-form-item>
<el-form-item label="超期订单处理" required>
<template>
<div>
<el-radio v-model="pickedModal.overTimeType" :label="1">超期后，订单自动完成，不退款</el-radio>
</div>
<div>
<el-radio v-model="pickedModal.overTimeType" :label="2">超期后，订单自动维权，自动向买家退款</el-radio>
</div>
</template>
</el-form-item>
<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' }]">
......@@ -147,6 +162,14 @@ export default {
callback();
}
};
let overTimeValidator = (rule, value, callback) => {
var reg = /^\+?[1-9][0-9]*$/;
if (!reg.test(Number(value))) {
callback(new Error('请输入大于0的整数'));
} else {
callback();
}
};
return {
getHours: getInputVal.getHours,
pickedModal: {
......@@ -156,6 +179,8 @@ export default {
timeHours: '', //小时
timeMinuter: '', //分钟
timeDay: '',
overTime: '',
overTimeType: 1,
timeRangeList: [{ timeRange: '' }],
orderTimeHours: ''
},
......@@ -164,7 +189,8 @@ export default {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }]
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }],
overTime: [{ required: true, message: '请输入提货有效期', trigger: 'blur' }, { validator: overTimeValidator, trigger: 'blur' }]
},
submitLoading: false,
clearableBtn: false,
......@@ -313,7 +339,9 @@ export default {
delayHour: this.pickedModal.timeHours ? Number(this.pickedModal.timeHours) : null,
delayMinute: this.pickedModal.timeMinuter ? Number(this.pickedModal.timeMinuter) : null,
delayDay: this.pickedModal.timeDay ? Number(this.pickedModal.timeDay) : null,
choosenTime: []
choosenTime: [],
overTime: Number(this.pickedModal.overTime),
overTimeType: this.pickedModal.overTimeType
}
};
let arrObj = [];
......
src/views/setting/recordList.vue
......@@ -90,8 +90,8 @@ export default {
},
changeTime() {
if (this.dateValue) {
this.startTime = this.dateValue[0] ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue[1] ? this.getTimeAll(this.dateValue[1]) : '';
this.startTime = this.dateValue[0] ? this.getTime(this.dateValue[0]) : '';
this.endTime = this.dateValue[1] ? this.getTime(this.dateValue[1]) : '';
} else {
this.startTime = '';
this.endTime = '';
......@@ -110,8 +110,8 @@ export default {
this.getList();
},
getList() {
this.startTime = this.dateValue ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue ? this.getTimeAll(this.dateValue[1]) : '';
this.startTime = this.dateValue ? this.getTime(this.dateValue[0]) : '';
this.endTime = this.dateValue ? this.getTime(this.dateValue[1]) : '';
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
......
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