Showing
3 changed files
with
6 additions
and
5 deletions
@@ -299,11 +299,13 @@ const orderList = (req, res, next) => { | @@ -299,11 +299,13 @@ const orderList = (req, res, next) => { | ||
299 | // 处理数据,订单只包含第一条物品纪录 | 299 | // 处理数据,订单只包含第一条物品纪录 |
300 | var list = result.data ? result.data.orderList : []; | 300 | var list = result.data ? result.data.orderList : []; |
301 | 301 | ||
302 | + if (list) { | ||
302 | list.forEach((item)=> { | 303 | list.forEach((item)=> { |
303 | item.orderGoods = [ | 304 | item.orderGoods = [ |
304 | item.orderGoods[0] | 305 | item.orderGoods[0] |
305 | ]; | 306 | ]; |
306 | }); | 307 | }); |
308 | + } | ||
307 | 309 | ||
308 | return list; | 310 | return list; |
309 | })()), | 311 | })()), |
@@ -389,7 +391,7 @@ const help = (req, res) => { | @@ -389,7 +391,7 @@ const help = (req, res) => { | ||
389 | }; | 391 | }; |
390 | 392 | ||
391 | // 服务条款静态页面 | 393 | // 服务条款静态页面 |
392 | -const serviceProvision = (req, res) => { | 394 | +const termsOfService = (req, res) => { |
393 | res.render('installment/service-provision', { | 395 | res.render('installment/service-provision', { |
394 | title: '服务条款' | 396 | title: '服务条款' |
395 | }); | 397 | }); |
@@ -435,7 +437,7 @@ module.exports = { | @@ -435,7 +437,7 @@ module.exports = { | ||
435 | orderDetail, | 437 | orderDetail, |
436 | repayDetail, | 438 | repayDetail, |
437 | help, | 439 | help, |
438 | - serviceProvision, | 440 | + termsOfService, |
439 | agreement, | 441 | agreement, |
440 | totalAmount, | 442 | totalAmount, |
441 | checkVerifyCode, | 443 | checkVerifyCode, |
@@ -37,7 +37,7 @@ router.get('/installment/order/:id', installment.orderDetail); | @@ -37,7 +37,7 @@ router.get('/installment/order/:id', installment.orderDetail); | ||
37 | router.get('/installment/total-amount.json', installment.totalAmount); | 37 | router.get('/installment/total-amount.json', installment.totalAmount); |
38 | 38 | ||
39 | router.get('/installment/help', installment.help);// 帮助静态页面 | 39 | router.get('/installment/help', installment.help);// 帮助静态页面 |
40 | -router.get('/installment/service-provision', installment.serviceProvision);// 服务条款静态页面 | 40 | +router.get('/installment/terms-of-service', installment.termsOfService);// 服务条款静态页面 |
41 | router.get('/installment/agreement', installment.agreement);// 服务协议静态页面 | 41 | router.get('/installment/agreement', installment.agreement);// 服务协议静态页面 |
42 | 42 | ||
43 | module.exports = router; | 43 | module.exports = router; |
@@ -55,8 +55,7 @@ | @@ -55,8 +55,7 @@ | ||
55 | <input id="accept-agreements" name="agreements" type="checkbox" class="installment-check-btn"/> | 55 | <input id="accept-agreements" name="agreements" type="checkbox" class="installment-check-btn"/> |
56 | <label for="accept-agreements"> | 56 | <label for="accept-agreements"> |
57 | <span>免费开通,详情请见 | 57 | <span>免费开通,详情请见 |
58 | - <a href="/home/installment/agreement">《有货分期服务协议》</a> & | ||
59 | - <a href="/home/installment/service-provision">《第三方支付协议》</a> | 58 | + <a href="/home/installment/agreement">《有货分期服务协议》&《第三方支付协议》</a> |
60 | </span> | 59 | </span> |
61 | </label> | 60 | </label> |
62 | <div class="clearfix"></div> | 61 | <div class="clearfix"></div> |
-
Please register or login to post a comment