Merge branch 'feature/brandsTree' into 'release/5.4.1'

浏览记录 品类定位



See merge request !300

@@ -101,7 +101,7 @@ exports.record = (req, res, next) => {
 
     indexModel.recordContent(uid, udid, page, limit).then((result) => {
 
-        if (result.browseRecord && result.browseRecord.length > 0) {
+        if (result && result.browseRecord && result.browseRecord.length > 0) {
             responseData.browseRecord = result.browseRecord;
         } else {
             responseData.noRecord = true;

@@ -48,6 +48,10 @@ $nav.on('touchend touchcancel', function(e) {
 
     $contents.addClass('hide');
     $contents.filter(selector).removeClass('hide');
+
+    $('html,body').animate({
+        scrollTop: 0
+    }, 100);
 });
 
 $categoryContainer.on('click', function(e) {

@@ -70,7 +70,6 @@
     }
 
     .content-index {
-
         .search {
             width: 100%;
             height: 88px;
@@ -190,7 +189,7 @@
 
     .list-box {
         position: fixed;
-        width: 35px;
+        width: 38px;
         margin: 0;
         padding: 6px 0;
         right: 0;
@@ -206,9 +205,10 @@
             width: 100%;
 
             a {
-                font-size: 26px;
+                font-size: 27px;
                 display: inline-block;
                 width: 100%;
+                padding: 1px 0;
             }
         }
     }
@@ -256,85 +256,6 @@
         display: none;
     }
 
-    /*.category-content {
-        .category-container {
-            margin-bottom: 100px;
-        }
-
-        .content {
-            background: #f8f8f8;
-            overflow: hidden;
-            position: relative;
-
-            &.hide {
-                display: none;
-            }
-        }
-
-        .primary-level {
-            float: left;
-            box-sizing: border-box;
-            width: 45%;
-
-            > li {
-                height: 89px;
-                line-height: 89px;
-                padding: 0 32px;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-
-                &.focus {
-                    background-color: #fff;
-                }
-
-                &.highlight {
-                    background-color: #eee;
-                }
-            }
-        }
-
-        .sub-level-container {
-            float: left;
-            overflow-x: auto;
-            box-sizing: border-box;
-            background: #fff;
-            width: 55%;
-            height: 100%;
-        }
-
-        .sub-level {
-            width: 100%;
-
-            &.hide {
-                display: none;
-            }
-
-            > li {
-                box-sizing: border-box;
-                height: 89px;
-                line-height: 89px;
-                border-bottom: 1px solid #e6e6e6;
-                padding-left: 20px;
-
-                &.highlight {
-                    background: #eee;
-                }
-
-                &:last-child {
-                    border-bottom: none;
-                }
-            }
-
-            a {
-                display: block;
-                height: 100%;
-                width: 100%;
-                color: #000;
-            }
-        }
-    }*/
-
     .resources {
         .recommend-content-five {
             margin-top: -1px;