Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
石坚
9 years ago
Commit
693edc63c559e23caaa21334632f4faf9c0b267d
1 parent
e2997034
camel个人中心退换货
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
29 deletions
apps/me/models/order.js
apps/me/models/returns.js
apps/me/views/partial/exchange-detail.hbs
apps/me/views/partial/returns-list.hbs
config/common.js
apps/me/models/order.js
View file @
693edc6
...
...
@@ -151,7 +151,7 @@ const _convertAddress = (addressList, createTime) => {
};
address
.
time
=
addr
.
acceptTime
;
addr
=
addr
.
accept
A
ddress
.
split
(
' '
);
addr
=
addr
.
accept
_a
ddress
.
split
(
' '
);
if
(
addr
.
length
>
1
&&
/市/
.
test
(
addr
[
0
]))
{
address
.
city
=
addr
[
0
].
replace
(
'市'
,
''
);
...
...
apps/me/models/returns.js
View file @
693edc6
...
...
@@ -81,7 +81,7 @@ const getUserReturn = (uid, page) => {
let
paginationOpts
=
false
;
if
(
result
&&
result
.
data
)
{
data
=
camelCase
(
result
.
data
);
data
=
result
.
data
;
//
camelCase(result.data);
paginationOpts
=
data
.
total
>
pageSize
?
{
paginationOpts
:
{
...
...
@@ -93,20 +93,20 @@ const getUserReturn = (uid, page) => {
data
.
list
.
forEach
(
item
=>
{
item
.
orderGoods
=
item
.
goods
;
item
.
createTime
=
item
.
order
CreateT
ime
;
item
.
createTime
=
item
.
order
_create_t
ime
;
item
.
hidePrice
=
true
;
item
.
showStatus
=
true
;
item
.
refundStr
=
refundStr
[
item
.
refundType
];
item
.
detailUrl
=
helpers
.
urlFormat
(
urlIndex
[
item
.
refundType
],
{
item
.
refundStr
=
refundStr
[
item
.
refund_type
];
item
.
detailUrl
=
helpers
.
urlFormat
(
urlIndex
[
item
.
refund_type
],
{
orderCode
:
item
.
id
});
item
.
type
=
typeIndex
[
item
.
refund
T
ype
];
item
.
type
=
typeIndex
[
item
.
refund
_t
ype
];
item
.
orderGoods
.
forEach
(
good
=>
{
let
cnAlphabet
=
good
.
cn
Alphabet
?
good
.
cnA
lphabet
:
''
;
let
cnAlphabet
=
good
.
cn
_alphabet
?
good
.
cn_a
lphabet
:
''
;
good
.
hidePrice
=
true
;
good
.
goodUrl
=
helpers
.
urlFormat
(
`
/
product
/
pro_$
{
good
.
product
Id
}
_$
{
good
.
goodsI
d
}
/${cnAlphabet}.html`
)
; // eslint-disable-lin
e
good
.
goodUrl
=
helpers
.
urlFormat
(
`
/
product
/
pro_$
{
good
.
product
_id
}
_$
{
good
.
goods_i
d
}
/${cnAlphabet}.html`
)
; // eslint-disable-lin
e
});
});
}
...
...
@@ -615,12 +615,12 @@ const getChangeGoodsList = (orderCode, uid) => {
* @return { Object } 模板渲染换货数据
*/
const
_setExchangeDetailData
=
(
data
)
=>
{
data
=
camelCase
(
data
);
//
data = camelCase(data);
let
list
=
{};
switch
(
data
.
status
)
{
case
0
:
if
(
data
.
delivery
TpyeN
ame
===
'寄回换货'
)
{
if
(
data
.
delivery
_tpye_n
ame
===
'寄回换货'
)
{
Object
.
assign
(
list
,
{
audit
:
true
,
reminder
:
true
,
...
...
@@ -646,7 +646,7 @@ const _setExchangeDetailData = (data) => {
location
:
true
});
if
(
data
.
delivery
TpyeN
ame
===
'寄回换货'
)
{
if
(
data
.
delivery
_tpye_n
ame
===
'寄回换货'
)
{
Object
.
assign
(
list
,
{
logistics
:
true
,
sendBack
:
true
,
...
...
@@ -660,7 +660,7 @@ const _setExchangeDetailData = (data) => {
break
;
case
20
:
if
(
data
.
delivery
TpyeN
ame
===
'寄回换货'
)
{
if
(
data
.
delivery
_tpye_n
ame
===
'寄回换货'
)
{
Object
.
assign
(
list
,
{
logistics
:
true
});
...
...
@@ -669,15 +669,15 @@ const _setExchangeDetailData = (data) => {
list
.
reminder
=
true
;
list
.
inDoor
=
true
;
list
.
auditSuccess
=
true
;
list
.
view
=
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
C
ode
}
`
;
list
.
view
=
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
_c
ode
}
`
;
}
break
;
case
30
:
if
(
data
.
delivery
TpyeN
ame
===
'寄回换货'
)
{
if
(
data
.
delivery
_tpye_n
ame
===
'寄回换货'
)
{
list
.
takeGoods
=
true
;
list
.
auditSuccess
=
true
;
list
.
view
=
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
C
ode
}
`
;
list
.
view
=
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
_c
ode
}
`
;
}
else
{
list
.
takeGoods
=
true
;
}
...
...
@@ -687,14 +687,14 @@ const _setExchangeDetailData = (data) => {
send
:
true
,
doubt
:
true
,
auditSuccess
:
true
,
view
:
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
C
ode
}
`
view
:
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
_c
ode
}
`
});
break
;
case
40
:
Object
.
assign
(
list
,
{
finish
:
true
,
auditSuccess
:
true
,
view
:
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
C
ode
}
`
view
:
`
/
me
/
order
/
detail
/
?
orderCode
=
$
{
data
.
order
_c
ode
}
`
});
break
;
case
91
:
...
...
@@ -746,7 +746,7 @@ const getExchangeDetailData = (id, uid) => {
exchangeData
.
exchangeDetail
,
_setReturnStatus
(
data
.
statusList
),
_setExchangeDetailData
(
data
),
camelCase
(
data
)
data
//
camelCase(data)
);
}
...
...
apps/me/views/partial/exchange-detail.hbs
View file @
693edc6
...
...
@@ -135,21 +135,21 @@
</div>
<div
class=
"table"
>
{{#
goods
L
ist
}}
{{#
goods
_l
ist
}}
<div
class=
"table-body"
>
<div
class=
"goods-info"
>
<img
src=
"
{{
image
goods
I
mage
70
90
}}
"
>
<img
src=
"
{{
image
goods
_i
mage
70
90
}}
"
>
<div
class=
"info"
>
<p
class=
"good-name"
>
{{
productName
}}
</p>
<p>
颜色:
{{
colorName
}}
尺码:
{{
sizeName
}}
</p>
<p
class=
"good-name"
>
{{
product_name
}}
</p>
<p>
颜色:
{{
color_name
}}
尺码:
{{
size_name
}}
</p>
<p>
{{
num
}}
</p>
</div>
</div>
<div
class=
"common special-border"
>
<p
class=
"reason"
>
{{
reason
N
ame
}}
</p>
<p
class=
"reason"
>
{{
reason
_n
ame
}}
</p>
</div>
<div
class=
"common special-border operation"
>
<p
class=
"subtext"
>
color:
{{
new
ColorName
}}
<br>
size:
{{
newSizeN
ame
}}
</p>
<p
class=
"subtext"
>
color:
{{
new
_color_name
}}
<br>
size:
{{
new_size_n
ame
}}
</p>
</div>
</div>
{{#if
evidenceImages
}}
...
...
@@ -166,7 +166,7 @@
</div>
</div>
{{/if}}
{{/
goods
L
ist
}}
{{/
goods
_l
ist
}}
</div>
</div>
</div>
...
...
apps/me/views/partial/returns-list.hbs
View file @
693edc6
...
...
@@ -16,7 +16,7 @@
<div
class=
"table-body"
>
{{>
order
/
goods-box
}}
<div
class=
"common-column special-border"
>
<p
class=
"refund-status"
>
{{
status
N
ame
}}
</p>
<p
class=
"refund-status"
>
{{
status
_n
ame
}}
</p>
<p
class=
"subtext badge refund-type"
>
{{
refundStr
}}
</p>
</div>
<div
class=
"common-column special-border operation"
>
...
...
config/common.js
View file @
693edc6
...
...
@@ -22,9 +22,12 @@ module.exports = {
},
cookieDomain
:
'yohoblk.com'
,
domains
:
{
singleApi
:
'http://single.yoho.cn/'
,
api
:
'http://api.yoho.yohoops.org/'
,
service
:
'http://service.yoho.yohoops.org/'
,
// singleApi: 'http://single.yoho.cn/',
// api: 'http://api.yoho.yohoops.org/',
// service: 'http://service.yoho.yohoops.org/',
api
:
'http://dev-api.yohops.com:9999/'
,
service
:
'http://dev-service.yohops.com:9999/'
,
singleApi
:
'http://192.168.102.27:8092/'
,
search
:
'http://search.yohoops.org/yohosearch/'
},
useOneapm
:
false
,
...
...
Please
register
or
login
to post a comment