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

@@ -6,16 +6,6 @@
     // border-bottom: 1px solid #ccc;
     // border-bottom: 1px solid #ccc;
     margin-top: 30rem / $pxConvertRem;
     margin-top: 30rem / $pxConvertRem;
 
 
-    &:before {
-        content: '';
-        position: absolute;
-        border-top: 1px solid #ccc;
-        left: 0;
-        top: 80rem / $pxConvertRem;
-        width: 640rem / $pxConvertRem;
-        height: 0;
-    }
-
     .title {
     .title {
         height: 104rem / $pxConvertRem;
         height: 104rem / $pxConvertRem;
         font-size: 38rem / $pxConvertRem;
         font-size: 38rem / $pxConvertRem;
@@ -36,6 +26,15 @@
         height: 60rem / $pxConvertRem;
         height: 60rem / $pxConvertRem;
         padding: 10rem / $pxConvertRem 0;
         padding: 10rem / $pxConvertRem 0;
         background-color: #fff;
         background-color: #fff;
+        &:before {
+            content: '';
+            position: absolute;
+            border-top: 1px solid #ccc;
+            left: 0;
+            top: 80rem / $pxConvertRem;
+            width: 640rem / $pxConvertRem;
+            height: 0;
+        }
     }
     }
 
 
     .maybe-like-nav-item {
     .maybe-like-nav-item {

@@ -196,11 +196,11 @@ class NewsaleModel
         if (USE_CACHE) {
         if (USE_CACHE) {
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             if (empty($result)) {
             if (empty($result)) {
-                $result = Cache::get(CacheConfig::KEY_ACTION_PRODUCT_NEWSALE_INDEX_BOYS, 'slave');
+                $result = Cache::get($cacheKey, 'slave');
             }
             }
             // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
             else {
-                Cache::set(CacheConfig::KEY_ACTION_PRODUCT_NEWSALE_INDEX_BOYS, $result);
+                Cache::set($cacheKey, $result);
             }
             }
         }
         }