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

@@ -71,7 +71,13 @@
     background: white;
     background: white;
     border-radius: 5px;
     border-radius: 5px;
     margin-top: -13px;
     margin-top: -13px;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0.5);
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0.5);    
+    &:link,
+    &:visited,
+    &:hover,
+    &:actived {
+        color: #000;
+    }
 }
 }
 
 
 .circle-rightbottom { 
 .circle-rightbottom { 

@@ -39,7 +39,7 @@
             border: none;
             border: none;
             background: transparent;
             background: transparent;
             color: #b2b2b2;
             color: #b2b2b2;
-            font-size: 32rem / $pxConvertRem;
+            font-size: 30rem / $pxConvertRem;
             line-height: 56rem / $pxConvertRem;
             line-height: 56rem / $pxConvertRem;
         }
         }
     }
     }

 {{# goodList}}
 {{# goodList}}
     {{# search}}
     {{# search}}
         <div id="search-input" class="search-input">
         <div id="search-input" class="search-input">
-            <form id="search-form" action={{url}} method="get">
+            <form id="search-form" action="{{url}}" method="get">
                 <i class="search-icon iconfont">&#xe60f;</i>
                 <i class="search-icon iconfont">&#xe60f;</i>
-                <input type="text" value={{default}} name="query">
+                <input type="text" value="{{default}}" name="query">
+                <input type="hidden" value="search" name="search">
                 <i class="clear-input iconfont hide">&#xe61a;</i>
                 <i class="clear-input iconfont hide">&#xe61a;</i>
                 <button id="search" class="search" type="submit">搜索</button>
                 <button id="search" class="search" type="submit">搜索</button>
             </form>
             </form>

@@ -246,6 +246,7 @@ class SearchController extends AbstractAction
 //            $data = Product\ListModel::getClassData($condition);
 //            $data = Product\ListModel::getClassData($condition);
 
 
             $data = Product\SearchModel::getSearchData($condition);
             $data = Product\SearchModel::getSearchData($condition);
+            
         } while (false);
         } while (false);
 
 
         if (empty($data['new'])) {
         if (empty($data['new'])) {

@@ -49,7 +49,7 @@ class SearchModel
         // 处理返回的数据
         // 处理返回的数据
         if (isset($listData['code']) && $listData['code'] === 200) {
         if (isset($listData['code']) && $listData['code'] === 200) {
             $result = ListProcess::getListData($listData['data'], false);
             $result = ListProcess::getListData($listData['data'], false);
-        }
+        } 
 
 
         if (USE_CACHE) {
         if (USE_CACHE) {
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.

@@ -159,7 +159,7 @@ class PlusstarController extends AbstractAction
 
 
             // 相关文章
             // 相关文章
             foreach ($brandInfo['getArticleByBrand'] as $value) {
             foreach ($brandInfo['getArticleByBrand'] as $value) {
-                $data['ps']['infos'][] = Helpers::formatArticle($value, false, false, false, $uid);
+                $data['ps']['infos'][] = Helpers::formatArticle($value, false, $isApp, false, $uid);
             }
             }
 
 
             // 设置头部信息
             // 设置头部信息
@@ -172,7 +172,7 @@ class PlusstarController extends AbstractAction
 
 
             $data['shareLink'] = $defaultUrl;
             $data['shareLink'] = $defaultUrl;
             $data['shareTitle'] = $data['ps']['name'];
             $data['shareTitle'] = $data['ps']['name'];
-            $data['shareDesc'] = (mb_strlen($data['ps']['intro'], 'utf-8') > 800) ? mb_substr($data['ps']['intro'], 0, 800, 'utf-8') . '...' : $data['ps']['intro'];
+            $data['shareDesc'] = (mb_strlen($data['ps']['intro'], 'utf-8') > 120) ? mb_substr($data['ps']['intro'], 0, 120, 'utf-8') . '...' : $data['ps']['intro'];
             $data['shareImg'] = $data['ps']['logo'];
             $data['shareImg'] = $data['ps']['logo'];
 
 
             $brandInfo = array();
             $brandInfo = array();