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
946f4fc3
Commit
946f4fc3
authored
Aug 09, 2021
by
pengyunqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:订单列表
parent
e7a9b771
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
groupmeal.js
server/controllers/groupmeal.js
+1
-1
router.js
server/router.js
+1
-1
index.vue
src/pages/Groupmeal/newOrderManagement/index.vue
+2
-2
groupmeal.js
src/service/Groupmeal/groupmeal.js
+1
-1
No files found.
server/controllers/groupmeal.js
View file @
946f4fc3
...
...
@@ -140,7 +140,7 @@ exports.orderRefundReject = async ctx => {
// 获取订单管理列表
exports
.
newGetOrderList
=
async
ctx
=>
{
const
url
=
`
${
GROUPMEAL_URI
}
/order/
background/
order_list`
;
const
url
=
`
${
GROUPMEAL_URI
}
/order/
oldbackground/op_
order_list`
;
const
opts
=
{
url
,
method
:
"GET"
...
...
server/router.js
View file @
946f4fc3
...
...
@@ -102,7 +102,7 @@ router.get(`${API_VERSION}/order/oldbackground/order_refund_reject`, groupmeal.o
router
.
post
(
`
${
API_VERSION
}
/order/oldbackground/order_refund`
,
groupmeal
.
orderRefund
);
// 新订单管理
router
.
get
(
`
${
API_VERSION
}
/order/
background/
order_list`
,
groupmeal
.
newGetOrderList
);
router
.
get
(
`
${
API_VERSION
}
/order/
oldbackground/op_
order_list`
,
groupmeal
.
newGetOrderList
);
router
.
get
(
`
${
API_VERSION
}
/order/background/marketing_list`
,
groupmeal
.
newGetMarketingList
);
router
.
get
(
`
${
API_VERSION
}
/order/background/goods_list`
,
groupmeal
.
newGetGoodsList
);
router
.
get
(
`
${
API_VERSION
}
/order/background/sub_shop_list`
,
groupmeal
.
newGetSubShopList
);
...
...
src/pages/Groupmeal/newOrderManagement/index.vue
View file @
946f4fc3
...
...
@@ -366,7 +366,7 @@
<
script
>
import
Layout
from
"../layout/index.vue"
;
import
{
g
etOrderList
,
newG
etOrderList
,
getMarketingList
,
getGoodsList
,
getSubShopList
,
...
...
@@ -634,7 +634,7 @@ export default {
this
.
orderQueryObj
.
marketing_id
=
this
.
$route
.
query
.
marketing_id
;
}
try
{
const
res
=
await
g
etOrderList
(
this
.
orderQueryObj
);
const
res
=
await
newG
etOrderList
(
this
.
orderQueryObj
);
this
.
goodsNum
=
res
.
goods_num
;
// 商品共计
this
.
totalNum
=
res
.
count
;
// 商品总数
this
.
orderTableData
=
res
.
result
;
...
...
src/service/Groupmeal/groupmeal.js
View file @
946f4fc3
...
...
@@ -119,7 +119,7 @@ export function getOrderExportURL(eventId, type) {
// 获取订单列表
export
async
function
newGetOrderList
(
params
)
{
const
res
=
await
axios
.
get
(
"/api/v1/order/
background/
order_list"
,
{
const
res
=
await
axios
.
get
(
"/api/v1/order/
oldbackground/op_
order_list"
,
{
params
});
return
res
;
...
...
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