fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 20bdcb970fbbbc6d69ca373ea337c82fc867554e 1 parent 9ac84506

bug-fiexd

Inline Side-by-side
Showing 3 changed files with 6 additions and 5 deletions
@@ -30,6 +30,7 @@ router.get('/index/new/pay', authMW, payController.pay);// 统一支付 URL， @@ -30,6 +30,7 @@ router.get('/index/new/pay', authMW, payController.pay);// 统一支付 URL，
30 router.get('/index/new/pay/alipayresult', authMW, payController.payAli);// 支付宝付款支付成功 30 router.get('/index/new/pay/alipayresult', authMW, payController.payAli);// 支付宝付款支付成功
31 31
32 router.get('/index/new/orderEnsure', authMW, order.orderEnsure); // 订单结算 32 router.get('/index/new/orderEnsure', authMW, order.orderEnsure); // 订单结算
  33 +router.get('/index/new/fast', authMW, order.orderEnsure); // 快速结算
33 router.get('/index/new/selectCoupon', authMW, order.selectCoupon); // 选择优惠券 页面 34 router.get('/index/new/selectCoupon', authMW, order.selectCoupon); // 选择优惠券 页面
34 router.get('/index/new/couponList', order.couponList); // [ajax]获取优惠券列表 35 router.get('/index/new/couponList', order.couponList); // [ajax]获取优惠券列表
35 router.post('/index/new/couponSearch', order.couponSearch); // [ajax]购物车输入优惠券码使用优惠券 36 router.post('/index/new/couponSearch', order.couponSearch); // [ajax]购物车输入优惠券码使用优惠券
@@ -42,7 +42,7 @@ exports.address = (req, res, next) => { @@ -42,7 +42,7 @@ exports.address = (req, res, next) => {
42 */ 42 */
43 exports.addressAct = (req, res, next) => { 43 exports.addressAct = (req, res, next) => {
44 addressModel.address({ 44 addressModel.address({
45 - id: decodeURIComponent(req.query.id), 45 + id: req.query.id ? decodeURIComponent(req.query.id) : null,
46 uid: req.user.uid 46 uid: req.user.uid
47 }).then(result => { 47 }).then(result => {
48 let responseData = { 48 let responseData = {
@@ -53,7 +53,7 @@ exports.addressAct = (req, res, next) => { @@ -53,7 +53,7 @@ exports.addressAct = (req, res, next) => {
53 navBtn: false, 53 navBtn: false,
54 backUrl: false 54 backUrl: false
55 }), 55 }),
56 - title: result.navTitle 56 + title: result && result.navTitle
57 }; 57 };
58 58
59 res.render('address/address-act', Object.assign(responseData, result)); 59 res.render('address/address-act', Object.assign(responseData, result));
@@ -17,13 +17,13 @@ module.exports = { @@ -17,13 +17,13 @@ module.exports = {
17 assetUrl: '//127.0.0.1:5001', 17 assetUrl: '//127.0.0.1:5001',
18 testCode: 'yoho4946abcdef#$%&!@', 18 testCode: 'yoho4946abcdef#$%&!@',
19 domains: { 19 domains: {
20 - api: 'http://api-test3.yohops.com:9999/', 20 + // api: 'http://api-test3.yohops.com:9999/',
21 // service: 'http://service-test3.yohops.com:9999/', 21 // service: 'http://service-test3.yohops.com:9999/',
22 // liveApi: 'http://testapi.live.yohops.com:9999/', 22 // liveApi: 'http://testapi.live.yohops.com:9999/',
23 // singleApi: 'http://api-test3.yohops.com:9999/', 23 // singleApi: 'http://api-test3.yohops.com:9999/',
24 24
25 - // api: 'http://dev-api.yohops.com:9999/',  
26 - service: 'http://service.yoho.cn/', 25 + api: 'http://dev-api.yohops.com:9999/',
  26 + service: 'http://dev-service.yohops.com:9999/',
27 liveApi: 'http://api.live.yoho.cn/', 27 liveApi: 'http://api.live.yoho.cn/',
28 singleApi: 'http://single.yoho.cn/', 28 singleApi: 'http://single.yoho.cn/',
29 29