Merge branch 'feature/help' of git.yoho.cn:fe/yohobuy-node into feature/help
Showing
5 changed files
with
17 additions
and
12 deletions
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | {{#each menuData}} | 2 | {{#each menuData}} |
3 | {{#if subsets}} | 3 | {{#if subsets}} |
4 | <li class="big-category cateId-{{id}} subsets {{#isEqual id @root.qid}}selected{{/isEqual}}"> | 4 | <li class="big-category cateId-{{id}} subsets {{#isEqual id @root.qid}}selected{{/isEqual}}"> |
5 | - <div class="plus inline-block"></div>{{categoryName}}</li> | 5 | + <div class="icon plus inline-block"></div>{{categoryName}}</li> |
6 | {{#each subsets}} | 6 | {{#each subsets}} |
7 | <li class="smll-category cateId-{{id}} parentId-{{parendId}} {{#isEqual id @root.qid}}selected{{/isEqual}}" data-parent-id="{{parendId}}"> | 7 | <li class="smll-category cateId-{{id}} parentId-{{parendId}} {{#isEqual id @root.qid}}selected{{/isEqual}}" data-parent-id="{{parendId}}"> |
8 | <span class="mult"></span> | 8 | <span class="mult"></span> |
1 | {{#if error}} | 1 | {{#if error}} |
2 | - <div class="search-result nav-title">很抱歉,关于“<span class="red">{{keywords}}</span>”</div> | 2 | + <div class="search-result nav-title">很抱歉,关于“<span class="red">{{keywords}}</span>”没有找到您想要的答案</div> |
3 | <p class="result-error mt30">建议您:看看输入的文字是否有误/减少分类条件的限制/重新检索</p> | 3 | <p class="result-error mt30">建议您:看看输入的文字是否有误/减少分类条件的限制/重新检索</p> |
4 | <p class="result-error">或 者:使用<a href="{{jumpUrl}}">在线客服</a>试试</p> | 4 | <p class="result-error">或 者:使用<a href="{{jumpUrl}}">在线客服</a>试试</p> |
5 | {{else}} | 5 | {{else}} |
@@ -34,7 +34,6 @@ var $subsets = $('.subsets'); | @@ -34,7 +34,6 @@ var $subsets = $('.subsets'); | ||
34 | /** | 34 | /** |
35 | * 目录切换 | 35 | * 目录切换 |
36 | */ | 36 | */ |
37 | - | ||
38 | $subsets.click(function() { | 37 | $subsets.click(function() { |
39 | var $this = $(this); | 38 | var $this = $(this); |
40 | var className = $this.attr('class').split(' ')[1]; | 39 | var className = $this.attr('class').split(' ')[1]; |
@@ -43,13 +42,13 @@ $subsets.click(function() { | @@ -43,13 +42,13 @@ $subsets.click(function() { | ||
43 | 42 | ||
44 | if ($this.hasClass('open')) { | 43 | if ($this.hasClass('open')) { |
45 | $child.hide(); | 44 | $child.hide(); |
46 | - $this.removeClass('open').children('.plus').css('background-image', 'url(\'../img/help/plus.png\')'); | 45 | + $this.removeClass('open').children('.icon').removeClass('minus').addClass('plus'); |
47 | } else { | 46 | } else { |
48 | $('.smll-category').hide(); | 47 | $('.smll-category').hide(); |
49 | - $('.subsets').children('.plus').css('background-image', 'url(\'../img/help/plus.png\')'); | 48 | + $('.subsets').children('.icon').removeClass('minus').addClass('plus'); |
50 | $child.show(); | 49 | $child.show(); |
51 | $subsets.removeClass('open'); | 50 | $subsets.removeClass('open'); |
52 | - $this.addClass('open').children('.plus').css('background-image', 'url(\'../img/help/minus.png\')'); | 51 | + $this.addClass('open').children('.icon').removeClass('plus').addClass('minus'); |
53 | } | 52 | } |
54 | }); | 53 | }); |
55 | 54 |
@@ -68,7 +68,7 @@ if (!$cate.hasClass('big-category')) { | @@ -68,7 +68,7 @@ if (!$cate.hasClass('big-category')) { | ||
68 | parentID = $cate.data('parentId'); | 68 | parentID = $cate.data('parentId'); |
69 | 69 | ||
70 | $('.parentId-' + parentID).show(); | 70 | $('.parentId-' + parentID).show(); |
71 | - $('.cateId-' + parentID).find('.plus').css('background-image', 'url(\'../img/help/minus.png\')'); | 71 | + $('.cateId-' + parentID).find('.icon').removeClass('plus').addClass('minus'); |
72 | } | 72 | } |
73 | 73 | ||
74 | $('.center-content').css('border-top-color', '#fff'); | 74 | $('.center-content').css('border-top-color', '#fff'); |
@@ -42,18 +42,24 @@ | @@ -42,18 +42,24 @@ | ||
42 | box-sizing: border-box; | 42 | box-sizing: border-box; |
43 | } | 43 | } |
44 | 44 | ||
45 | - .plus { | 45 | + .icon { |
46 | cursor: pointer; | 46 | cursor: pointer; |
47 | margin-right: 10px; | 47 | margin-right: 10px; |
48 | - height: 14px; | ||
49 | - width: 14px; | ||
50 | - background-image: resolve("help/plus.png"); | ||
51 | - background-size: 14px 14px; | 48 | + height: 13px; |
49 | + width: 13px; | ||
52 | display: inline-block; | 50 | display: inline-block; |
53 | position: relative; | 51 | position: relative; |
54 | top: 1px; | 52 | top: 1px; |
55 | } | 53 | } |
56 | 54 | ||
55 | + .plus { | ||
56 | + background-image: resolve("help/plus.png"); | ||
57 | + } | ||
58 | + | ||
59 | + .minus { | ||
60 | + background-image: resolve("help/minus.png"); | ||
61 | + } | ||
62 | + | ||
57 | .mult { | 63 | .mult { |
58 | margin-right: 26px; | 64 | margin-right: 26px; |
59 | height: 14px; | 65 | height: 14px; |
-
Please register or login to post a comment