wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by yangyang
Commit 15d4980396f260643685b997ae881a19a9e40225 2 parents a4c11caa 486355b1

Merge branch 'feature/new_customer' of http://git.dev.yoho.cn/web/yohobuy into feature/new_customer

Inline Side-by-side
Showing 9 changed files with 3 additions and 90 deletions
... ... @@ -11065,8 +11065,7 @@ function submitOrder() {
if (payType === 2) {
// 货到付款的进入订单页面
// url = '/home/orderDetail?order_code=' + res.data.order_code;
url = '/cart/index/paySuccess?order_code=' + res.data.order_code;
url = '/home/orderDetail?order_code=' + res.data.order_code;
} else {
url = '/home/orders/pay?order_code=' + res.data.order_code;
}
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -216,8 +216,7 @@ function submitOrder() {
if (payType === 2) {
// 货到付款的进入订单页面
// url = '/home/orderDetail?order_code=' + res.data.order_code;
url = '/cart/index/paySuccess?order_code=' + res.data.order_code;
url = '/home/orderDetail?order_code=' + res.data.order_code;
} else {
url = '/home/orders/pay?order_code=' + res.data.order_code;
}
... ...
@import "good", "chose-panel", "gift-advance-good", "order-ensure", "select-coupon", "select-address", "pay-success";
@import "good", "chose-panel", "gift-advance-good", "order-ensure", "select-coupon", "select-address";
.icon-checkbox:before { content: "\e61c"; }
... ...
.pay-success-page {
.success{
width: 100%;
height: 320rem / $pxConvertRem;
overflow: hidden;
padding-top:80rem / $pxConvertRem;
text-align: center;
span{
font-size: 220rem / $pxConvertRem;
display: inline-block;
color: #b0b0b0;
}
}
.pay-success{
text-align: center;
p{
color: #444;
line-height: 48rem / $pxConvertRem;
font-size: 28rem / $pxConvertRem;
}
span{
color: #f00;
}
}
.message{
width: 66%;
line-height: 32rem / $pxConvertRem;
font-size: 20rem / $pxConvertRem;
margin:0 auto;
color: #b0b0b0;
padding-top:16rem / $pxConvertRem;
text-align: center;
}
.btn-list{
text-align: center;
padding-top: 48rem / $pxConvertRem;
a{
display: inline-block;
width: 35%;
height: 80rem / $pxConvertRem;
line-height: 80rem / $pxConvertRem;
background: #444;
color: #fff;
border-radius: 8rem / $pxConvertRem;
margin:0 8rem / $pxConvertRem;
font-size: 32rem / $pxConvertRem;
}
}
}
\ No newline at end of file
{{> layout/header}}
<div class="yoho-page pay-success-page">
<div class="success">
<span class="iconfont">&#xe648;</span>
</div>
<div class="pay-success">
<p>恭喜您，订单提交成功！</p>
{{#price}}
<p>您需要在收货时向送货员支付<span>¥{{price}}</span></p>
{{/price}}
</div>
<div class="message">预计发货时间：每日16:00之前提交订单当天发货，16:00点之后提交订单次日发货</div>
<div class="btn-list">
<a href="{{guang}}">随便逛逛</a>
<a href="{{orderDetail}}">查看订单</a>
</div>
</div>
{{> layout/footer}}
... ... @@ -539,22 +539,4 @@ class IndexController extends AbstractAction
$this->echoJson($result);
}
/**
* 货到付款页面
*/
public function paySuccessAction()
{
// 设置网站标题
$this->setTitle('支付完成');
$this->setNavHeader('支付完成', false, false);
$orderCode = $this->get('order_code');
$uid = $this->getUid();
if (!$orderCode || !$uid) {
return;
}
$data = CartModel::paySuccessData($orderCode, $uid);
$this->_view->display('pay-success', $data);
}
}
... ...