Merge branch 'develop' into test

@@ -71,8 +71,8 @@ $('#search').on('touchend', function() {
 
 
         if (historys && historys.length > 0) {
         if (historys && historys.length > 0) {
             historys = historys.split(ranToken);
             historys = historys.split(ranToken);
-            for (i = 0; i < historys.length; i++) {
-                history = historys[i];
+            for (i = historys.length; i > 0; i--) {
+                history = historys[i - 1];
 
 
                 if (history === '') {
                 if (history === '') {
                     continue;
                     continue;

@@ -82,6 +82,8 @@ $.ajax({
     }
     }
 });
 });
 
 
-
+if ($('.good-detail-page').length > 0) {
+    $('#yoho-footer').css('border-top', '1px solid #e0e0e0');
+}
 
 
 require('./like');
 require('./like');

@@ -14,15 +14,19 @@ var recommendSwiper,
 
 
 if (preferenceUrl) {
 if (preferenceUrl) {
     $.get(preferenceUrl).then(function(html) {
     $.get(preferenceUrl).then(function(html) {
-        $recommendForYou.html(html).show();
-        if ($('#swiper-recommend').length) {
-            recommendSwiper = new Swiper('#swiper-recommend', {
-                slidesPerView: 'auto',
-                grabCursor: true,
-                slideElement: 'a',
-                lazyLoading: true,
-                watchSlidesVisibility: true
-            });
+        if (html.length < 5) {
+            $recommendForYou.css('display', 'none');
+        } else {
+            $recommendForYou.html(html).show();
+            if ($('#swiper-recommend').length) {
+                recommendSwiper = new Swiper('#swiper-recommend', {
+                    slidesPerView: 'auto',
+                    grabCursor: true,
+                    slideElement: 'a',
+                    lazyLoading: true,
+                    watchSlidesVisibility: true
+                });
+            }
         }
         }
 
 
         window.rePosFooter();
         window.rePosFooter();

@@ -402,6 +402,7 @@ $basicBtnC:#eb0313;
         z-index: 2;
         z-index: 2;
         padding: pxToRem(20px) pxToRem(28px);
         padding: pxToRem(20px) pxToRem(28px);
         text-align: center;
         text-align: center;
+        border-top: 1px solid $borderC;
         a {
         a {
             display: inline-block;
             display: inline-block;
             &.num-incart {
             &.num-incart {
@@ -447,9 +448,9 @@ $basicBtnC:#eb0313;
             }
             }
         }
         }
     }
     }
-    // .recommend-for-you {
-    //     margin-bottom: pxToRem(30px);
-    // }
+    .recommend-for-you{
+        border-bottom: none;
+    }
     .yoho-tip{
     .yoho-tip{
         top:40%;
         top:40%;
     }
     }

@@ -779,7 +779,7 @@ class HomeController extends AbstractAction
     public function payAction()
     public function payAction()
     {
     {
         // 审判跳转登录页
         // 审判跳转登录页
-        $this->auditJumpLogin();
+        //$this->auditJumpLogin();
 
 
         $this->setTitle('支付中心');
         $this->setTitle('支付中心');
         $this->setNavHeader('支付中心');
         $this->setNavHeader('支付中心');

@@ -118,7 +118,7 @@ class LoginController extends AbstractAction
             }
             }
 
 
             /* 调用登录接口进行登录 */
             /* 调用登录接口进行登录 */
-            $data = LoginData::signin($area, $profile, $password);
+            $data = LoginData::signin($area, $profile, $password);  
             if ($data['code'] != 200 || !isset($data['data']['uid'])) {
             if ($data['code'] != 200 || !isset($data['data']['uid'])) {
                 break;
                 break;
             }
             }