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

@@ -49,9 +49,9 @@
                                 {{count}}张可用
                                 {{count}}张可用
                             </span>
                             </span>
 
 
-                            {{#if name}}
-                                <span class="used coupon-use" data-name="{{name}}">
-                                    {{name}}
+                            {{#if couponName}}
+                                <span class="used coupon-use" data-name="{{couponName}}">
+                                    {{couponName}}
                                     <i class="iconfont">&#xe614;</i>
                                     <i class="iconfont">&#xe614;</i>
                                 </span>
                                 </span>
                             {{^}}
                             {{^}}

@@ -488,7 +488,7 @@ class CartModel
 
 
             // 优惠券数据
             // 优惠券数据
             $coupons = array();
             $coupons = array();
-            !empty($orderCompute['coupon_amount']) && $coupons['name'] = $orderInfo['couponName'];
+            !empty($orderCompute['coupon_amount']) && $coupons['couponName'] = $orderInfo['couponName'];
             $coupons += self::getCouponList($uid, true);
             $coupons += self::getCouponList($uid, true);
             $result['coupon'] = $coupons;
             $result['coupon'] = $coupons;
         }
         }

@@ -271,7 +271,7 @@ class IndexController extends AbstractAction
         $this->auditJumpLogin();
         $this->auditJumpLogin();
 
 
         $this->setTitle('确认订单');
         $this->setTitle('确认订单');
-        $this->setNavHeader('确认订单', true, false); // 不显示右上角home按钮
+        $this->setNavHeader('确认订单', Helpers::url('/cart/index/index'), false); // 不显示右上角home按钮
 
 
         // 购物车商品为空跳转到购物车页面
         // 购物车商品为空跳转到购物车页面
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $shoppingKey = Helpers::getShoppingKeyByCookie();