fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit a628c51bafb9c4756ef0993db0fce0912c3211b9 2 parents 3654a475 b6073fab

Merge branch 'release/5.3.1' of git.yoho.cn:fe/yohobuywap-node into release/5.3.1

Inline Side-by-side
Showing 2 changed files with 11 additions and 6 deletions
@@ -80,6 +80,7 @@ function inputAction() { @@ -80,6 +80,7 @@ function inputAction() {
80 var $searchAssociate = $('.search-associate'); 80 var $searchAssociate = $('.search-associate');
81 var $icon = $('.search-icon'); 81 var $icon = $('.search-icon');
82 var $searchItems = $('.search-items'); 82 var $searchItems = $('.search-items');
  83 + var $hotsearch = $('.hot-search-new');
83 84
84 $input.on('input', function() { 85 $input.on('input', function() {
85 if ($input.val() === '') { 86 if ($input.val() === '') {
@@ -87,6 +88,7 @@ function inputAction() { @@ -87,6 +88,7 @@ function inputAction() {
87 $clear.addClass('hide'); 88 $clear.addClass('hide');
88 $searchAssociate.html(''); 89 $searchAssociate.html('');
89 $searchItems.show(); 90 $searchItems.show();
  91 + $hotsearch.show();
90 $searchAssociate.hide(); 92 $searchAssociate.hide();
91 } else { 93 } else {
92 $icon.css('color', '#666'); 94 $icon.css('color', '#666');
@@ -114,6 +116,7 @@ function inputAction() { @@ -114,6 +116,7 @@ function inputAction() {
114 116
115 $searchAssociate.html(ajaxHtml); 117 $searchAssociate.html(ajaxHtml);
116 $searchItems.hide(); 118 $searchItems.hide();
  119 + $hotsearch.hide();
117 } else { 120 } else {
118 $searchAssociate.html(''); 121 $searchAssociate.html('');
119 } 122 }
1 .search-page { 1 .search-page {
  2 + ::-webkit-scrollbar {
  3 + width: 0;
  4 + height: 0;
  5 + }
  6 +
2 .search-input { 7 .search-input {
3 position: relative; 8 position: relative;
4 padding: 14px 22px; 9 padding: 14px 22px;
@@ -51,13 +56,13 @@ @@ -51,13 +56,13 @@
51 width: 100%; 56 width: 100%;
52 overflow-x: auto; 57 overflow-x: auto;
53 border-bottom: 1px solid #e0e0e0; 58 border-bottom: 1px solid #e0e0e0;
54 - height: 115px;  
55 59
56 .new-hot { 60 .new-hot {
57 background: #fff; 61 background: #fff;
58 padding-left: 30px; 62 padding-left: 30px;
59 - height: 110px;  
60 padding-top: 25px; 63 padding-top: 25px;
  64 + padding-bottom: 25px;
  65 + line-height: 0;
61 } 66 }
62 67
63 .hot-term { 68 .hot-term {
@@ -75,7 +80,7 @@ @@ -75,7 +80,7 @@
75 background: #fff; 80 background: #fff;
76 font-size: 0.7rem; 81 font-size: 0.7rem;
77 width: auto; 82 width: auto;
78 - margin-right: 15px; 83 + margin-right: 15px;
79 } 84 }
80 85
81 .hot-title { 86 .hot-title {
@@ -84,7 +89,6 @@ @@ -84,7 +89,6 @@
84 border: none; 89 border: none;
85 padding: 0; 90 padding: 0;
86 } 91 }
87 -  
88 } 92 }
89 93
90 .search-items { 94 .search-items {
@@ -121,7 +125,6 @@ @@ -121,7 +125,6 @@
121 border-top: 1px solid #e0e0e0; 125 border-top: 1px solid #e0e0e0;
122 background: #fff; 126 background: #fff;
123 padding: 30px; 127 padding: 30px;
124 - /*margin-top: 30px;*/  
125 } 128 }
126 129
127 .clear-icon { 130 .clear-icon {
@@ -152,7 +155,6 @@ @@ -152,7 +155,6 @@
152 } 155 }
153 } 156 }
154 157
155 -  
156 .search-content-title { 158 .search-content-title {
157 height: 40px; 159 height: 40px;
158 160