Showing
6 changed files
with
24 additions
and
16 deletions
@@ -12,7 +12,11 @@ | @@ -12,7 +12,11 @@ | ||
12 | <li class="promotion-item"> | 12 | <li class="promotion-item"> |
13 | <span class="ac-type">{{type}}</span> | 13 | <span class="ac-type">{{type}}</span> |
14 | <span class="ac-des {{#if_cond ../activity.length '>=' 3}}small{{/if_cond}}"> | 14 | <span class="ac-des {{#if_cond ../activity.length '>=' 3}}small{{/if_cond}}"> |
15 | - <a target="_blank" href="{{url}}">{{des}}</a> | 15 | + {{#if url}} |
16 | + <a target="_blank" href="{{url}}">{{des}}</a> | ||
17 | + {{^}} | ||
18 | + <span>{{des}}</span> | ||
19 | + {{/if}} | ||
16 | </span> | 20 | </span> |
17 | </li> | 21 | </li> |
18 | {{/each}} | 22 | {{/each}} |
@@ -25,7 +29,11 @@ | @@ -25,7 +29,11 @@ | ||
25 | <li class="promotion-item {{#if_cond @index '>=' 3}}hide{{/if_cond}}"> | 29 | <li class="promotion-item {{#if_cond @index '>=' 3}}hide{{/if_cond}}"> |
26 | <span class="ac-type">{{type}}</span> | 30 | <span class="ac-type">{{type}}</span> |
27 | <span class="ac-des {{#if_cond ../activity.length '>=' 3}}small{{/if_cond}}"> | 31 | <span class="ac-des {{#if_cond ../activity.length '>=' 3}}small{{/if_cond}}"> |
28 | - <a target="_blank" href="{{url}}">{{des}}</a> | 32 | + {{#if url}} |
33 | + <a target="_blank" href="{{url}}">{{des}}</a> | ||
34 | + {{^}} | ||
35 | + <span>{{des}}</span> | ||
36 | + {{/if}} | ||
29 | </span> | 37 | </span> |
30 | </li> | 38 | </li> |
31 | {{/each}} | 39 | {{/each}} |
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <div id="after-service-switch" class="after-service-switch clearfix"> | 11 | <div id="after-service-switch" class="after-service-switch clearfix"> |
12 | <span class="iconfont"></span> | 12 | <span class="iconfont"></span> |
13 | 售后服务 | 13 | 售后服务 |
14 | - <span class="iconfont triangle"></span> | 14 | + <span class="iconfont triangle"></span> |
15 | </div> | 15 | </div> |
16 | 16 | ||
17 | <div class="after-service-content info-block bl"> | 17 | <div class="after-service-content info-block bl"> |
@@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
35 | <div class="magnifier move-object hide"></div> | 35 | <div class="magnifier move-object hide"></div> |
36 | <div class="magnifier move-over"></div> | 36 | <div class="magnifier move-over"></div> |
37 | <div id="max" class="magnifier max hide"> | 37 | <div id="max" class="magnifier max hide"> |
38 | - <img id='big' src="{{image img 1000 1333}}"> | 38 | + <img id='big' src="{{image img 1742 2323}}"> |
39 | </div> | 39 | </div> |
40 | </div> | 40 | </div> |
41 | 41 |
@@ -17,13 +17,13 @@ module.exports = { | @@ -17,13 +17,13 @@ module.exports = { | ||
17 | cookieDomain: '.yohobuy.com', | 17 | cookieDomain: '.yohobuy.com', |
18 | domains: { | 18 | domains: { |
19 | // test3 | 19 | // test3 |
20 | - //singleApi: 'http://api-test2.yohops.com:9999/', | ||
21 | - //api: 'http://api-test2.yohops.com:9999/', | ||
22 | - //service: 'http://service-test2.yohops.com:9999/', | 20 | + singleApi: 'http://api-test2.yohops.com:9999/', |
21 | + api: 'http://api-test2.yohops.com:9999/', | ||
22 | + service: 'http://service-test2.yohops.com:9999/', | ||
23 | 23 | ||
24 | - singleApi: 'http://single.gray.yohops.com/', | ||
25 | - api: 'http://api.yoho.cn/', | ||
26 | - service: 'http://service.yoho.cn/', | 24 | + //singleApi: 'http://single.gray.yohops.com/', |
25 | + //api: 'http://api.yoho.cn/', | ||
26 | + //service: 'http://service.yoho.cn/', | ||
27 | 27 | ||
28 | //api: 'http://dev-api.yohops.com:9999/', | 28 | //api: 'http://dev-api.yohops.com:9999/', |
29 | //service: 'http://dev-service.yohops.com:9999/', | 29 | //service: 'http://dev-service.yohops.com:9999/', |
@@ -300,10 +300,10 @@ bindEvent.add(function() { | @@ -300,10 +300,10 @@ bindEvent.add(function() { | ||
300 | 300 | ||
301 | // 查看细节图功能 | 301 | // 查看细节图功能 |
302 | var moveWidth = 135, // eslint-disable-line | 302 | var moveWidth = 135, // eslint-disable-line |
303 | + magnifier = 560, | ||
303 | w = 420, | 304 | w = 420, |
304 | h = 560, | 305 | h = 560, |
305 | - _w = 1000, | ||
306 | - radio = w / _w, | 306 | + radio = moveWidth / magnifier, |
307 | $moveObj = $('.move-object'), | 307 | $moveObj = $('.move-object'), |
308 | $max = $('.max'); | 308 | $max = $('.max'); |
309 | 309 | ||
@@ -1041,8 +1041,8 @@ $('.after-service-switch').click(function() { | @@ -1041,8 +1041,8 @@ $('.after-service-switch').click(function() { | ||
1041 | $content = $this.next('.after-service-content'); | 1041 | $content = $this.next('.after-service-content'); |
1042 | 1042 | ||
1043 | var html = { | 1043 | var html = { |
1044 | - down: '', | ||
1045 | - up: '' | 1044 | + down: '', |
1045 | + up: '' | ||
1046 | }; | 1046 | }; |
1047 | 1047 | ||
1048 | if ($content.css('display') === 'none') { | 1048 | if ($content.css('display') === 'none') { |
@@ -156,13 +156,13 @@ module.exports = function(opts) { | @@ -156,13 +156,13 @@ module.exports = function(opts) { | ||
156 | if (page > 1) { | 156 | if (page > 1) { |
157 | 157 | ||
158 | ret += '<a href="javascript:void(0)" data-page="' + base + (page - 1) + | 158 | ret += '<a href="javascript:void(0)" data-page="' + base + (page - 1) + |
159 | - '" title="上一页"><span class="iconfont"></span>上一页</a>'; | 159 | + '" title="上一页"><span class="iconfont"></span>上一页</a>'; |
160 | } | 160 | } |
161 | break; | 161 | break; |
162 | case 'n' : | 162 | case 'n' : |
163 | if (page < totalPages) { | 163 | if (page < totalPages) { |
164 | ret += '<a href="javascript:void(0)" data-page="' + base + (page + 1) + | 164 | ret += '<a href="javascript:void(0)" data-page="' + base + (page + 1) + |
165 | - '" title="下一页">下一页<span class="iconfont"></span></a>'; | 165 | + '" title="下一页">下一页<span class="iconfont"></span></a>'; |
166 | } | 166 | } |
167 | break; | 167 | break; |
168 | case 'l' : | 168 | case 'l' : |
-
Please register or login to post a comment