Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

@@ -31,7 +31,7 @@ var $input = $('#search-input input'),
     $icon = $('.search-icon'),
     $clear = $('#search-input .clear-input');
 
-var shopId,sort;
+var shopId,sort,brand;
 
 //默认筛选条件
 var defaultOpt = require('./query-param');
@@ -207,6 +207,10 @@ function search(opt) {
         params.sort = sort;
     }
 
+    if (brand) {
+        params.brand = brand;
+    }
+
     $.extend(setting, defaultOpt, params);
 
     searching = true;

@@ -1019,7 +1019,7 @@ class CartModel
                 $newcar = CartData::orderCompute($uid, $cartType, $deliveryId, $paymentType, $paymentType, $couponCode, $yohoCoin, $skuList);
                 if (isset($newcar['data']['package_list'])) {
                     $packageList = $newcar['data']['package_list'];
-                    $result['returnUrl'] = Helpers::url('/cart/index/orderEnsure', array('cartType' => $cartType));
+//                    $result['returnUrl'] = Helpers::url('/cart/index/orderEnsure', array('cartType' => $cartType));
                 }
             }
             else {
@@ -1027,7 +1027,7 @@ class CartModel
                 if (isset($carpay['data']['shopping_cart_data']['package_list'])) {
                     $packageList = $carpay['data']['shopping_cart_data']['package_list'];
                     //返回地址跳转
-                    $result['returnUrl'] = Helpers::url('/cart/index/orderEnsure', array('cartType' => $cartType));
+//                    $result['returnUrl'] = Helpers::url('/cart/index/orderEnsure', array('cartType' => $cartType));
                 }
             }
         }
@@ -1037,7 +1037,7 @@ class CartModel
             if (isset($carpay['data']['package_list'])) {
                 $packageList = $carpay['data']['package_list'];
                 //返回地址跳转
-                $result['returnUrl'] = Helpers::url('/home/orderdetail', array('order_code' => $orderCode));
+//                $result['returnUrl'] = Helpers::url('/home/orderdetail', array('order_code' => $orderCode));
             }
         }
         do {

@@ -552,7 +552,7 @@ class IndexController extends AbstractAction
         $data = CartModel::getPackageInfo($uid, $cartType, $skuList, $orderCode, $sessionKey, $deliveryId, $paymentType, $couponCode, $yohoCoin);
 
         $this->setTitle('配送信息');
-        $this->setNavHeader('配送信息', $data['returnUrl'], false); // 不显示右上角home按钮
+        $this->setNavHeader('配送信息'); // 不显示右上角home按钮
         $this->_view->display('jit-detail', $data);
     }