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
96fe0e52
Commit
96fe0e52
authored
Aug 19, 2021
by
liwenhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add:活动管理适配h5端
parent
dfafbc36
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
19 deletions
+19
-19
index.vue
src/pages/Activity/Manage/index.vue
+9
-8
addProduc.vue
src/pages/Activity/releaseProduc/components/addProduc.vue
+4
-4
index.vue
src/pages/Activity/releaseProduc/index.vue
+3
-5
index.less
src/pages/Groupmeal/Distrib/index.less
+2
-1
index.vue
src/pages/Groupmeal/Distrib/index.vue
+1
-1
No files found.
src/pages/Activity/Manage/index.vue
View file @
96fe0e52
...
@@ -29,11 +29,11 @@
...
@@ -29,11 +29,11 @@
></el-option>
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
style=
"margin-left: 50px"
>
<el-form-item>
<el-button
type=
"primary"
@
click=
"getActivityList"
>
搜索
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"getActivityList"
>
搜索
</el-button>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
type=
"primary"
@
click=
"goReleaseProduc"
<el-button
type=
"primary"
size=
"small"
@
click=
"goReleaseProduc"
>
发布拼单
</el-button
>
发布拼单
</el-button
>
>
</el-form-item>
</el-form-item>
...
@@ -88,13 +88,13 @@
...
@@ -88,13 +88,13 @@
align
=
"center"
align
=
"center"
prop
=
"scope"
prop
=
"scope"
label
=
"操作"
label
=
"操作"
width
=
"250
"
fixed
=
"right
"
>
>
<
template
#
default
=
"scope"
>
<
template
#
default
=
"scope"
>
<
div
class
=
"button-one"
>
<
div
class
=
"button-one"
>
<
el
-
button
<
el
-
button
type
=
"primary"
type
=
"primary"
size
=
"
small
"
size
=
"
mini
"
@
click
=
"handleModify(scope.row)"
@
click
=
"handleModify(scope.row)"
>
修改
<
/el-butto
n
>
修改
<
/el-butto
n
>
>
...
@@ -106,7 +106,7 @@
...
@@ -106,7 +106,7 @@
<
el
-
button
<
el
-
button
v
-
show
=
"scope.row.status === 1"
v
-
show
=
"scope.row.status === 1"
type
=
"primary"
type
=
"primary"
size
=
"
small
"
size
=
"
mini
"
@
click
=
"handleEnd(scope.row)"
@
click
=
"handleEnd(scope.row)"
>
结束
<
/el-butto
n
>
结束
<
/el-butto
n
>
>
...
@@ -122,7 +122,7 @@
...
@@ -122,7 +122,7 @@
scope.row.status === 2 || scope.row.status === 3
scope.row.status === 2 || scope.row.status === 3
"
"
type
=
"primary"
type
=
"primary"
size
=
"
small
"
size
=
"
mini
"
@
click
=
"handleStart(scope.row)"
@
click
=
"handleStart(scope.row)"
>
开始
<
/el-butto
n
>
开始
<
/el-butto
n
>
>
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
<
el
-
button
<
el
-
button
class
=
"checkButton"
class
=
"checkButton"
type
=
"primary"
type
=
"primary"
size
=
"
small
"
size
=
"
mini
"
@
click
=
"handleLook(scope.row)"
@
click
=
"handleLook(scope.row)"
>
查看订单
<
/el-butto
n
>
查看订单
<
/el-butto
n
>
>
...
@@ -331,6 +331,7 @@ export default {
...
@@ -331,6 +331,7 @@ export default {
<
style
lang
=
"less"
scoped
>
<
style
lang
=
"less"
scoped
>
.
manage
-
wrapper
{
.
manage
-
wrapper
{
height
:
100
%
;
height
:
100
%
;
padding
:
30
px
;
}
}
.
header
{
.
header
{
height
:
100
%
;
height
:
100
%
;
...
...
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @
96fe0e52
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<el-table-column
prop=
"total_amount_sold"
label=
"已售数量"
>
<el-table-column
prop=
"total_amount_sold"
label=
"已售数量"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"inventory_rest"
label=
"剩余库存"
></el-table-column>
<el-table-column
prop=
"inventory_rest"
label=
"剩余库存"
></el-table-column>
<el-table-column
label=
"操作"
width=
"120
"
>
<el-table-column
label=
"操作"
fixed=
"right
"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<el-button
<el-button
type=
"text"
type=
"text"
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
<el-dialog
<el-dialog
:title=
"addCommodityTitle"
:title=
"addCommodityTitle"
v-model=
"addCommodityPopup"
v-model=
"addCommodityPopup"
width=
"
4
0%"
width=
"
6
0%"
>
>
<el-form
<el-form
:inline=
"true"
:inline=
"true"
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
<el-dialog
<el-dialog
title=
"选择商品"
title=
"选择商品"
v-model=
"selCommodityPopup"
v-model=
"selCommodityPopup"
width=
"
6
0%"
width=
"
8
0%"
top=
"2%"
top=
"2%"
>
>
<div>
<div>
...
@@ -212,7 +212,7 @@
...
@@ -212,7 +212,7 @@
prop=
"inventory_rest"
prop=
"inventory_rest"
label=
"剩余库存"
label=
"剩余库存"
></el-table-column>
></el-table-column>
<el-table-column
label=
"操作"
width=
"100
"
>
<el-table-column
label=
"操作"
fixed=
"right
"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<el-button
<el-button
@
click=
"commodity('update', scope.row)"
@
click=
"commodity('update', scope.row)"
...
...
src/pages/Activity/releaseProduc/index.vue
View file @
96fe0e52
...
@@ -223,11 +223,9 @@ export default {
...
@@ -223,11 +223,9 @@ export default {
}
}
.stepsBtn
{
.stepsBtn
{
display
:
flex
;
margin
:
20px
auto
;
margin
:
20px
auto
;
justify-content
:
center
;
}
}
.stepsBtn
{
width
:
64%
;
text-align
:
center
;
margin-top
:
50px
;
}
</
style
>
</
style
>
src/pages/Groupmeal/Distrib/index.less
View file @
96fe0e52
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
height: 100%;
height: 100%;
padding: 0 30px;
padding: 0 30px;
.header {
.header {
text-align: right;
display: flex;
justify-content: flex-end;
margin-bottom: 30px;
margin-bottom: 30px;
}
}
.dioFor {
.dioFor {
...
...
src/pages/Groupmeal/Distrib/index.vue
View file @
96fe0e52
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
{{
scope
.
row
.
list
.
map
((
item
)
=>
item
.
deliverer_name
).
join
(
"、"
)
}}
{{
scope
.
row
.
list
.
map
((
item
)
=>
item
.
deliverer_name
).
join
(
"、"
)
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"prop"
label=
"操作"
width=
"width"
align=
"center
"
>
<el-table-column
label=
"操作"
fixed=
"right
"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<el-button
type=
"primary"
@
click=
"handleModify(scope.row)"
<el-button
type=
"primary"
@
click=
"handleModify(scope.row)"
>
修改
</el-button
>
修改
</el-button
...
...
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