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
Plain Diff
Browse Files
Authored by
biao
9 years ago
Commit
0ae67462d5c2977be4c7fce6d17b139832b7f580
2 parents
5191a7f6
71905e70
Merge branch 'release/1.0' of
http://git.yoho.cn/fe/yoho-blk
into release/1.0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
10 deletions
apps/me/models/menu-crumb-handler.js
apps/me/models/returns.js
apps/me/views/action/index.hbs
apps/me/views/partial/exchange-detail.hbs
public/scss/me/_exchange.css
apps/me/models/menu-crumb-handler.js
View file @
0ae6746
...
...
@@ -26,7 +26,13 @@ const getMeThumb = () => {
cache
:
true
,
code
:
200
}).
then
(
result
=>
{
return
result
.
data
.
list
[
0
].
data
[
0
].
src
;
let
thumb
=
{
banner
:
result
.
data
.
list
[
0
].
data
[
0
].
src
,
url
:
result
.
data
.
list
[
0
].
data
[
0
].
url
};
return
thumb
;
});
};
...
...
apps/me/models/returns.js
View file @
0ae6746
...
...
@@ -643,7 +643,7 @@ const _setExchangeDetailData = (data) => {
list
.
reminder
=
true
;
list
.
inDoor
=
true
;
list
.
auditSuccess
=
true
;
list
.
view
=
`
//www.yohoblk.com/me/order/detail
?c
ode=${data.orderCode}`;
list
.
view
=
`
//www.yohoblk.com/me/order/detail
/?orderC
ode=${data.orderCode}`;
}
break
;
...
...
@@ -651,7 +651,7 @@ const _setExchangeDetailData = (data) => {
if
(
data
.
deliveryTpyeName
===
'寄回换货'
)
{
list
.
takeGoods
=
true
;
list
.
auditSuccess
=
true
;
list
.
view
=
`
//www.yohoblk.com/me/order/detail
?c
ode=${data.orderCode}`;
list
.
view
=
`
//www.yohoblk.com/me/order/detail
/?orderC
ode=${data.orderCode}`;
}
else
{
list
.
takeGoods
=
true
;
}
...
...
@@ -661,14 +661,14 @@ const _setExchangeDetailData = (data) => {
send
:
true
,
doubt
:
true
,
auditSuccess
:
true
,
view
:
`
//www.yohoblk.com/me/order/detail
?c
ode=${data.orderCode}`
view
:
`
//www.yohoblk.com/me/order/detail
/?orderC
ode=${data.orderCode}`
});
break
;
case
40
:
Object
.
assign
(
list
,
{
finish
:
true
,
auditSuccess
:
true
,
view
:
`
//www.yohoblk.com/me/order/detail
?c
ode=${data.orderCode}`
view
:
`
//www.yohoblk.com/me/order/detail
/?orderC
ode=${data.orderCode}`
});
break
;
case
91
:
...
...
apps/me/views/action/index.hbs
View file @
0ae6746
...
...
@@ -14,9 +14,11 @@
</li>
{{/
each
}}
</ul>
{{#if
banner
}}
<img
class=
"banner-img"
data-original=
"
{{
image
banner
150
120
}}
"
>
{{/if}}
{{#
banner
}}
<a
href=
"
{{
url
}}
"
>
<img
class=
"banner-img"
data-original=
"
{{
image
banner
150
120
}}
"
>
</a>
{{/
banner
}}
</div>
{{!-- 右侧页面内容 --}}
...
...
apps/me/views/partial/exchange-detail.hbs
View file @
0ae6746
...
...
@@ -157,7 +157,6 @@
<div
class=
"evidence"
>
{{#
evidenceImages
}}
<img
src=
"
{{
image
.
70
90
}}
"
>
<img
src=
"
{{
image
.
70
90
}}
"
>
{{/
evidenceImages
}}
</div>
</div>
...
...
public/scss/me/_exchange.css
View file @
0ae6746
...
...
@@ -76,6 +76,7 @@
.iconfont
{
font-size
:
12px
;
margin-right
:
5px
;
color
:
#219dd6
;
}
}
}
...
...
@@ -203,7 +204,7 @@
margin-bottom
:
8px
;
display
:
-webkit-box
;
overflow
:
hidden
;
-webkit-line-clamp
:
2
;
-webkit-line-clamp
:
1
;
-webkit-box-orient
:
vertical
;
}
}
...
...
Please
register
or
login
to post a comment