Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop
Showing
2 changed files
with
86 additions
and
70 deletions
@@ -2,73 +2,81 @@ | @@ -2,73 +2,81 @@ | ||
2 | {{> channel/banner320}} | 2 | {{> channel/banner320}} |
3 | <div class="video swiper-container"> | 3 | <div class="video swiper-container"> |
4 | <ul class="swiper-wrapper"> | 4 | <ul class="swiper-wrapper"> |
5 | - {{#tvs}} | 5 | + {{#tvs}} |
6 | <li class="swiper-slide"> | 6 | <li class="swiper-slide"> |
7 | {{# link}} | 7 | {{# link}} |
8 | - <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvCN')"></a> | 8 | + <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvCN')"></a> |
9 | {{/ link}} | 9 | {{/ link}} |
10 | {{^ link}} | 10 | {{^ link}} |
11 | - <span class="video-bg"></span> | 11 | + <span class="video-bg"></span> |
12 | {{/ link}} | 12 | {{/ link}} |
13 | <img src="{{img}}" alt=""> | 13 | <img src="{{img}}" alt=""> |
14 | </li> | 14 | </li> |
15 | - {{/tvs}} | 15 | + {{/tvs}} |
16 | </ul> | 16 | </ul> |
17 | </div> | 17 | </div> |
18 | <!--content--> | 18 | <!--content--> |
19 | <div class="home-content"> | 19 | <div class="home-content"> |
20 | <ul> | 20 | <ul> |
21 | {{# content}} | 21 | {{# content}} |
22 | - <li class="content-item channel-{{channelType}}"> | ||
23 | - <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')"> | ||
24 | - <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | ||
25 | - </a> | ||
26 | - <h2> | ||
27 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{title}}</a> | ||
28 | - </h2> | ||
29 | - <h3> | ||
30 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{subTitle}}</a> | ||
31 | - </h3> | ||
32 | - <time> | ||
33 | - {{# channel}} | ||
34 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelCN')">{{name}}</a> | | ||
35 | - {{/ channel}} | ||
36 | - {{# subChannel}} | ||
37 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelCN')">{{name}}</a> | | ||
38 | - {{/ subChannel}} | ||
39 | - <span time="{{time}}" class="time-format"></span> | ||
40 | - </time> | ||
41 | - <p> | ||
42 | - <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{content}}</a> | ||
43 | - </p> | ||
44 | - </li> | 22 | + <li class="content-item channel-{{channelType}}"> |
23 | + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')"> | ||
24 | + <img class="lazy" data-original="{{img}}" | ||
25 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
26 | + alt=""/> | ||
27 | + </a> | ||
28 | + | ||
29 | + <h2> | ||
30 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{title}}</a> | ||
31 | + </h2> | ||
32 | + | ||
33 | + <h3> | ||
34 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{subTitle}}</a> | ||
35 | + </h3> | ||
36 | + <time> | ||
37 | + {{# channel}} | ||
38 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelCN')">{{name}}</a> | | ||
39 | + {{/ channel}} | ||
40 | + {{# subChannel}} | ||
41 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelCN')">{{name}}</a> | | ||
42 | + {{/ subChannel}} | ||
43 | + <span time="{{time}}" class="time-format"></span> | ||
44 | + </time> | ||
45 | + <p> | ||
46 | + <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{content}}</a> | ||
47 | + </p> | ||
48 | + </li> | ||
45 | {{/ content}} | 49 | {{/ content}} |
46 | {{# pop}} | 50 | {{# pop}} |
47 | - <li id="{{type}}-pop" class="content-item"> | ||
48 | - <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')"> | ||
49 | - <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | ||
50 | - </a> | ||
51 | - <h2> | ||
52 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{title}}</a> | ||
53 | - </h2> | ||
54 | - <h3> | ||
55 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{subTitle}}</a> | ||
56 | - </h3> | ||
57 | - <time> | ||
58 | - {{# channel}} | ||
59 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelCN')">{{name}}</a> | | ||
60 | - {{/ channel}} | ||
61 | - {{# subChannel}} | ||
62 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelCN')">{{name}}</a> | | ||
63 | - {{/ subChannel}} | ||
64 | - <span time="{{time}}" class="time-format"></span> | ||
65 | - </time> | ||
66 | - {{# hasContent}} | ||
67 | - <p> | ||
68 | - <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{content}}</a> | ||
69 | - </p> | ||
70 | - {{/ hasContent}} | ||
71 | - </li> | 51 | + <li id="{{type}}-pop" class="content-item"> |
52 | + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')"> | ||
53 | + <img class="lazy" data-original="{{img}}" | ||
54 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
55 | + alt=""/> | ||
56 | + </a> | ||
57 | + | ||
58 | + <h2> | ||
59 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{title}}</a> | ||
60 | + </h2> | ||
61 | + | ||
62 | + <h3> | ||
63 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{subTitle}}</a> | ||
64 | + </h3> | ||
65 | + <time> | ||
66 | + {{# channel}} | ||
67 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelCN')">{{name}}</a> | | ||
68 | + {{/ channel}} | ||
69 | + {{# subChannel}} | ||
70 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelCN')">{{name}}</a> | | ||
71 | + {{/ subChannel}} | ||
72 | + <span time="{{time}}" class="time-format"></span> | ||
73 | + </time> | ||
74 | + {{# hasContent}} | ||
75 | + <p> | ||
76 | + <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{content}}</a> | ||
77 | + </p> | ||
78 | + {{/ hasContent}} | ||
79 | + </li> | ||
72 | {{/ pop}} | 80 | {{/ pop}} |
73 | </ul> | 81 | </ul> |
74 | {{> channel/follow_us320}} | 82 | {{> channel/follow_us320}} |
1 | -{{> layout/header320}} | 1 | +{{> layout/header_hk320}} |
2 | {{> channel/banner320}} | 2 | {{> channel/banner320}} |
3 | <div class="video swiper-container"> | 3 | <div class="video swiper-container"> |
4 | <ul class="swiper-wrapper"> | 4 | <ul class="swiper-wrapper"> |
5 | {{#tvs}} | 5 | {{#tvs}} |
6 | <li class="swiper-slide"> | 6 | <li class="swiper-slide"> |
7 | {{# link}} | 7 | {{# link}} |
8 | - <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvCN')"></a> | 8 | + <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvHK')"></a> |
9 | {{/ link}} | 9 | {{/ link}} |
10 | {{^ link}} | 10 | {{^ link}} |
11 | <span class="video-bg"></span> | 11 | <span class="video-bg"></span> |
@@ -20,52 +20,60 @@ | @@ -20,52 +20,60 @@ | ||
20 | <ul> | 20 | <ul> |
21 | {{# content}} | 21 | {{# content}} |
22 | <li class="content-item channel-{{channelType}}"> | 22 | <li class="content-item channel-{{channelType}}"> |
23 | - <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')"> | ||
24 | - <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | 23 | + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')"> |
24 | + <img class="lazy" data-original="{{img}}" | ||
25 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
26 | + alt=""/> | ||
25 | </a> | 27 | </a> |
28 | + | ||
26 | <h2> | 29 | <h2> |
27 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{title}}</a> | 30 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')">{{title}}</a> |
28 | </h2> | 31 | </h2> |
32 | + | ||
29 | <h3> | 33 | <h3> |
30 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{subTitle}}</a> | 34 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')">{{subTitle}}</a> |
31 | </h3> | 35 | </h3> |
32 | <time> | 36 | <time> |
33 | {{# channel}} | 37 | {{# channel}} |
34 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelCN')">{{name}}</a> | | 38 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelHK')">{{name}}</a> | |
35 | {{/ channel}} | 39 | {{/ channel}} |
36 | {{# subChannel}} | 40 | {{# subChannel}} |
37 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelCN')">{{name}}</a> | | 41 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelHK')">{{name}}</a> | |
38 | {{/ subChannel}} | 42 | {{/ subChannel}} |
39 | <span time="{{time}}" class="time-format"></span> | 43 | <span time="{{time}}" class="time-format"></span> |
40 | </time> | 44 | </time> |
41 | <p> | 45 | <p> |
42 | - <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{content}}</a> | 46 | + <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')">{{content}}</a> |
43 | </p> | 47 | </p> |
44 | </li> | 48 | </li> |
45 | {{/ content}} | 49 | {{/ content}} |
46 | {{# pop}} | 50 | {{# pop}} |
47 | <li id="{{type}}-pop" class="content-item"> | 51 | <li id="{{type}}-pop" class="content-item"> |
48 | - <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')"> | ||
49 | - <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | 52 | + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')"> |
53 | + <img class="lazy" data-original="{{img}}" | ||
54 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
55 | + alt=""/> | ||
50 | </a> | 56 | </a> |
57 | + | ||
51 | <h2> | 58 | <h2> |
52 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{title}}</a> | 59 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')">{{title}}</a> |
53 | </h2> | 60 | </h2> |
61 | + | ||
54 | <h3> | 62 | <h3> |
55 | - <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{subTitle}}</a> | 63 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')">{{subTitle}}</a> |
56 | </h3> | 64 | </h3> |
57 | <time> | 65 | <time> |
58 | {{# channel}} | 66 | {{# channel}} |
59 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelCN')">{{name}}</a> | | 67 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelHK')">{{name}}</a> | |
60 | {{/ channel}} | 68 | {{/ channel}} |
61 | {{# subChannel}} | 69 | {{# subChannel}} |
62 | - <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelCN')">{{name}}</a> | | 70 | + <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelHK')">{{name}}</a> | |
63 | {{/ subChannel}} | 71 | {{/ subChannel}} |
64 | <span time="{{time}}" class="time-format"></span> | 72 | <span time="{{time}}" class="time-format"></span> |
65 | </time> | 73 | </time> |
66 | {{# hasContent}} | 74 | {{# hasContent}} |
67 | <p> | 75 | <p> |
68 | - <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{content}}</a> | 76 | + <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')">{{content}}</a> |
69 | </p> | 77 | </p> |
70 | {{/ hasContent}} | 78 | {{/ hasContent}} |
71 | </li> | 79 | </li> |
@@ -74,5 +82,5 @@ | @@ -74,5 +82,5 @@ | ||
74 | {{> channel/follow_us320}} | 82 | {{> channel/follow_us320}} |
75 | {{> channel/page320}} | 83 | {{> channel/page320}} |
76 | </div> | 84 | </div> |
77 | -{{> default/download320}} | ||
78 | -{{> layout/footer320}} | ||
85 | +{{> default/download_hk320}} | ||
86 | +{{> layout/footer_hk320}} |
-
Please register or login to post a comment