Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
op-web-service
Project
Project
Details
Activity
Releases
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
bp
op-web-service
Commits
d043540e
Commit
d043540e
authored
Nov 11, 2021
by
顾文旭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导出fix
parent
87cd80e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
9 deletions
+23
-9
groupmeal.js
server/controllers/groupmeal.js
+10
-0
index.vue
src/pages/Groupmeal/newOrderManagement/index.vue
+2
-1
groupmeal.js
src/service/Groupmeal/groupmeal.js
+8
-8
vue.config.js
vue.config.js
+3
-0
No files found.
server/controllers/groupmeal.js
View file @
d043540e
...
...
@@ -250,3 +250,13 @@ exports.newOrderRefundReject = async (ctx) => {
};
ctx
.
body
=
await
req
(
ctx
,
opts
);
};
// 导出订单
export
function
newGetOrderExportURL
(
eventId
,
type
)
{
// if (process.env.NODE_ENV === "development") {
// return `http://127.0.0.1:8055/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
// } else {
// return `/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
// }
return
`
${
GROUPMEAL_URI
}
/order/background/order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
}
src/pages/Groupmeal/newOrderManagement/index.vue
View file @
d043540e
...
...
@@ -290,8 +290,9 @@
newOrderItemList
,
newOrderRefundReject
,
newRefundOrder
,
newGetOrderExportURL
,
}
from
"@/service/Groupmeal/groupmeal"
;
import
{
newGetOrderExportURL
}
from
"%/controllers/groupmeal"
;
import
page
from
"../components/Pagination/index.vue"
;
import
dayJs
from
"dayjs"
;
export
default
{
...
...
src/service/Groupmeal/groupmeal.js
View file @
d043540e
...
...
@@ -197,11 +197,11 @@ export async function newOrderRefundReject(params) {
}
// 导出订单
export
function
newGetOrderExportURL
(
eventId
,
type
)
{
// if (process.env.NODE_ENV === "development") {
// return `http://127.0.0.1:8055/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
// } else {
// return `/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
// }
return
`http://gateway-test.bp.api.appgc.cn/order/background/order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
}
//
export function newGetOrderExportURL(eventId, type) {
//
// if (process.env.NODE_ENV === "development") {
//
// return `http://127.0.0.1:8055/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
//
// } else {
//
// return `/api/v1/relay/order_export?marketing_id=${eventId}&type=${type}`;
//
// }
//
return `http://gateway-test.bp.api.appgc.cn/order/background/order_export?marketing_id=${eventId}&type=${type}`;
//
}
vue.config.js
View file @
d043540e
...
...
@@ -57,6 +57,9 @@ module.exports = {
// 别名 alias
config
.
resolve
.
alias
.
set
(
"@"
,
path
.
resolve
(
"src"
));
// 别名 alias
config
.
resolve
.
alias
.
set
(
"%"
,
path
.
resolve
(
"server"
));
// 修改页面 title
config
.
plugin
(
"html"
).
tap
((
args
)
=>
{
args
[
0
].
title
=
"运营管理系统"
;
...
...
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