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

@@ -150,7 +150,7 @@ class IndexController extends AbstractAction
     public function giftAction()
     public function giftAction()
     {
     {
         $this->setTitle('赠品');
         $this->setTitle('赠品');
-        $this->setNavHeader('赠品');
+        $this->setNavHeader('赠品', true, false);
 
 
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
@@ -168,7 +168,7 @@ class IndexController extends AbstractAction
     public function advanceBuyAction()
     public function advanceBuyAction()
     {
     {
         $this->setTitle('加价购');
         $this->setTitle('加价购');
-        $this->setNavHeader('加价购');
+        $this->setNavHeader('加价购', true, false);
 
 
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
@@ -420,22 +420,22 @@ class IndexController extends AbstractAction
             $couponCode = $this->post('couponCode', null);
             $couponCode = $this->post('couponCode', null);
             $yohoCoin = $this->post('yohoCoin', 1);
             $yohoCoin = $this->post('yohoCoin', 1);
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoiceTitle, $invoiceId, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin);
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoiceTitle, $invoiceId, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin);
-            
+
             // 记录下单异常的数据
             // 记录下单异常的数据
             if (empty($result)) {
             if (empty($result)) {
                 $message = 'uid:' . $uid . ',addressId:' . $addressId . ',cartType:' . $cartType . ',deliveryTime:' . $deliveryTime
                 $message = 'uid:' . $uid . ',addressId:' . $addressId . ',cartType:' . $cartType . ',deliveryTime:' . $deliveryTime
                               . ',deliveryWay:' . $deliveryWay . 'invoiceTitle:' . $invoiceTitle . ',invoiceId:' . $invoiceId  . ',yohoCoin:' . $yohoCoin
                               . ',deliveryWay:' . $deliveryWay . 'invoiceTitle:' . $invoiceTitle . ',invoiceId:' . $invoiceId  . ',yohoCoin:' . $yohoCoin
                               . ',paymentId:' . $paymentId . ',paymentType:' . $paymentType . ',remark:' . $remark . ',couponCode:' . $couponCode . "\n";
                               . ',paymentId:' . $paymentId . ',paymentType:' . $paymentType . ',remark:' . $remark . ',couponCode:' . $couponCode . "\n";
                 error_log($message, 3, '/Data/logs/php/h5_error/order.' . date('Ym') . '.log');
                 error_log($message, 3, '/Data/logs/php/h5_error/order.' . date('Ym') . '.log');
-            } 
+            }
             // 返回数据
             // 返回数据
             else {
             else {
                 // 提交成功清除Cookie
                 // 提交成功清除Cookie
                 $this->setCookie('order-info', null);
                 $this->setCookie('order-info', null);
-                
+
                 $this->echoJson($result);
                 $this->echoJson($result);
             }
             }
-            
+
             if ($uid && !empty($result['data'])) {
             if ($uid && !empty($result['data'])) {
                 try {
                 try {
                     UnionTrans::set($uid, $result['data']['order_code'], $result['data']['order_amount']);
                     UnionTrans::set($uid, $result['data']['order_code'], $result['data']['order_amount']);