Authored by 沈志敏

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -20,7 +20,7 @@ const visibilitychange = function() { @@ -20,7 +20,7 @@ const visibilitychange = function() {
20 } 20 }
21 }); 21 });
22 22
23 -} 23 +};
24 24
25 module.exports = { 25 module.exports = {
26 getImgHost, 26 getImgHost,
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </ul> 10 </ul>
11 <div class="sub-level-container"> 11 <div class="sub-level-container">
12 <ul class="sub-level"> 12 <ul class="sub-level">
13 - <li><a href="/list?sort={{rightAll.sortId}}&sort_name={{rightAll.categoryName}}&gender={{gender}}">全部{{rightAll.categoryName}}</a></li> 13 + <li><a href="/list?sort={{rightAll.sortId}}&sort_name=全部{{rightAll.categoryName}}&gender={{gender}}">全部{{rightAll.categoryName}}</a></li>
14 </ul> 14 </ul>
15 <ul class="sub-level"> 15 <ul class="sub-level">
16 <li v-for="sub in cateNavRightData"> 16 <li v-for="sub in cateNavRightData">
@@ -131,6 +131,7 @@ @@ -131,6 +131,7 @@
131 overflow: hidden; 131 overflow: hidden;
132 text-overflow: ellipsis; 132 text-overflow: ellipsis;
133 border-bottom: 1px solid #e6e6e6; 133 border-bottom: 1px solid #e6e6e6;
  134 + user-select: none;
134 135
135 &.focus { 136 &.focus {
136 background-color: #fff; 137 background-color: #fff;
@@ -177,6 +178,7 @@ @@ -177,6 +178,7 @@
177 line-height: 110px; 178 line-height: 110px;
178 border-bottom: 1px solid #e6e6e6; 179 border-bottom: 1px solid #e6e6e6;
179 padding-left: 20px; 180 padding-left: 20px;
  181 + user-select: none;
180 182
181 &.highlight { 183 &.highlight {
182 background: #eee; 184 background: #eee;