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

@@ -91,7 +91,14 @@ module.exports = function(specificGender) {
                 if (data === ' ') {
                 if (data === ' ') {
                     searching = false;
                     searching = false;
                     loading.hideLoadingMask();
                     loading.hideLoadingMask();
-                    if (gender) {
+
+                    //修复有货币页面最后一条数据显示被遮挡的问题
+                    if (specificGender) {
+                        window.rePosFooter();
+                    }
+
+                    // 有货币页面不加载底部
+                    if (gender && !specificGender) {
                         if (gender === '1,3') {
                         if (gender === '1,3') {
                             url = '/boys/bottomBanner';
                             url = '/boys/bottomBanner';
                         } else {
                         } else {

@@ -11,6 +11,9 @@
 var goodsConsultsEle = $('#goods-consults')[0],
 var goodsConsultsEle = $('#goods-consults')[0],
     goodsConsultsHammer = goodsConsultsEle && new Hammer(goodsConsultsEle);
     goodsConsultsHammer = goodsConsultsEle && new Hammer(goodsConsultsEle);
 
 
+var productId,
+    total;
+
 function showCountPlus($el) {
 function showCountPlus($el) {
     var $count = $el.find('.animate-count');
     var $count = $el.find('.animate-count');
 
 
@@ -24,6 +27,13 @@ function showCountPlus($el) {
     });
     });
 }
 }
 
 
+(function() {
+    var queryStr = window.location.search.substring(1);
+
+    productId = queryStr.split('&')[0].split('=')[1];
+    total = queryStr.split('&')[1] ? queryStr.split('&')[1].split('=')[1] : undefined;
+})();
+
 if (goodsConsultsHammer) {
 if (goodsConsultsHammer) {
 
 
     goodsConsultsHammer.on('tap', function(e) {
     goodsConsultsHammer.on('tap', function(e) {
@@ -45,7 +55,9 @@ if (goodsConsultsHammer) {
                 method: 'post',
                 method: 'post',
                 url: url,
                 url: url,
                 data: {
                 data: {
-                    id: id
+                    id: id,
+                    productId: productId,
+                    total: total
                 }
                 }
             }).done(function(data) {
             }).done(function(data) {
                 if (data.code === 200) {
                 if (data.code === 200) {

 
 
 {{> layout/header}}
 {{> layout/header}}
 <div class="yoho-coin-detail-page yoho-page">
 <div class="yoho-coin-detail-page yoho-page">
-    <div class="money">你拥有的有货币：<span>{{ money}}</span></div>
-
     <ul class="coin-detail"></ul>
     <ul class="coin-detail"></ul>
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}

@@ -6,6 +6,9 @@
     {{#navHome}}
     {{#navHome}}
     <a href="{{.}}" class="iconfont nav-home">&#xe611;</a>
     <a href="{{.}}" class="iconfont nav-home">&#xe611;</a>
     {{/navHome}}
     {{/navHome}}
+    {{#currencyPage}}
+    <a href="/home/help" class="iconfont nav-home">&#xe639;</a>
+    {{/currencyPage}}
     {{#navPhone}}
     {{#navPhone}}
     <a href="{{.}}" class="iconfont nav-home">&#xe641;</a>
     <a href="{{.}}" class="iconfont nav-home">&#xe641;</a>
     {{/navPhone}}
     {{/navPhone}}

@@ -397,7 +397,7 @@ class UserModel
             // 处理数据
             // 处理数据
             foreach ($banner['data'] as $val) {
             foreach ($banner['data'] as $val) {
                 foreach ($val['data'] as $single) {
                 foreach ($val['data'] as $single) {
-                    $result['url'] = '';
+                    $result['url'] = Helpers::getFilterUrl($single['url']);
                     $result['img'] = Helpers::getImageUrl($single['src'], 640, 200);
                     $result['img'] = Helpers::getImageUrl($single['src'], 640, 200);
                 }
                 }
             }
             }

@@ -176,8 +176,8 @@ class DetailController extends AbstractAction
         $result = array();
         $result = array();
 
 
         if ($this->isAjax()) {
         if ($this->isAjax()) {
-            $productId = $this->get('productId', 0);
-            $total = $this->get('total', 0);
+            $productId = $this->post('productId', 0);
+            $total = $this->post('total', 0);
             $uid = $this->getUid();
             $uid = $this->getUid();
             $id = $this->post('id');
             $id = $this->post('id');
             $result = \Product\DetailModel::upvoteConsult($uid, $id, $productId, $total);
             $result = \Product\DetailModel::upvoteConsult($uid, $id, $productId, $total);
@@ -194,8 +194,8 @@ class DetailController extends AbstractAction
         $result = array();
         $result = array();
 
 
         if ($this->isAjax()) {
         if ($this->isAjax()) {
-            $productId = $this->get('productId', 0);
-            $total = $this->get('total', 0);
+            $productId = $this->post('productId', 0);
+            $total = $this->post('total', 0);
             $uid = $this->getUid();
             $uid = $this->getUid();
             $id = $this->post('id');
             $id = $this->post('id');
             $result = \Product\DetailModel::usefulConsult($uid, $id, $productId, $total);
             $result = \Product\DetailModel::usefulConsult($uid, $id, $productId, $total);