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

@@ -1243,6 +1243,6 @@
             'cartInfo' : {
             'cartInfo' : {
                     'numInCart' : 3,
                     'numInCart' : 3,
                     'goodsInstore' : 0,
                     'goodsInstore' : 0,
-                    ''
+                    'isCollect':true
             }
             }
         }
         }

@@ -11,7 +11,7 @@ var goodsSwiper;
 
 
 require('./desc');
 require('./desc');
 require('./comments-consults');
 require('./comments-consults');
-require('./like.js');
+require('./like');
 require('../recommend-for-you.js');
 require('../recommend-for-you.js');
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
@@ -50,6 +50,4 @@ $('.goodsDiscount .dropdown').on('click', function() {
         $('.goodsDiscount .first-item span').html('');
         $('.goodsDiscount .first-item span').html('');
         $('.goodsDiscount .discount-folder').slideUp();
         $('.goodsDiscount .discount-folder').slideUp();
     }
     }
-});
-
-
+});

@@ -7,7 +7,7 @@ var $ = require('jquery'),
      Hammer = require('yoho.hammer'),
      Hammer = require('yoho.hammer'),
      tip = require('../../plugin/tip');
      tip = require('../../plugin/tip');
 
 
-var likeHammer = new Hammer('#likeBtn');
+var likeHammer = new Hammer(document.getElementById('likeBtn'));
 
 
 likeHammer.on('tap', function(e) {
 likeHammer.on('tap', function(e) {
     var productId = $('#productId').val(),
     var productId = $('#productId').val(),
@@ -40,4 +40,9 @@ likeHammer.on('tap', function(e) {
             tip.show('网络断开连接了~');
             tip.show('网络断开连接了~');
         }
         }
     });
     });
+
+});
+
+$('#likeBtn').on('click', function(e) {
+    return false;
 });
 });

@@ -2,7 +2,7 @@
 <div class="good-detail-page yoho-page">
 <div class="good-detail-page yoho-page">
     <div class="banner-container">
     <div class="banner-container">
         <div class="tag-container">
         <div class="tag-container">
-            <p class="good-tag soonSoldOut-tag">即将售罄</p>
+            <!-- <p class="good-tag soonSoldOut-tag">即将售罄</p> -->
             {{# tags}}
             {{# tags}}
                 {{# is_new}}
                 {{# is_new}}
                     <p class="good-tag new-tag">NEW</p>
                     <p class="good-tag new-tag">NEW</p>
@@ -118,10 +118,10 @@
         {{else}}
         {{else}}
         <a href="" class="sold-out">已售罄</a>
         <a href="" class="sold-out">已售罄</a>
         {{/if}}
         {{/if}}
-        {{#if favorite}}
-        <a href="" id="likeBtn" class="favorite iconfont liked">&#xe605;</a>
+        {{#if isCollect}}
+        <a href="#" id="likeBtn" class="favorite iconfont liked">&#xe605;</a>
         {{else}}
         {{else}}
-        <a href="" class="favorite iconfont">&#xe605;</a>
+        <a href="" id="likeBtn" class="favorite iconfont">&#xe605;</a>
         {{/if}}
         {{/if}}
     </div>
     </div>
     {{/cartInfo}}
     {{/cartInfo}}

@@ -38,7 +38,7 @@
             <div class="question">
             <div class="question">
                 <span class="iconfont">&#xe639;</span>
                 <span class="iconfont">&#xe639;</span>
                 <p>
                 <p>
-                    {{question}}
+                    {{question}}<br>
                     <span class="time">{{time}}</span>
                     <span class="time">{{time}}</span>
                 </p>
                 </p>
             </div>
             </div>

@@ -203,6 +203,12 @@ class DetailModel
                 'goodsInstore' => $baseInfo['storage'],
                 'goodsInstore' => $baseInfo['storage'],
             );
             );
             
             
+            // 是否收藏
+            $result['isCollect'] = false;
+            if (isset($baseInfo['isCollect']) && $baseInfo['isCollect'] === 'Y') {
+                $result['isCollect'] = true;
+            }
+            
             // 底部简介的URL链接
             // 底部简介的URL链接
             $result['introUrl'] = Helpers::url('/product/intro_' . $baseInfo['erpProductId'] . '/' . $baseInfo['cnAlphabet'] . '.html');
             $result['introUrl'] = Helpers::url('/product/intro_' . $baseInfo['erpProductId'] . '/' . $baseInfo['cnAlphabet'] . '.html');
             $result['id'] = $productId;
             $result['id'] = $productId;

@@ -17,12 +17,10 @@ class DetailController extends AbstractAction
     public function indexAction()
     public function indexAction()
     {
     {
         $productId = $this->param('productId');
         $productId = $this->param('productId');
-        $productId = 22399;
         if (!is_numeric($productId)) {
         if (!is_numeric($productId)) {
             $this->error();
             $this->error();
         }
         }
         $goodsId = $this->param('goodsId');
         $goodsId = $this->param('goodsId');
-        $goodsId = 32443;
         if (!is_numeric($goodsId)) {
         if (!is_numeric($goodsId)) {
             $this->error();
             $this->error();
         }
         }