Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-base
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
new-sing
admin-base
Commits
4c878bbf
Commit
4c878bbf
authored
Sep 23, 2019
by
赵茹林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户详情-外部订单列表 [修复] 查看退款订单时没有传 user_id 的问题
parent
7ea0e969
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
94 deletions
+47
-94
refundDetail.vue
src/components/order/refundDetail.vue
+28
-48
index.vue
src/components/userDetail/index.vue
+19
-46
No files found.
src/components/order/refundDetail.vue
View file @
4c878bbf
...
@@ -5,55 +5,32 @@
...
@@ -5,55 +5,32 @@
append-to-body
append-to-body
:visible
.
sync=
"dialogObj.show"
:visible
.
sync=
"dialogObj.show"
width=
"90%"
>
width=
"90%"
>
<el-table
<el-table
:data=
"detail"
>
:data=
"detail"
<el-table-column
prop=
"refund_no"
label=
"退款编号"
></el-table-column>
style=
"width: 100%"
>
<el-table-column
prop=
"out_trade_no"
label=
"订单号"
></el-table-column>
<el-table-column
<el-table-column
label=
"用户信息"
min-width=
"140"
className=
"userInfo"
>
prop=
"refund_no"
label=
"退款编号"
>
</el-table-column>
<el-table-column
prop=
"out_trade_no"
label=
"订单号"
>
</el-table-column>
<el-table-column
label=
"用户信息"
min-width=
"140"
className=
"userInfo"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<img
class=
"avatar"
:src=
"scope.row.user_avatar"
>
<img
class=
"avatar"
:src=
"scope.row.user_avatar"
>
{{
scope
.
row
.
user_nickname
}}
(ID:
{{
scope
.
row
.
user_id
}}
)
{{
scope
.
row
.
user_nickname
}}
(ID:
{{
scope
.
row
.
user_id
}}
)
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"order_money"
label=
"订单金额"
>
prop=
"order_money"
label=
"订单金额"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
parseFloat
(
scope
.
row
.
order_money
/
100
)
}}
元
{{
parseFloat
(
scope
.
row
.
order_money
/
100
)
}}
元
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"refund_money"
label=
"退款金额"
>
prop=
"refund_money"
label=
"退款金额"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
parseFloat
(
scope
.
row
.
refund_money
/
100
)
}}
元
{{
parseFloat
(
scope
.
row
.
refund_money
/
100
)
}}
元
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"desc"
label=
"备注"
></el-table-column>
prop=
"desc"
<el-table-column
label=
"退款状态"
>
label=
"备注"
>
</el-table-column>
<el-table-column
label=
"退款状态"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
status
|
filterStatus
}}
{{
scope
.
row
.
status
|
filterStatus
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"success_at"
label=
"退款成功时间"
></el-table-column>
prop=
"success_at"
label=
"退款成功时间"
>
</el-table-column>
</el-table>
</el-table>
</el-dialog>
</el-dialog>
...
@@ -64,22 +41,22 @@
...
@@ -64,22 +41,22 @@
export
default
{
export
default
{
name
:
"refundDetail"
,
name
:
"refundDetail"
,
props
:[
props
:
[
'dialogObj'
'dialogObj'
],
],
data
(){
data
()
{
return
{
return
{
detail
:[]
detail
:
[]
}
}
},
},
filters
:{
filters
:
{
filterStatus
:
function
(
value
)
{
filterStatus
:
function
(
value
)
{
let
msg
=
''
;
let
msg
=
''
;
if
(
value
===
0
)
{
if
(
value
===
0
)
{
msg
=
'退款中'
msg
=
'退款中'
}
else
if
(
value
===
1
)
{
}
else
if
(
value
===
1
)
{
msg
=
'退款成功'
msg
=
'退款成功'
}
else
if
(
value
===
2
)
{
}
else
if
(
value
===
2
)
{
msg
=
'退款失败'
msg
=
'退款失败'
}
}
return
msg
;
return
msg
;
...
@@ -88,18 +65,21 @@
...
@@ -88,18 +65,21 @@
// mounted(){
// mounted(){
// this.initPage()
// this.initPage()
// },
// },
methods
:{
methods
:
{
initPage
(){
initPage
()
{
let
json
=
{
let
json
=
{
out_trade_no
:
this
.
dialogObj
.
out_trade_no
,
out_trade_no
:
this
.
dialogObj
.
out_trade_no
,
limit
:
200
limit
:
200
};
};
getRefundListApi
(
json
).
then
(
res
=>
{
if
(
this
.
dialogObj
.
user_id
)
{
json
.
user_id
=
this
.
dialogObj
.
user_id
}
getRefundListApi
(
json
).
then
(
res
=>
{
this
.
detail
=
res
.
list
this
.
detail
=
res
.
list
})
})
}
}
},
},
watch
:{
watch
:
{
'dialogObj.show'
(
value
)
{
'dialogObj.show'
(
value
)
{
if
(
value
===
true
)
{
if
(
value
===
true
)
{
this
.
initPage
()
this
.
initPage
()
...
@@ -112,7 +92,7 @@
...
@@ -112,7 +92,7 @@
<
style
scoped
>
<
style
scoped
>
.avatar
{
.avatar
{
width
:
50px
;
width
:
50px
;
height
:
50px
;
height
:
50px
;
border-radius
:
50%
;
border-radius
:
50%
;
}
}
...
...
src/components/userDetail/index.vue
View file @
4c878bbf
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
<call-back
:hasUserInfo=
"true"
:callbackObj=
"callbackObj"
@
updateUser=
"getDetail"
></call-back>
<call-back
:hasUserInfo=
"true"
:callbackObj=
"callbackObj"
@
updateUser=
"getDetail"
></call-back>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"期数列表"
name=
"periods"
>
<el-tab-pane
label=
"期数列表"
name=
"periods"
>
<el-table
@
expand-change=
"changeRow"
:data=
"periodList"
>
<el-table
@
expand-change=
"changeRow"
:data=
"periodList"
size=
"medium"
>
<el-table-column
type=
"expand"
>
<el-table-column
type=
"expand"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-table
:data=
"list"
>
<el-table
:data=
"list"
>
...
@@ -137,7 +137,7 @@
...
@@ -137,7 +137,7 @@
</el-table>
</el-table>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"系统订单列表"
name=
"order"
>
<el-tab-pane
label=
"系统订单列表"
name=
"order"
>
<el-table
:data=
"userList"
>
<el-table
:data=
"userList"
size=
"medium"
>
<el-table-column
prop=
"out_trade_no"
label=
"订单号"
></el-table-column>
<el-table-column
prop=
"out_trade_no"
label=
"订单号"
></el-table-column>
<el-table-column
label=
"购买人"
className=
"f-c"
width=
"150"
>
<el-table-column
label=
"购买人"
className=
"f-c"
width=
"150"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -230,9 +230,8 @@
...
@@ -230,9 +230,8 @@
<page
:total=
"total"
:limit=
"limit"
@
pageChange=
"onPageChange"
@
sizeChange=
"onSizeChange"
/>
<page
:total=
"total"
:limit=
"limit"
@
pageChange=
"onPageChange"
@
sizeChange=
"onSizeChange"
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"外部订单列表"
name=
"yunji"
>
<el-tab-pane
label=
"外部订单列表"
name=
"yunji"
>
<el-table
:data=
"yunjiList"
>
<el-table
:data=
"yunjiList"
size=
"medium"
>
<el-table-column
prop=
"order_id"
width=
"80"
label=
"订单号"
>
<el-table-column
prop=
"order_id"
width=
"80"
label=
"订单号"
></el-table-column>
</el-table-column>
<el-table-column
prop=
"nickname"
label=
"购买人"
>
<el-table-column
prop=
"nickname"
label=
"购买人"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
'scope.row.user_id !== 0'
>
<div
v-if=
'scope.row.user_id !== 0'
>
...
@@ -261,7 +260,7 @@
...
@@ -261,7 +260,7 @@
<div
v-if=
"scope.row.status !== 5 && scope.row.status !== 3"
>
{{
scope
.
row
.
status
|
status
}}
</div>
<div
v-if=
"scope.row.status !== 5 && scope.row.status !== 3"
>
{{
scope
.
row
.
status
|
status
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"money"
label=
"实付金额"
width=
"
7
0"
>
<el-table-column
prop=
"money"
label=
"实付金额"
width=
"
8
0"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
money
/
100
}}
元
{{
scope
.
row
.
money
/
100
}}
元
</
template
>
</
template
>
...
@@ -288,7 +287,7 @@
...
@@ -288,7 +287,7 @@
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"地址列表"
name=
"address"
>
<el-tab-pane
label=
"地址列表"
name=
"address"
>
<el-button
size=
"mini"
type=
""
v-if=
"!addressList.length"
@
click=
"addAddress()"
>
新增
</el-button>
<el-button
size=
"mini"
type=
""
v-if=
"!addressList.length"
@
click=
"addAddress()"
>
新增
</el-button>
<el-table
:data=
"addressList"
>
<el-table
:data=
"addressList"
size=
"medium"
>
<el-table-column
prop=
"receive_name"
label=
"收件人名称"
></el-table-column>
<el-table-column
prop=
"receive_name"
label=
"收件人名称"
></el-table-column>
<el-table-column
prop=
"receive_mobile"
label=
"收件人手机号"
></el-table-column>
<el-table-column
prop=
"receive_mobile"
label=
"收件人手机号"
></el-table-column>
<el-table-column
prop=
"province_name"
label=
"省"
></el-table-column>
<el-table-column
prop=
"province_name"
label=
"省"
></el-table-column>
...
@@ -312,7 +311,7 @@
...
@@ -312,7 +311,7 @@
</el-table>
</el-table>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"绑定记录"
name=
"subList"
>
<el-tab-pane
label=
"绑定记录"
name=
"subList"
>
<el-table
:data=
"subListData"
>
<el-table
:data=
"subListData"
size=
"medium"
>
<el-table-column
prop=
"cur_date"
label=
"绑定时间"
></el-table-column>
<el-table-column
prop=
"cur_date"
label=
"绑定时间"
></el-table-column>
<el-table-column
prop=
"unbind_at"
label=
"解绑时间"
></el-table-column>
<el-table-column
prop=
"unbind_at"
label=
"解绑时间"
></el-table-column>
<el-table-column
prop=
"user_nickname"
label=
"主账号"
></el-table-column>
<el-table-column
prop=
"user_nickname"
label=
"主账号"
></el-table-column>
...
@@ -320,7 +319,7 @@
...
@@ -320,7 +319,7 @@
</el-table>
</el-table>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"发货记录"
name=
"deliverRecord"
>
<el-tab-pane
label=
"发货记录"
name=
"deliverRecord"
>
<el-table
:data=
"deliverRecordList"
>
<el-table
:data=
"deliverRecordList"
size=
"medium"
>
<el-table-column
width=
"220"
className=
"f-c"
label=
"用户"
>
<el-table-column
width=
"220"
className=
"f-c"
label=
"用户"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<img
class=
"avatar"
:src=
"scope.row.user_avatar"
/>
{{
scope
.
row
.
user_nickname
}}
<br>
(ID:
{{
scope
.
row
.
user_id
}}
)
<br>
手机:
{{
scope
.
row
.
user_mobile
}}
<img
class=
"avatar"
:src=
"scope.row.user_avatar"
/>
{{
scope
.
row
.
user_nickname
}}
<br>
(ID:
{{
scope
.
row
.
user_id
}}
)
<br>
手机:
{{
scope
.
row
.
user_mobile
}}
...
@@ -354,52 +353,24 @@
...
@@ -354,52 +353,24 @@
</el-table>
</el-table>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"成长记录"
name=
"growthRecord"
>
<el-tab-pane
label=
"成长记录"
name=
"growthRecord"
>
<el-table
:data=
"growthRecordList"
>
<el-table
:data=
"growthRecordList"
size=
"medium"
>
<el-table-column
<el-table-column
prop=
"element_title"
width=
"200"
label=
"歌曲名"
></el-table-column>
prop=
"element_title"
<el-table-column
width=
"200"
label=
"课程"
>
width=
"200"
label=
"歌曲名"
>
</el-table-column>
<el-table-column
width=
"200"
label=
"课程"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
category_name
|
categoryNameFilter
}}
</span>
<span>
{{
scope
.
row
.
category_name
|
categoryNameFilter
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"interest"
width=
"100"
label=
"兴趣度"
></el-table-column>
prop=
"interest"
<el-table-column
prop=
"concent"
width=
"100"
label=
"专注度"
></el-table-column>
width=
"100"
<el-table-column
prop=
"parent_child"
width=
"100"
label=
"亲子互动"
></el-table-column>
label=
"兴趣度"
>
<el-table-column
prop=
"growth_record"
label=
"成长记录"
>
</el-table-column>
<el-table-column
prop=
"concent"
width=
"100"
label=
"专注度"
>
</el-table-column>
<el-table-column
prop=
"parent_child"
width=
"100"
label=
"亲子互动"
>
</el-table-column>
<el-table-column
prop=
"growth_record"
label=
"成长记录"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-popover
<el-popover
placement=
"top-start"
width=
"200"
trigger=
"hover"
:content=
"scope.row.growth_record"
>
placement=
"top-start"
width=
"200"
trigger=
"hover"
:content=
"scope.row.growth_record"
>
<el-button
slot=
"reference"
>
{{
scope
.
row
.
growth_record
}}
</el-button>
<el-button
slot=
"reference"
>
{{
scope
.
row
.
growth_record
}}
</el-button>
</el-popover>
</el-popover>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"created_at"
width=
"200"
label=
"提交时间"
></el-table-column>
prop=
"created_at"
width=
"200"
label=
"提交时间"
>
</el-table-column>
</el-table>
</el-table>
<page
:total=
"total"
:limit=
"limit"
@
pageChange=
"onRecordPageChange"
@
sizeChange=
"onRecordSizeChange"
/>
<page
:total=
"total"
:limit=
"limit"
@
pageChange=
"onRecordPageChange"
@
sizeChange=
"onRecordSizeChange"
/>
</el-tab-pane>
</el-tab-pane>
...
@@ -617,6 +588,7 @@
...
@@ -617,6 +588,7 @@
order_coupon_id
:
''
order_coupon_id
:
''
}
,
}
,
refundDetail
:
{
refundDetail
:
{
user_id
:
''
,
show
:
false
,
show
:
false
,
out_trade_no
:
''
out_trade_no
:
''
}
,
}
,
...
@@ -881,6 +853,7 @@
...
@@ -881,6 +853,7 @@
}
,
}
,
showRef
(
data
)
{
showRef
(
data
)
{
this
.
refundDetail
.
show
=
true
;
this
.
refundDetail
.
show
=
true
;
this
.
refundDetail
.
user_id
=
data
.
user_id
||
''
;
this
.
refundDetail
.
out_trade_no
=
data
.
out_trade_no
;
this
.
refundDetail
.
out_trade_no
=
data
.
out_trade_no
;
}
,
}
,
showCoupon
(
data
)
{
showCoupon
(
data
)
{
...
...
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