Authored by Rock Zhang

修复默认选中的支付方式为在线支付

framework @ e9d066dd
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec
@@ -130,9 +130,9 @@ @@ -130,9 +130,9 @@
130 130
131 <ul class="pay-mode"> 131 <ul class="pay-mode">
132 {{# paymentWay}} 132 {{# paymentWay}}
133 - <li class="{{#if default}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}"> 133 + <li class="{{#if recommend}}default{{/if}}" data-pay-type="{{paymentType}}" data-pay-id="{{id}}">
134 <span class="iconfont"> 134 <span class="iconfont">
135 - {{#if default}} 135 + {{#if recommend}}
136 &#xe62f; 136 &#xe62f;
137 {{else}} 137 {{else}}
138 &#xe62e; 138 &#xe62e;
@@ -420,7 +420,10 @@ class CartModel @@ -420,7 +420,10 @@ class CartModel
420 $onePay['id'] = $pay['payment_id']; 420 $onePay['id'] = $pay['payment_id'];
421 $onePay['paymentType'] = $pay['payment_type']; 421 $onePay['paymentType'] = $pay['payment_type'];
422 $onePay['name'] = $pay['payment_type_name']; 422 $onePay['name'] = $pay['payment_type_name'];
423 - $onePay['default'] = ($pay['default'] === 'Y'); 423 +// $onePay['default'] = ($pay['default'] === 'Y');
  424 + if ($onePay['paymentType'] == 1) {
  425 + $onePay['recommend'] = true;
  426 + }
424 427
425 $result['paymentWay'][] = $onePay; 428 $result['paymentWay'][] = $onePay;
426 } 429 }
@@ -268,8 +268,8 @@ class IndexController extends AbstractAction @@ -268,8 +268,8 @@ class IndexController extends AbstractAction
268 // 审判跳转登录页 268 // 审判跳转登录页
269 $this->auditJumpLogin(); 269 $this->auditJumpLogin();
270 270
271 - $this->setTitle('购物车');  
272 - $this->setNavHeader('购物车'); 271 + $this->setTitle('确认订单');
  272 + $this->setNavHeader('确认订单');
273 273
274 // 购物车商品为空跳转到购物车页面 274 // 购物车商品为空跳转到购物车页面
275 $shoppingKey = Helpers::getShoppingKeyByCookie(); 275 $shoppingKey = Helpers::getShoppingKeyByCookie();