fe / YOHOBUYWAP · Commits

Go to a project

Authored by yangyang
Commit e67d582b4c0b7fc25a0c05d74ad86b78e5f89523 2 parents 0c88d12f f2e8f693

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

Inline Side-by-side
Showing 4 changed files with 8 additions and 12 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 width: 100%; 3 width: 100%;
4 height: 320rem / $pxConvertRem; 4 height: 320rem / $pxConvertRem;
5 overflow: hidden; 5 overflow: hidden;
6 - padding-top:40rem / $pxConvertRem; 6 + padding-top:80rem / $pxConvertRem;
7 text-align: center; 7 text-align: center;
8 span{ 8 span{
9 font-size: 220rem / $pxConvertRem; 9 font-size: 220rem / $pxConvertRem;
@@ -28,12 +28,12 @@ @@ -28,12 +28,12 @@
28 font-size: 20rem / $pxConvertRem; 28 font-size: 20rem / $pxConvertRem;
29 margin:0 auto; 29 margin:0 auto;
30 color: #b0b0b0; 30 color: #b0b0b0;
31 - padding-top:8rem / $pxConvertRem; 31 + padding-top:16rem / $pxConvertRem;
32 text-align: center; 32 text-align: center;
33 } 33 }
34 .btn-list{ 34 .btn-list{
35 text-align: center; 35 text-align: center;
36 - padding-top: 16rem / $pxConvertRem; 36 + padding-top: 48rem / $pxConvertRem;
37 a{ 37 a{
38 display: inline-block; 38 display: inline-block;
39 width: 35%; 39 width: 35%;
@@ -12,18 +12,15 @@ @@ -12,18 +12,15 @@
12 {{#currencyDetailPage}} 12 {{#currencyDetailPage}}
13 <a href="/home/helpDetail?code=20111130-152530&caption=如何使用YOHO币支付" class="iconfont nav-home">&#xe639;</a> 13 <a href="/home/helpDetail?code=20111130-152530&caption=如何使用YOHO币支付" class="iconfont nav-home">&#xe639;</a>
14 {{/currencyDetailPage}} 14 {{/currencyDetailPage}}
15 - {{#navPhone}}  
16 - <a href="{{.}}" class="iconfont nav-home">&#xe641;</a>  
17 - {{/navPhone}} 15 + {{#serviceUrl}}
  16 + <a href="{{serviceUrl}}" target="_blank" class="iconfont nav-home">&#xe63c;</a>
  17 + {{/serviceUrl}}
18 {{#navTitle}} 18 {{#navTitle}}
19 <p class="nav-title">{{.}}</p> 19 <p class="nav-title">{{.}}</p>
20 {{/navTitle}} 20 {{/navTitle}}
21 {{# suggestSub}} 21 {{# suggestSub}}
22 <span class="nav-btn">提交</span> 22 <span class="nav-btn">提交</span>
23 {{/ suggestSub}} 23 {{/ suggestSub}}
24 - {{#orderEnsure}}  
25 - <a href="{{serviceUrl}}" target="_blank" class="iconfont nav-home">&#xe63c;</a>  
26 - {{/orderEnsure}}  
27 </header> 24 </header>
28 {{#navBtn}} 25 {{#navBtn}}
29 <div class="homebuttom hide {{#if ../boys}} boys{{/if}}{{#if ../girls}} girls{{/if}}{{#if ../kids}} kids{{/if}}{{#if ../lifeStyle}} life-style{{/if}}"> 26 <div class="homebuttom hide {{#if ../boys}} boys{{/if}}{{#if ../girls}} girls{{/if}}{{#if ../kids}} kids{{/if}}{{#if ../lifeStyle}} life-style{{/if}}">
@@ -942,7 +942,7 @@ class HomeController extends AbstractAction @@ -942,7 +942,7 @@ class HomeController extends AbstractAction
942 942
943 $this->_view->display('order-detail', array( 943 $this->_view->display('order-detail', array(
944 'orderDetailPage' => true, 944 'orderDetailPage' => true,
945 - 'navPhone' => 'tel:400-889-9646', 945 + 'serviceUrl' => 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=',
946 'orderDetail' => $orderDetail, 946 'orderDetail' => $orderDetail,
947 'orderCode' => $orderCode, 947 'orderCode' => $orderCode,
948 'orderTotal' => isset($orderDetail['goodsAmount']) ? $orderDetail['goodsAmount'] : 0, 948 'orderTotal' => isset($orderDetail['goodsAmount']) ? $orderDetail['goodsAmount'] : 0,
@@ -327,8 +327,7 @@ class IndexController extends AbstractAction @@ -327,8 +327,7 @@ class IndexController extends AbstractAction
327 $data = array( 327 $data = array(
328 'orderEnsurePage' => true, 328 'orderEnsurePage' => true,
329 'isOrdinaryCart' => ($cartType !== 'advance'), 329 'isOrdinaryCart' => ($cartType !== 'advance'),
330 - 'orderEnsure' => $order,  
331 - 'serviceUrl' => 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=' 330 + 'orderEnsure' => $order
332 ); 331 );
333 332
334 $this->setTitle('确认订单'); 333 $this->setTitle('确认订单');