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

搜索错位  品牌资源位名称



See merge request !294

@@ -253,8 +253,6 @@ const indexData = (gender, brandCode, channel, appType) => {
                     brandList.bannerTop = data;
                 } else if (data.focus_type && data.focus_type === '2') {
                     brandList.focusData = data.data;
-                } else if (data.template_name === 'single_image') {
-                    brandList.bannerTop = data;
                 }
             });
         }
@@ -271,7 +269,7 @@ const indexData = (gender, brandCode, channel, appType) => {
         }
 
         list.brandList = brandList;
-        
+
         return list;
     });
 };

@@ -65,8 +65,8 @@ $('.brand-cha').find('li').click(function() {
 
 // 点击字母，页面滚动到相关区域
 $intercept.click(function() {
-    var name = $(this).attr('href').split('#')[1],
-        targetTop = $list.find('[name=' + name + ']').offset().top - categoryHeight;
+    var name = $(this).attr('href').split('#')[1] === '0_9' ? '0~9' : $(this).attr('href').split('#')[1],
+        targetTop = $list.find('[name="' + name + '"]').offset().top - categoryHeight;
 
     $('html,body').animate({
         scrollTop: targetTop

@@ -100,14 +100,13 @@
         width: 20px;
         height: 46px;
         position: relative;
-        right: -32px;
+        right: -33px;
     }
 
     .sub-level-container {
         float: left;
         overflow-x: auto;
         box-sizing: border-box;
-        background: #fff;
         width: 55%;
         height: 100%;
         background: #f4f4f4;

@@ -15,13 +15,17 @@
 
         > form {
             position: relative;
+            line-height: 60px;
         }
 
         .search-icon {
             position: absolute;
             font-size: 24px;
-            top: 18px;
             left: 20px;
+            height: 60px;
+            line-height: 60px;
+            display: inline-block;
+            top: 1px;
         }
 
         input {
@@ -33,6 +37,7 @@
             border-radius: 30px;
             background: #fff;
             border: none;
+            line-height: 60px;
         }
 
         .clear-input {