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

@@ -3,7 +3,7 @@
 		width: 100%;
 		height: 320rem / $pxConvertRem;
 		overflow: hidden;
-		padding-top:40rem / $pxConvertRem;
+		padding-top:80rem / $pxConvertRem;
 		text-align: center;
 			span{
 				font-size: 220rem / $pxConvertRem;
@@ -28,12 +28,12 @@
 		font-size: 20rem / $pxConvertRem;
 		margin:0 auto;
 		color: #b0b0b0;
-		padding-top:8rem / $pxConvertRem;
+		padding-top:16rem / $pxConvertRem;
 		text-align: center;
 	}
 	.btn-list{
 		text-align: center;
-		padding-top: 16rem / $pxConvertRem;
+		padding-top: 48rem / $pxConvertRem;
 		a{
 			display: inline-block;
 			width: 35%;

@@ -12,18 +12,15 @@
     {{#currencyDetailPage}}
     <a href="/home/helpDetail?code=20111130-152530&caption=如何使用YOHO币支付" class="iconfont nav-home">&#xe639;</a>
     {{/currencyDetailPage}}
-    {{#navPhone}}
-    <a href="{{.}}" class="iconfont nav-home">&#xe641;</a>
-    {{/navPhone}}
+    {{#serviceUrl}}
+    <a href="{{serviceUrl}}" target="_blank" class="iconfont nav-home">&#xe63c;</a>
+    {{/serviceUrl}}
     {{#navTitle}}
     <p class="nav-title">{{.}}</p>
     {{/navTitle}}
     {{# suggestSub}}
     <span class="nav-btn">提交</span>
     {{/ suggestSub}}
-    {{#orderEnsure}}
-    <a href="{{serviceUrl}}" target="_blank" class="iconfont nav-home">&#xe63c;</a>
-    {{/orderEnsure}}
 </header>
 {{#navBtn}}
 <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
 
         $this->_view->display('order-detail', array(
             'orderDetailPage' => true,
-            'navPhone' => 'tel:400-889-9646',
+            'serviceUrl' => 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=',
             'orderDetail' => $orderDetail,
             'orderCode' => $orderCode,
             'orderTotal' => isset($orderDetail['goodsAmount']) ? $orderDetail['goodsAmount'] : 0,

@@ -327,8 +327,7 @@ class IndexController extends AbstractAction
         $data = array(
             'orderEnsurePage' => true,
             'isOrdinaryCart' => ($cartType !== 'advance'),
-            'orderEnsure' => $order,
-            'serviceUrl' => 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info='
+            'orderEnsure' => $order
         );
 
         $this->setTitle('确认订单');