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
473b2266
Commit
473b2266
authored
Aug 18, 2021
by
v-yuchenglong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:新老订单增加下单时间筛选,部分测试问题修改
parent
947cffe9
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
243 additions
and
81 deletions
+243
-81
index.vue
src/pages/Activity/Manage/index.vue
+8
-0
addProduc.vue
src/pages/Activity/releaseProduc/components/addProduc.vue
+3
-2
spellOrderSet.vue
...pages/Activity/releaseProduc/components/spellOrderSet.vue
+1
-0
index.vue
src/pages/Groupmeal/newOrderManagement/index.vue
+116
-39
index.vue
src/pages/Groupmeal/orderManagement/index.vue
+115
-40
No files found.
src/pages/Activity/Manage/index.vue
View file @
473b2266
...
...
@@ -30,6 +30,7 @@
</el-select>
</el-form-item>
<el-form-item
style=
"margin-left: 50px"
>
<el-button
@
click=
"reset()"
>
重置
</el-button>
<el-button
type=
"primary"
@
click=
"getActivityList"
>
搜索
</el-button>
</el-form-item>
<el-form-item>
...
...
@@ -189,6 +190,13 @@ export default {
}
;
}
,
methods
:
{
// 重置
reset
()
{
this
.
activity
.
activityName
=
""
;
this
.
activity
.
online_status
=
""
;
this
.
getActivityList
();
}
,
/* API */
// 获取商品列表
async
getActivityList
()
{
...
...
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @
473b2266
...
...
@@ -13,7 +13,7 @@
<el-table
:data=
"comTableData"
border
style=
"width: 100%"
>
<el-table-column
label=
"显示顺序"
align=
"center"
width=
"140"
>
<template
#
default=
"scope"
>
<i
class=
"el-icon-top"
@
click=
"upMove(scope.$index, scope.row)"
></i>
<i
class=
"el-icon-top"
@
click=
"upMove(scope.$index, scope.row)"
style=
"margin-right:15px;"
></i>
<i
class=
"el-icon-bottom"
@
click=
"upDown(scope.$index, scope.row)"
...
...
@@ -87,6 +87,7 @@
<el-form-item
label=
"商品标题:"
prop=
"goods_name"
style=
"width:90%;"
:rules=
"[{ required: true, message: '请输入商品标题' }]"
>
<el-input
...
...
@@ -134,7 +135,7 @@
</div>
<br
/>
<el-form-item
label=
"商家"
label=
"商家
:
"
prop=
"business1"
:rules=
"[{ required: true, message: '请选择商家' }]"
>
...
...
src/pages/Activity/releaseProduc/components/spellOrderSet.vue
View file @
473b2266
...
...
@@ -446,6 +446,7 @@ export default {
if
(
valid
)
{
await
this
.
addPlace
();
this
.
$refs
.
ruleForm
.
resetFields
();
this
.
$refs
.
multipleTable
.
clearSelection
();
this
.
dialogFormVisible
=
false
;
}
else
{
return
false
;
...
...
src/pages/Groupmeal/newOrderManagement/index.vue
View file @
473b2266
This diff is collapsed.
Click to expand it.
src/pages/Groupmeal/orderManagement/index.vue
View file @
473b2266
This diff is collapsed.
Click to expand it.
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