Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integral-mall
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
integralMall
integral-mall
Commits
389dbb6a
Commit
389dbb6a
authored
Oct 26, 2022
by
huaying
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix/积分订单导出订单时间限制'
parents
8a484afa
fa67060d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
couponExchange.vue
src/views/order/couponExchange.vue
+0
-0
giftExchange.vue
src/views/order/giftExchange.vue
+2
-2
No files found.
src/views/order/couponExchange.vue
View file @
389dbb6a
This diff is collapsed.
Click to expand it.
src/views/order/giftExchange.vue
View file @
389dbb6a
...
...
@@ -871,11 +871,11 @@ export default {
return
;
}
const
data
=
this
.
natureMonth
(
this
.
beginTime
,
3
);
this
.
endTime
=
this
.
endTime
.
split
(
' '
)[
0
];
const
endTimes
=
this
.
endTime
.
split
(
' '
)[
0
];
// console.log(this.endTime.split(' '), 'iiii');
// console.log(data, typeof data, '选择时间', this.endTime, typeof this.endTime);
// console.log(new Date(data).getTime(), new Date(this.endTime).getTime());
if
(
new
Date
(
data
).
getTime
()
-
1
*
24
*
1000
<
new
Date
(
this
.
endTime
).
getTime
())
{
if
(
new
Date
(
data
).
getTime
()
-
1
*
24
*
1000
<
new
Date
(
endTimes
).
getTime
())
{
this
.
$message
.
error
(
'导出订单不支持导出超过3个月时长的数据,请重新选择时间'
);
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment