Authored by 姜枫

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

@@ -26,7 +26,7 @@ const Alipay = { @@ -26,7 +26,7 @@ const Alipay = {
26 _input_charset: 'utf-8', 26 _input_charset: 'utf-8',
27 notify_url: config.pay.serviceNotify + 'payment/alipay_notify', 27 notify_url: config.pay.serviceNotify + 'payment/alipay_notify',
28 return_url: 'http:' + helpers.urlFormat('/shopping/pay/callback/alipay'), 28 return_url: 'http:' + helpers.urlFormat('/shopping/pay/callback/alipay'),
29 - subject: '有货订单号:' + order.orderCode, 29 + subject: 'BLK订单号:' + order.orderCode,
30 out_trade_no: order.orderCode, 30 out_trade_no: order.orderCode,
31 it_b_pay: common.getPayExpireMin(order.payExpire) + 'm', 31 it_b_pay: common.getPayExpireMin(order.payExpire) + 'm',
32 total_fee: order.paymentAmount, 32 total_fee: order.paymentAmount,