Commit 11491141 by huaying

Merge branch 'bugfix/积分订单导出订单时间限制' into dev

parents f9c934dc 9bbdfc40
......@@ -522,8 +522,8 @@ export default {
}
this.params = {
orderStatus: this.orderStatus,
// changeType: this.changeType,
changeType: -1,
changeType: this.changeType,
// changeType: -1,
searchParams: this.searchValue,
searchType: this.searchType,
beginTime: this.beginTime,
......@@ -539,7 +539,9 @@ export default {
// 计算自然月
natureMonth (curDate, step) {
if (!curDate || !step) return curDate;
if (typeof curDate === 'string') { curDate = new Date(curDate.replace(/[\/|\.]/g, '-')); } // new Date(str) 对str格式的,ios只支持yyyy-MM-dd
if (typeof curDate === 'string') {
curDate = new Date(curDate.replace(/[\/|\.]/g, '-'));
} // new Date(str) 对str格式的,ios只支持yyyy-MM-dd
const targetDateLastDay = new Date(
curDate.getFullYear(),
......
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