Showing
4 changed files
with
43 additions
and
9 deletions
@@ -96,7 +96,7 @@ const compute = (uid, yohoCoin) => { | @@ -96,7 +96,7 @@ const compute = (uid, yohoCoin) => { | ||
96 | }; | 96 | }; |
97 | 97 | ||
98 | /** | 98 | /** |
99 | - * 提交订单 | 99 | + * 提交订单(电子发票) |
100 | * @param number uid user id | 100 | * @param number uid user id |
101 | * @param number address_id 地址id | 101 | * @param number address_id 地址id |
102 | * @param number yohoCoin 使用的有货币 | 102 | * @param number yohoCoin 使用的有货币 |
@@ -111,6 +111,37 @@ const compute = (uid, yohoCoin) => { | @@ -111,6 +111,37 @@ const compute = (uid, yohoCoin) => { | ||
111 | * @param number payment_id 支付id | 111 | * @param number payment_id 支付id |
112 | * @param number payment_type 支付类型 | 112 | * @param number payment_type 支付类型 |
113 | */ | 113 | */ |
114 | +// const _submitElInvoice = (uid, other) => api.get('', { | ||
115 | +// method: 'app.Shopping.submit', | ||
116 | +// uid: uid, | ||
117 | +// address_id: other.address_id, | ||
118 | +// yohoCoin: other.yohoCoin, | ||
119 | +// invoices_type: other.invoices_type, | ||
120 | +// invoices_title: other.invoices_title, | ||
121 | +// invoices_content: other.invoices_content, | ||
122 | +// recevierMobile: other.recevierMobile, | ||
123 | +// remark: other.remark, | ||
124 | +// isPrintPrice: other.isPrintPrice, | ||
125 | +// delivery_time: other.delivery_time, | ||
126 | +// delivery_way: other.delivery_way, | ||
127 | +// payment_id: other.payment_id, | ||
128 | +// payment_type: other.payment_type | ||
129 | +// }); | ||
130 | + | ||
131 | +/** | ||
132 | + * 提交订单 | ||
133 | + * @param number uid user id | ||
134 | + * @param number address_id 地址id | ||
135 | + * @param number yohoCoin 使用的有货币 | ||
136 | + * @param string invoices_title 发票抬头 | ||
137 | + * @param int invoices_type_id 发票内容 | ||
138 | + * @param string remark 备注 | ||
139 | + * @param boolean isPrintPrice 是否打印价格 | ||
140 | + * @param number delivery_time 送货时间 | ||
141 | + * @param number delivery_way 送货方式(1-普通,2-顺丰) | ||
142 | + * @param number payment_id 支付id | ||
143 | + * @param number payment_type 支付类型 | ||
144 | + */ | ||
114 | const _submit = (uid, other) => api.get('', { | 145 | const _submit = (uid, other) => api.get('', { |
115 | method: 'app.Shopping.submit', | 146 | method: 'app.Shopping.submit', |
116 | uid: uid, | 147 | uid: uid, |
@@ -241,12 +241,12 @@ | @@ -241,12 +241,12 @@ | ||
241 | <script id="invoice-dialog-tpl" type="text/html"> | 241 | <script id="invoice-dialog-tpl" type="text/html"> |
242 | <p class="dialog-title">发票信息</p> | 242 | <p class="dialog-title">发票信息</p> |
243 | <ul class="invoice-tab"> | 243 | <ul class="invoice-tab"> |
244 | - <li class="btn el-invoice">电子发票</li> | ||
245 | - <li class="btn paper-invoice no-focus">纸质发票</li> | 244 | + <li class="btn el-invoice no-focus hide">电子发票</li> |
245 | + <li class="btn paper-invoice">纸质发票</li> | ||
246 | </ul> | 246 | </ul> |
247 | 247 | ||
248 | <div class="invoice-entity el"> | 248 | <div class="invoice-entity el"> |
249 | - <p class="tip"> | 249 | + <p class="tip hide"> |
250 | ※ 电子发票是税务局认可的有效凭证,其法律效力、基本用途及使用规定同纸质发票,如需纸质发票可自行下载。 | 250 | ※ 电子发票是税务局认可的有效凭证,其法律效力、基本用途及使用规定同纸质发票,如需纸质发票可自行下载。 |
251 | <a class="what-is-el-invoice" href="" target="_blank">什么是电子发票</a> | 251 | <a class="what-is-el-invoice" href="" target="_blank">什么是电子发票</a> |
252 | </p> | 252 | </p> |
@@ -289,7 +289,7 @@ | @@ -289,7 +289,7 @@ | ||
289 | </div> | 289 | </div> |
290 | </div> | 290 | </div> |
291 | </div> | 291 | </div> |
292 | - <div class="row phone-row clearfix"> | 292 | + <div class="row phone-row clearfix hide"> |
293 | <span class="label"> | 293 | <span class="label"> |
294 | <em class="required-mark">*</em> | 294 | <em class="required-mark">*</em> |
295 | 收票人手机: | 295 | 收票人手机: |
@@ -196,10 +196,13 @@ $('#submit-order').click(function() { | @@ -196,10 +196,13 @@ $('#submit-order').click(function() { | ||
196 | $invoiceDetail = $invoice.find('.invoice-detail'); | 196 | $invoiceDetail = $invoice.find('.invoice-detail'); |
197 | 197 | ||
198 | $.extend(reqParam, { | 198 | $.extend(reqParam, { |
199 | - invoices_type: $invoiceDetail.data('type'), | 199 | + // 电子发票 |
200 | + // invoices_type: $invoiceDetail.data('type'), | ||
201 | + // invoices_title: $invoiceDetail.data('title'), | ||
202 | + // invoices_content: $invoiceDetail.data('content'), | ||
203 | + // recevierMobile: $invoiceDetail.data('phone') | ||
200 | invoices_title: $invoiceDetail.data('title'), | 204 | invoices_title: $invoiceDetail.data('title'), |
201 | - invoices_content: $invoiceDetail.data('content'), | ||
202 | - recevierMobile: $invoiceDetail.data('phone') | 205 | + invoices_type_id: $invoiceDetail.data('content') |
203 | }); | 206 | }); |
204 | } | 207 | } |
205 | 208 |
-
Please register or login to post a comment