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
1b71c962
Commit
1b71c962
authored
Jul 30, 2021
by
pengyunqian
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/distribution' into test
parents
a9a87897
46096a00
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
index.less
src/pages/Groupmeal/Distrib/index.less
+1
-1
index.vue
src/pages/Groupmeal/orderManagement/index.vue
+4
-4
No files found.
src/pages/Groupmeal/Distrib/index.less
View file @
1b71c962
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
margin-bottom: 30px;
margin-bottom: 30px;
}
}
.dioFor {
.dioFor {
padding-left: 10
%;
margin-left: 5
%;
width: 70%;
width: 70%;
}
}
.diotab {
.diotab {
...
...
src/pages/Groupmeal/orderManagement/index.vue
View file @
1b71c962
...
@@ -156,13 +156,14 @@
...
@@ -156,13 +156,14 @@
size=
"small"
size=
"small"
@
click=
"refund(scope.row)"
@
click=
"refund(scope.row)"
v-show=
"
v-show=
"
scope.row.order_status_text == '已支付' ||
scope.row.order_status == '2' ||
scope.row.order_status_text == '已拒绝'
scope.row.order_status == '6' ||
scope.row.order_status == '8'
"
"
>
退款
</el-button
>
退款
</el-button
>
>
<el-button-group
<el-button-group
v-show=
"scope.row.order_status
_text == '待退款
'"
v-show=
"scope.row.order_status
== '3
'"
>
>
<el-button
type=
"text"
size=
"small"
@
click=
"agree(scope.row)"
<el-button
type=
"text"
size=
"small"
@
click=
"agree(scope.row)"
>
同意
</el-button
>
同意
</el-button
...
@@ -692,7 +693,6 @@ export default {
...
@@ -692,7 +693,6 @@ export default {
};
};
const
res
=
await
orderItemList
(
params
);
const
res
=
await
orderItemList
(
params
);
this
.
refundGoods
=
res
.
result
;
this
.
refundGoods
=
res
.
result
;
console
.
log
(
res
.
result
);
for
(
var
i
in
res
.
result
)
{
for
(
var
i
in
res
.
result
)
{
this
.
refundGoods
[
i
].
refundableQuantity
=
Number
(
this
.
refundGoods
[
i
].
refundableQuantity
=
Number
(
res
.
result
[
i
].
goods_num
-
res
.
result
[
i
].
refund_count
res
.
result
[
i
].
goods_num
-
res
.
result
[
i
].
refund_count
...
...
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