Merge branch 'release/4.9.1.0'

@@ -108,7 +108,7 @@
         color: #444;
         color: #444;
         font-size: 22px;
         font-size: 22px;
         line-height: 30px;
         line-height: 30px;
-        height: 55px;
+        height: 50px;
         padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */        
         padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */        
     }
     }
     .price {
     .price {

@@ -109,7 +109,7 @@
     a.students-btn {
     a.students-btn {
         float: right;
         float: right;
         background: #d10922;
         background: #d10922;
-        width: 150px;
+        padding: 2px 20px;
         border-radius: 45px;
         border-radius: 45px;
         height: 45px;
         height: 45px;
         line-height: 45px;
         line-height: 45px;

@@ -283,4 +283,15 @@
         padding-left: 0.375rem;
         padding-left: 0.375rem;
         padding-top: 0.2rem;
         padding-top: 0.2rem;
     }
     }
+
+    .students-container {
+        padding-left: 0;
+
+        .good-info{
+            margin: 10px 0 40px;
+            width: 50%;
+            padding: 0 10px 0 15px;
+            box-sizing: border-box;
+        }
+    }
 }
 }

@@ -98,7 +98,7 @@
             </a>
             </a>
         </li>
         </li>
     </ul>
     </ul>
-    <div id="goods-container" class="goods-container">
+    <div id="goods-container" class="goods-container {{#if students}} students-container {{/if}}">
         <div class="new-goods container clearfix"></div>
         <div class="new-goods container clearfix"></div>
         <div class="price-goods container clearfix hide"></div>
         <div class="price-goods container clearfix hide"></div>
         <div class="discount-goods container clearfix hide"></div>
         <div class="discount-goods container clearfix hide"></div>

@@ -242,15 +242,20 @@ class SearchController extends AbstractAction
         // 搜索列表将最新改成默认的标识
         // 搜索列表将最新改成默认的标识
         $data['isSearch'] = true;
         $data['isSearch'] = true;
 
 
-
         if (isset($condition['students'])) {
         if (isset($condition['students'])) {
-
             // 获取用户信息判断是否为学生
             // 获取用户信息判断是否为学生
-            $data['students'] = Helpers::url('/activity/student/register');
             if ($uid) {
             if ($uid) {
                 $userInfo = UserData::userData($uid);
                 $userInfo = UserData::userData($uid);
                 if ($userInfo['code'] === 200 && isset($userInfo['data']['vip_info']['is_student']) && $userInfo['data']['vip_info']['is_student'] === 1) {
                 if ($userInfo['code'] === 200 && isset($userInfo['data']['vip_info']['is_student']) && $userInfo['data']['vip_info']['is_student'] === 1) {
                     $data['students'] = '';
                     $data['students'] = '';
+                } else {
+                    $data['students'] = Helpers::url('/activity/student/register');
+                }
+            } else {
+                if ($isApp) {
+                    $data['students'] = '/signin.html?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"http://m.yohobuy.com/activity/student/register","antarget":"1"}}}';
+                } else {
+                    $data['students'] = Helpers::url('/signin.html?refer=//m.yohobuy.com/activity/student/register');
                 }
                 }
             }
             }
             $data['showDownloadApp'] = false;
             $data['showDownloadApp'] = false;