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
04c7f8da
Commit
04c7f8da
authored
May 24, 2021
by
liuchenxi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix/修复导出订单还是全量的bug'
parents
c53c5786
a0bc32c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
couponExchange.vue
src/views/order/couponExchange.vue
+4
-2
giftExchange.vue
src/views/order/giftExchange.vue
+2
-1
No files found.
src/views/order/couponExchange.vue
View file @
04c7f8da
...
...
@@ -266,7 +266,8 @@ export default {
endTime
:
this
.
endTime
,
pageType
:
1
,
//1、代表优惠券订单列表 2、礼品订单
requestProject
:
'integral-mall'
,
integralMallProId
:
this
.
integralMallProId
integralMallProId
:
this
.
integralMallProId
,
showSelfFlag
:
this
.
showSelfStatus
?
1
:
0
};
this
.
dialogVisible
=
true
;
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
...
...
@@ -294,7 +295,8 @@ export default {
endTime
:
this
.
endTime
,
integralMallProId
:
''
,
pageType
:
1
,
//1、代表优惠券订单列表 2、礼品订单
requestProject
:
'integral-mall'
requestProject
:
'integral-mall'
,
showSelfFlag
:
this
.
showSelfStatus
?
1
:
0
};
this
.
dialogVisibleAll
=
true
;
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
...
...
src/views/order/giftExchange.vue
View file @
04c7f8da
...
...
@@ -561,7 +561,8 @@ export default {
endTime
:
this
.
endTime
,
integralMallProId
:
this
.
integralMallProId
?
this
.
integralMallProId
:
''
,
pageType
:
2
,
//1、代表优惠券订单列表 2、礼品订单
requestProject
:
'integral-mall'
requestProject
:
'integral-mall'
,
showSelfFlag
:
this
.
showSelfStatus
?
1
:
0
};
this
.
dialogVisible
=
true
;
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
...
...
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