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
xuqi
9 years ago
Commit
fe8931cc5c331d226e04a461d88bae26708b7198
1 parent
3635cf59
remove el invoice
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
9 deletions
apps/shopping/models/order.js
apps/shopping/views/action/order.hbs
public/js/shopping/order.page.js
public/scss/shopping/_order.css
apps/shopping/models/order.js
View file @
fe8931c
...
...
@@ -96,7 +96,7 @@ const compute = (uid, yohoCoin) => {
};
/**
* 提交订单
* 提交订单
(电子发票)
* @param number uid user id
* @param number address_id 地址id
* @param number yohoCoin 使用的有货币
...
...
@@ -111,6 +111,37 @@ const compute = (uid, yohoCoin) => {
* @param number payment_id 支付id
* @param number payment_type 支付类型
*/
// const _submitElInvoice = (uid, other) => api.get('', {
// method: 'app.Shopping.submit',
// uid: uid,
// address_id: other.address_id,
// yohoCoin: other.yohoCoin,
// invoices_type: other.invoices_type,
// invoices_title: other.invoices_title,
// invoices_content: other.invoices_content,
// recevierMobile: other.recevierMobile,
// remark: other.remark,
// isPrintPrice: other.isPrintPrice,
// delivery_time: other.delivery_time,
// delivery_way: other.delivery_way,
// payment_id: other.payment_id,
// payment_type: other.payment_type
// });
/**
* 提交订单
* @param number uid user id
* @param number address_id 地址id
* @param number yohoCoin 使用的有货币
* @param string invoices_title 发票抬头
* @param int invoices_type_id 发票内容
* @param string remark 备注
* @param boolean isPrintPrice 是否打印价格
* @param number delivery_time 送货时间
* @param number delivery_way 送货方式(1-普通,2-顺丰)
* @param number payment_id 支付id
* @param number payment_type 支付类型
*/
const
_submit
=
(
uid
,
other
)
=>
api
.
get
(
''
,
{
method
:
'app.Shopping.submit'
,
uid
:
uid
,
...
...
apps/shopping/views/action/order.hbs
View file @
fe8931c
...
...
@@ -241,12 +241,12 @@
<script
id=
"invoice-dialog-tpl"
type=
"text/html"
>
<p class="dialog-title">发票信息</p>
<ul class="invoice-tab">
<li class="btn el-invoice">电子发票</li>
<li class="btn paper-invoice no-focus">纸质发票</li>
<li class="btn el-invoice no-focus hide">电子发票</li>
<li class="btn paper-invoice">纸质发票</li>
</ul>
<div class="invoice-entity el">
<p class="tip">
<p class="tip
hide
">
※ 电子发票是税务局认可的有效凭证,其法律效力、基本用途及使用规定同纸质发票,如需纸质发票可自行下载。
<a class="what-is-el-invoice" href="" target="_blank">什么是电子发票</a>
</p>
...
...
@@ -289,7 +289,7 @@
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"row phone-row clearfix"
>
<
div
class
=
"row phone-row clearfix
hide
"
>
<
span
class
=
"label"
>
<
em
class
=
"required-mark"
>*<
/em
>
收票人手机:
...
...
public/js/shopping/order.page.js
View file @
fe8931c
...
...
@@ -196,10 +196,13 @@ $('#submit-order').click(function() {
$invoiceDetail
=
$invoice
.
find
(
'.invoice-detail'
);
$
.
extend
(
reqParam
,
{
invoices_type
:
$invoiceDetail
.
data
(
'type'
),
// 电子发票
// invoices_type: $invoiceDetail.data('type'),
// invoices_title: $invoiceDetail.data('title'),
// invoices_content: $invoiceDetail.data('content'),
// recevierMobile: $invoiceDetail.data('phone')
invoices_title
:
$invoiceDetail
.
data
(
'title'
),
invoices_content
:
$invoiceDetail
.
data
(
'content'
),
recevierMobile
:
$invoiceDetail
.
data
(
'phone'
)
invoices_type_id
:
$invoiceDetail
.
data
(
'content'
)
});
}
...
...
public/scss/shopping/_order.css
View file @
fe8931c
...
...
@@ -430,7 +430,7 @@
display
:
inline-block
;
width
:
40px
;
height
:
20px
;
line-height
:
18
px
;
line-height
:
20
px
;
}
}
...
...
Please
register
or
login
to post a comment