Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

@@ -12,10 +12,9 @@ const api = global.yoho.API;
 const helper = global.yoho.helpers;
 
 /**
- * 结算页面展示
+ * 结算页面api
  * @param uid 用户id
  */
-
 const _orderApi = uid => api.get('', {
     method: 'app.Shopping.payment',
     'cart_type': 'ordinary', // eslint-disable-line
@@ -23,7 +22,10 @@ const _orderApi = uid => api.get('', {
     uid: uid
 });
 
-
+/**
+ * 结算页面
+ * @param uid [int] user id
+ */
 const index = uid => {
     return _orderApi(uid).then(data => {
         if (data.code === 200) {
@@ -87,7 +89,7 @@ const index = uid => {
 };
 
 /**
- * 结算
+ * 结算api调用
  * @param number uid user id
  * @param number $deliveryWay 配送方式，1表示普通快递，2表示顺丰速运
  * @param int $paymentType 支付方式，1表示在线支付，2表示货到付款
@@ -122,40 +124,7 @@ const compute = (uid, yohoCoin) => {
 };
 
 /**
- * 提交订单(电子发票)api请求
- * @param number uid user id
- * @param number address_id 地址id
- * @param number yohoCoin 使用的有货币
- * @param number invoices_type 发票类型(1-纸质发票，2-电子发票)
- * @param string invoices_title 发票抬头
- * @param int invoices_content 发票内容
- * @param string receiverMobile 收票人手机
- * @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 _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
-// });
-
-/**
- * 提交订单api请求
+ * 提交订单api调用
  * @param number uid user id
  * @param number address_id 地址id
  * @param number yohoCoin 使用的有货币