Authored by 郭成尧

wechat-url-handle

... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-01-03 17:42:41
* @Last Modified by: Targaryen
* @Last Modified time: 2017-01-09 16:35:53
* @Last Modified time: 2017-01-09 17:53:16
*/
'use strict';
... ... @@ -171,7 +171,7 @@ const Wechat = {
let resParams = {
appId: unifiedOrderResult.appid,
timeStamp: Date.parse(new Date()),
timeStamp: parseInt(Date.parse(new Date()) / 1000, 10),
nonceStr: nonceStr,
package: 'prepay_id=' + unifiedOrderResult.prepay_id,
signType: 'MD5',
... ...
... ... @@ -28,6 +28,7 @@ router.get('/paySuccess/payCod', payController.payCod);// 支付成功,货到
router.get('/index/new/pay', authMW, payController.payCenter);// 支付中心
router.get('/index/new/pay/goalipay', authMW, payController.goAlipay);// 跳支付宝支付
router.get('/pay/wechatwapapi', authMW, payController.goAlipay);// 微信支付,与现有的保持一致
router.get('/index/new/pay/aliwapreturn', authMW, payController.payAli);// 支付宝付款支付成功
router.get('/index/new/orderEnsure', authMW, order.orderEnsure); // 订单结算
... ...
... ... @@ -142,7 +142,7 @@ const _getOrderStatus = (order, showLogistics) => {
/* 待付款 */
Object.assign(result, {
unpaid: true,
payUrl: helpers.urlFormat('/home/orders/pay', {order_code: order.order_code})
payUrl: helpers.urlFormat('/cart/index/new/pay', {order_code: order.order_code})
});
break;
case 1:
... ...
... ... @@ -29,6 +29,8 @@ const suggest = require(`${cRoot}/suggest`);
const message = require(`${cRoot}/message`);
const onlineService = require(`${cRoot}/onlineService`);
const payController = require('../cart/controllers/pay');
// const myDetail = require(`${cRoot}/myDetail);
... ... @@ -132,4 +134,7 @@ router.get('/installment/card-detail', installment.cardDetail); // 银行å¡è¯¦æ
router.get('/installment/delBankCard', installment.delBankCard); // 删除绑定
router.get('/installment/setMasterCard', installment.setMasterCard); // 切换主卡
// 支付中心 URL,与现有的保持一致
router.get('/orders/pay', auth, payController.payCenter);
module.exports = router;
... ...
... ... @@ -19,6 +19,9 @@ module.exports = app => {
app.use('/activity', require('./apps/activity'));
app.use('/cart', require('./apps/cart'));
// 微信支付的 URL 处理
app.use('/shopping', require('./apps/cart'));
// 分期付款
app.use('/home', require('./apps/home'));
... ...
... ... @@ -88,7 +88,7 @@ function callpay(orderCode) {
} else {
$.ajax({
type: 'GET',
url: '/cart/index/new/pay/goalipay',
url: '/shopping/pay/wechatwapapi',
data: {
order_code: orderCode,
payment: '22_platform',
... ...