Merge branch 'develop'

@@ -119,7 +119,7 @@ function rePosFooter() {
 
 
         //未登录
         //未登录
         $op.prepend(
         $op.prepend(
-            '<a href="/signin.html">登录</a>' +
+            '<a href="/signin.html?refer=' + location.href + '">登录</a>' +
             '<span class="sep-line">|</span>' +
             '<span class="sep-line">|</span>' +
             '<a href="/reg.html">注册</a>'
             '<a href="/reg.html">注册</a>'
         );
         );

 .hot-brands {
 .hot-brands {
-    background: #f0f0f0;
     border-bottom: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
+    background: #fff;
+
+    .floor-header {
+        background: #f0f0f0;
+        margin: 0;
+        padding: 29rem / $pxConvertRem 30rem / $pxConvertRem 0;
+        border: 0;
+
+        h2 {
+            border: 1px solid #e0e0e0;
+            background: #fff;
+            border-bottom: 0;
+        }
+    }
 
 
     a {
     a {
         display: block;
         display: block;
@@ -8,10 +21,6 @@
         height: 100%;
         height: 100%;
     }
     }
 
 
-    > * {
-        background: #fff;
-    }
-
     .brand {
     .brand {
         float: left;
         float: left;
         width: 158rem / $pxConvertRem;
         width: 158rem / $pxConvertRem;

@@ -72,6 +72,12 @@
     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 { 

@@ -50,7 +50,7 @@
                 top: 20rem / $pxConvertRem;
                 top: 20rem / $pxConvertRem;
                 width: 352rem / $pxConvertRem;
                 width: 352rem / $pxConvertRem;
                 height: 56rem / $pxConvertRem;
                 height: 56rem / $pxConvertRem;
-                padding-right: 40rem / $pxConvertRem;
+                padding-right: 80rem / $pxConvertRem;
                 z-index: 1;
                 z-index: 1;
                 transition: width 400ms;
                 transition: width 400ms;
                 box-sizing: border-box;
                 box-sizing: border-box;
@@ -59,7 +59,7 @@
             }
             }
             input {
             input {
                 float: left;
                 float: left;
-                width: 100%;
+                width: 96%;
                 font-size: 28rem / $pxConvertRem;
                 font-size: 28rem / $pxConvertRem;
                 padding: 10rem / $pxConvertRem;
                 padding: 10rem / $pxConvertRem;
                 color: #999;
                 color: #999;

@@ -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;
         }
         }
     }
     }

@@ -13,7 +13,7 @@
 {{/if}}
 {{/if}}
 {{#if testEnv}}
 {{#if testEnv}}
 <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"></script>
 <script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"></script>
-<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index.js"></script>
+<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script>
 {{/if}}
 {{/if}}
 {{#if devEnv}}
 {{#if devEnv}}
 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>

 {{# 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">
                 <i class="clear-input iconfont hide">&#xe61a;</i>
                 <i class="clear-input iconfont hide">&#xe61a;</i>

@@ -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'])) {

@@ -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();