diff --git a/apps/shopping/controllers/pay.js b/apps/shopping/controllers/pay.js index fabfd23..659505d 100644 --- a/apps/shopping/controllers/pay.js +++ b/apps/shopping/controllers/pay.js @@ -10,6 +10,13 @@ const PayService = require('../models/pay'); const Pay = { online: (req, res, next) => { + res.render('pay', Object.assign({ + module: 'shopping', + page: 'pay', + title: '支付页面' + }, { + + })); } }; diff --git a/apps/shopping/router.js b/apps/shopping/router.js index ac87b72..acdcd7f 100644 --- a/apps/shopping/router.js +++ b/apps/shopping/router.js @@ -31,9 +31,9 @@ router.get('/order/compute', auth, order.compute); router.post('/order/submit', auth, order.orderSub); // 支付 -router.get('/pay/online', auth, pay.online); +router.get('/pay/online', pay.online); // 在线支持完成 -router.get('/pay/online/success', auth, finish.success); +router.get('/pay/online/success', finish.success); module.exports = router; diff --git a/apps/shopping/views/action/pay.hbs b/apps/shopping/views/action/pay.hbs index e69de29..4a87813 100644 --- a/apps/shopping/views/action/pay.hbs +++ b/apps/shopping/views/action/pay.hbs @@ -0,0 +1,63 @@ +{{> sign-header}} + +<div class="center-content payOnlineWrapper"> + <div class="title"> + <div class="content"> + <span class="desc left">订单已提交成功,请您尽快付款!订单编号:{{orderId}}</span> + <span class="cash right">应付金额:{{cash}}</span> + </div> + <div style="clear: both"></div> + <div class="footer"> + <span class="desc left">PADDY.BA<span class="blue">2小时</span>内您无法完成付款,系统会将您的订单取消</span> + <span id="orderDetailCtrl" class="right">收起详情 <span class="iconfont"></span></span> + </div> + + <div class="clearfix"></div> + </div> + + <div class="order-detail"> + <div> 收货地址:{{adress}} </div> + <div> + <div class="item">收货人:{{useName}}</div> + <div class="item">联系人:{{phoneNum}}</div> + </div> + <div> + <div class="item">支付方式:{{payType}}</div> + <div class="item">送货时间:{{deliveryTime}}</div> + </div> + </div> + + <div class="payType"> + <div class="tab"> + <ul> + <li>支付宝等平台</li> + <li>使用银行卡</li> + <li>信用卡支付</li> + </ul> + </div> + + {{# onlinePay}} + <div class="onlinePay"> + {{> pay/onlinePay}} + </div> + {{/onlinePay}} + + {{# debitCard}} + <div class="debitCard"> + {{> pay/debitCard}} + </div> + {{/debitCard}} + + {{# creditCard}} + <div class="creditCard"> + {{> pay/creditCard}} + </div> + {{/creditCard}} + + </div> + + <div class="payCtrl"> + <a class="btn">去{{payType}}支付</a> + </div> + +</div> \ No newline at end of file diff --git a/apps/shopping/views/partial/pay/creditCard.hbs b/apps/shopping/views/partial/pay/creditCard.hbs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/apps/shopping/views/partial/pay/creditCard.hbs diff --git a/apps/shopping/views/partial/pay/debitCard.hbs b/apps/shopping/views/partial/pay/debitCard.hbs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/apps/shopping/views/partial/pay/debitCard.hbs diff --git a/apps/shopping/views/partial/pay/onlinePay.hbs b/apps/shopping/views/partial/pay/onlinePay.hbs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/apps/shopping/views/partial/pay/onlinePay.hbs diff --git a/public/js/shopping/pay.page.js b/public/js/shopping/pay.page.js new file mode 100644 index 0000000..67b6a39 --- /dev/null +++ b/public/js/shopping/pay.page.js @@ -0,0 +1,5 @@ +/** + * Created by TaoHuang on 2016/7/18. + */ + +require('./pay/pay')(); \ No newline at end of file diff --git a/public/js/shopping/pay/pay.js b/public/js/shopping/pay/pay.js new file mode 100644 index 0000000..eb02cd4 --- /dev/null +++ b/public/js/shopping/pay/pay.js @@ -0,0 +1,11 @@ +/** + * Created by TaoHuang on 2016/7/18. + */ + + + + + +module.exports = function(){ + +}; \ No newline at end of file diff --git a/public/scss/shopping/_index.css b/public/scss/shopping/_index.css index 411b5b4..e718a98 100644 --- a/public/scss/shopping/_index.css +++ b/public/scss/shopping/_index.css @@ -10,3 +10,6 @@ /* 支付流程-订单结算 */ @import "order"; + +/* 支付流程-在线支付 */ +@import "pay"; diff --git a/public/scss/shopping/_pay.css b/public/scss/shopping/_pay.css new file mode 100644 index 0000000..7f56a02 --- /dev/null +++ b/public/scss/shopping/_pay.css @@ -0,0 +1,27 @@ +$width:1150px; + +.pay-online-wrapper { + .title { + .content { + width: 100%; + .desc { + + } + + .cash { + } + } + + .footer { + clear: both; + } + } + + .order-detail { + .item { + height: 50px; + } + } + + +} \ No newline at end of file