Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
1
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
yyq
8 years ago
Commit
32b0ef507094ecd5373aa3dfcd3e022497d34466
2 parents
a0941b8e
8d92f588
Merge branch 'feature/homeInvoice' into release/6.1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
0 deletions
apps/home/models/orders-service.js
apps/home/views/action/invoice.hbs
public/scss/home/_invoice.css
apps/home/models/orders-service.js
View file @
32b0ef5
...
...
@@ -383,6 +383,14 @@ module.exports = class extends global.yoho.BaseModel {
_
.
set
(
newOrder
,
'invoiceOperation.invoiceSupplying'
,
issueType
===
1
);
}
if
(
+
order
.
refund_status
===
1
||
+
order
.
exchange_status
===
1
)
{
Object
.
assign
(
newOrder
,
{
invoiceOperation
:
{
unsupportSupply
:
true
},
unsupportSupplyTip
:
+
order
.
refund_status
===
1
?
'订单商品已申请退货,暂无发票信息'
:
'换货订单暂不支持补开发票'
});
}
if
(
newOrder
.
issueType
)
{
newOrder
.
invoiceType
=
_
.
get
(
order
,
'invoice.type'
,
0
)
===
2
?
'电子发票'
:
'纸质发票'
;
}
...
...
apps/home/views/action/invoice.hbs
View file @
32b0ef5
...
...
@@ -25,6 +25,9 @@
<p
class=
"order-title"
>
{{
title
}}
<span
class=
"order-time"
>
下单时间:
{{
orderTime
}}
</span>
{{#if
unsupportSupplyTip
}}
<span
class=
"right unsupport-tip"
><i
class=
"iconfont"
>

</i>
{{
unsupportSupplyTip
}}
</span>
{{/if}}
</p>
<div
class=
"order-wrap"
>
<ul>
...
...
@@ -104,6 +107,10 @@
{{#if
supplyInvoice
}}
<span
class=
"op-item supply-invoice"
data-id=
"
{{
..
/
orderNum
}}
"
>
申请补开
</span>
{{/if}}
{{#if
unsupportSupply
}}
<span
class=
"op-item on-invoice"
data-id=
"
{{
..
/
orderNum
}}
"
>
不支持补开
</span>
{{/if}}
{{/
invoiceOperation
}}
</div>
</div>
...
...
public/scss/home/_invoice.css
View file @
32b0ef5
...
...
@@ -7,6 +7,19 @@
margin-bottom
:
10px
;
}
.order-title
{
overflow
:
hidden
;
.unsupport-tip
{
color
:
#999
;
.iconfont
{
font-size
:
14px
;
margin
:
0
4px
;
}
}
}
.operation
{
>
.on-invoice
{
color
:
#999
;
...
...
Please
register
or
login
to post a comment