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

@@ -66,7 +66,8 @@ $consultForm.on('submit', function() {
             isSubmiting = false;
             loading.hideLoadingMask();
         } else {
-            window.history.go(-1);
+            tip.show('提交成功~');
+            setTimeout(window.history.go(-1), 3000);
         }
     }).fail(function() {
         tip.show('网络出了点问题~');

@@ -42,7 +42,6 @@ $basicBtnC:#eb0313;
                     box-sizing: border-box;
                     //padding: pxToRem(20px) pxToRem(12px);
                     padding: 4% 3%;
-                    height:pxToRem(50px);
                     //width: 50%;
                     border-bottom: pxToRem(4px) solid #fff;
                     border-right: pxToRem(4px) solid #fff;

 {{> layout/header}}
-<div class="consult-form-page">
+<div class="consult-form-page yoho-page">
     <form class="consult-form" url="{{formUrl}}">
         <textarea id="content" name="content">请输入咨询内容</textarea>
         <input type="hidden" id="product_id" value="{{productId}}">

@@ -137,7 +137,8 @@ class HomeController extends AbstractAction
         if ($this->isAjax()) {
             $uid = $this->getUid(true);
             $page = $this->post('page', 1);
-            $result = UserModel::getFavBrandData($uid, 10, $page, 10);
+	        $gender = Helpers::getGenderByCookie();
+            $result = UserModel::getFavBrandData($uid, $gender, $page, 10);
         }
 
         if (empty($result)) {

@@ -248,7 +248,7 @@ class UserModel
                 $product = array();
                 foreach ($val['new_product'] as $one) {
                     $product = array();
-	                $product['link'] = isset($val['goodsList'][0]) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsList'][0]['id'] . '/' . $val['cnAlphabet'] . '.html') : '';
+	                $product['link'] = isset($one['goods'][0]) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
                     $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
                     $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;