Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop
Showing
5 changed files
with
184 additions
and
49 deletions
@@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
66 | 66 | ||
67 | <h2 class="beauty-top-h2">本周试用排行榜</h2> | 67 | <h2 class="beauty-top-h2">本周试用排行榜</h2> |
68 | {{# top}} | 68 | {{# top}} |
69 | - <div class="top-list top-list-{{ranking}}"> | 69 | + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank"> |
70 | <span class="top-leading"></span> | 70 | <span class="top-leading"></span> |
71 | 71 | ||
72 | <div class="top-content"> | 72 | <div class="top-content"> |
@@ -75,7 +75,7 @@ | @@ -75,7 +75,7 @@ | ||
75 | <h3>{{subTitle}}</h3> | 75 | <h3>{{subTitle}}</h3> |
76 | </div> | 76 | </div> |
77 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> | 77 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> |
78 | - </div> | 78 | + </a> |
79 | {{/ top}} | 79 | {{/ top}} |
80 | {{/ topTen}} | 80 | {{/ topTen}} |
81 | </div> | 81 | </div> |
@@ -112,7 +112,7 @@ | @@ -112,7 +112,7 @@ | ||
112 | 112 | ||
113 | <h2 class="beauty-top-h2">本周试用排行榜</h2> | 113 | <h2 class="beauty-top-h2">本周试用排行榜</h2> |
114 | {{# top}} | 114 | {{# top}} |
115 | - <div class="top-list top-list-{{ranking}}"> | 115 | + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank"> |
116 | <span class="top-leading"></span> | 116 | <span class="top-leading"></span> |
117 | 117 | ||
118 | <div class="top-content"> | 118 | <div class="top-content"> |
@@ -121,7 +121,7 @@ | @@ -121,7 +121,7 @@ | ||
121 | <h3>{{subTitle}}</h3> | 121 | <h3>{{subTitle}}</h3> |
122 | </div> | 122 | </div> |
123 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> | 123 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> |
124 | - </div> | 124 | + </a> |
125 | {{/ top}} | 125 | {{/ top}} |
126 | {{/ topTen}} | 126 | {{/ topTen}} |
127 | </div> | 127 | </div> |
@@ -159,7 +159,7 @@ | @@ -159,7 +159,7 @@ | ||
159 | 159 | ||
160 | <h2 class="beauty-top-h2">本周试用排行榜</h2> | 160 | <h2 class="beauty-top-h2">本周试用排行榜</h2> |
161 | {{# top}} | 161 | {{# top}} |
162 | - <div class="top-list top-list-{{ranking}}"> | 162 | + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank"> |
163 | <span class="top-leading"></span> | 163 | <span class="top-leading"></span> |
164 | 164 | ||
165 | <div class="top-content"> | 165 | <div class="top-content"> |
@@ -168,7 +168,7 @@ | @@ -168,7 +168,7 @@ | ||
168 | <h3>{{subTitle}}</h3> | 168 | <h3>{{subTitle}}</h3> |
169 | </div> | 169 | </div> |
170 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> | 170 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> |
171 | - </div> | 171 | + </a> |
172 | {{/ top}} | 172 | {{/ top}} |
173 | {{/ topTen}} | 173 | {{/ topTen}} |
174 | </div> | 174 | </div> |
@@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
206 | 206 | ||
207 | <h2 class="beauty-top-h2">本周试用排行榜</h2> | 207 | <h2 class="beauty-top-h2">本周试用排行榜</h2> |
208 | {{# top}} | 208 | {{# top}} |
209 | - <div class="top-list top-list-{{ranking}}"> | 209 | + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank"> |
210 | <span class="top-leading"></span> | 210 | <span class="top-leading"></span> |
211 | 211 | ||
212 | <div class="top-content"> | 212 | <div class="top-content"> |
@@ -215,7 +215,7 @@ | @@ -215,7 +215,7 @@ | ||
215 | <h3>{{subTitle}}</h3> | 215 | <h3>{{subTitle}}</h3> |
216 | </div> | 216 | </div> |
217 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> | 217 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> |
218 | - </div> | 218 | + </a> |
219 | {{/ top}} | 219 | {{/ top}} |
220 | {{/ topTen}} | 220 | {{/ topTen}} |
221 | </div> | 221 | </div> |
@@ -5,17 +5,24 @@ | @@ -5,17 +5,24 @@ | ||
5 | {{#content}} | 5 | {{#content}} |
6 | <li class="content-item channel-{{channelType}}"> | 6 | <li class="content-item channel-{{channelType}}"> |
7 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 7 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> |
8 | - <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | 8 | + <img class="lazy" data-original="{{img}}" |
9 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
10 | + alt=""/> | ||
9 | </a> | 11 | </a> |
12 | + | ||
10 | <h2> | 13 | <h2> |
11 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a> | 14 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a> |
12 | </h2> | 15 | </h2> |
16 | + | ||
13 | <h3> | 17 | <h3> |
14 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a> | 18 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a> |
15 | </h3> | 19 | </h3> |
16 | <time> | 20 | <time> |
17 | - {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ channel}} | ||
18 | - {{# subChannel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ subChannel}} | 21 | + {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ |
22 | + channel}} | ||
23 | + {{# subChannel}}<a href="{{link}}" | ||
24 | + onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ | ||
25 | + subChannel}} | ||
19 | <span time="{{time}}" class="time-format"></span> | 26 | <span time="{{time}}" class="time-format"></span> |
20 | </time> | 27 | </time> |
21 | <p> | 28 | <p> |
@@ -27,18 +34,23 @@ | @@ -27,18 +34,23 @@ | ||
27 | {{# topTen}} | 34 | {{# topTen}} |
28 | <li class="content-item channel-{{channelType}} channel-beauty-top"> | 35 | <li class="content-item channel-{{channelType}} channel-beauty-top"> |
29 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 36 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> |
30 | - <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | 37 | + <img class="lazy" data-original="{{img}}" |
38 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
39 | + alt=""/> | ||
31 | </a> | 40 | </a> |
41 | + | ||
32 | <h2 class="beauty-top-h2">本周试用排行榜</h2> | 42 | <h2 class="beauty-top-h2">本周试用排行榜</h2> |
33 | {{# top}} | 43 | {{# top}} |
34 | - <div class="top-list top-list-{{ranking}}"> | 44 | + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank"> |
35 | <span class="top-leading"></span> | 45 | <span class="top-leading"></span> |
46 | + | ||
36 | <div class="top-content"> | 47 | <div class="top-content"> |
37 | <h2>{{title}}</h2> | 48 | <h2>{{title}}</h2> |
49 | + | ||
38 | <h3>{{subTitle}}</h3> | 50 | <h3>{{subTitle}}</h3> |
39 | </div> | 51 | </div> |
40 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> | 52 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> |
41 | - </div> | 53 | + </a> |
42 | {{/ top}} | 54 | {{/ top}} |
43 | </li> | 55 | </li> |
44 | {{/ topTen}} | 56 | {{/ topTen}} |
@@ -46,17 +58,24 @@ | @@ -46,17 +58,24 @@ | ||
46 | {{#contentTwo}} | 58 | {{#contentTwo}} |
47 | <li class="content-item channel-{{channelType}}"> | 59 | <li class="content-item channel-{{channelType}}"> |
48 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 60 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> |
49 | - <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/> | 61 | + <img class="lazy" data-original="{{img}}" |
62 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
63 | + alt=""/> | ||
50 | </a> | 64 | </a> |
65 | + | ||
51 | <h2> | 66 | <h2> |
52 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a> | 67 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a> |
53 | </h2> | 68 | </h2> |
69 | + | ||
54 | <h3> | 70 | <h3> |
55 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a> | 71 | <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a> |
56 | </h3> | 72 | </h3> |
57 | <time> | 73 | <time> |
58 | - {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ channel}} | ||
59 | - {{# subChannel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ subChannel}} | 74 | + {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ |
75 | + channel}} | ||
76 | + {{# subChannel}}<a href="{{link}}" | ||
77 | + onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a> | {{/ | ||
78 | + subChannel}} | ||
60 | <span time="{{time}}" class="time-format"></span> | 79 | <span time="{{time}}" class="time-format"></span> |
61 | </time> | 80 | </time> |
62 | <p> | 81 | <p> |
@@ -24,16 +24,17 @@ | @@ -24,16 +24,17 @@ | ||
24 | 24 | ||
25 | <div class="trial-product-info"> | 25 | <div class="trial-product-info"> |
26 | <span>价格:{{price}}元 / </span> | 26 | <span>价格:{{price}}元 / </span> |
27 | - <span>规格:{{size}}ml 中样 / </span> | 27 | + <span>规格:{{size}} {{standand}} / </span> |
28 | <span>数量:{{num}}份</span> | 28 | <span>数量:{{num}}份</span> |
29 | </div> | 29 | </div> |
30 | <time> | 30 | <time> |
31 | <span>申请时间:{{timeStart}}——{{timeEnd}}</span> | 31 | <span>申请时间:{{timeStart}}——{{timeEnd}}</span> |
32 | <span class="trial-time-overplus">距离结束还有{{timeOverplus}}</span> | 32 | <span class="trial-time-overplus">距离结束还有{{timeOverplus}}</span> |
33 | </time> | 33 | </time> |
34 | - <div class="trial-submit {{# over}} trial-over {{/ over}}"> | ||
35 | - <a class="apply-link" href="{{applyLink}}">免费申请</a> | ||
36 | - <span class="apply-like-num iconfont"> {{likeNum}}</span> | 34 | + <div class="trial-submit"> |
35 | + {{# isOver}}<b class="apply-link apply-link-over">活动已结束</b>{{/ isOver}} | ||
36 | + {{^ isOver}}<a class="apply-link" href="{{applyLink}}">免费申请</a>{{/ isOver}} | ||
37 | + <span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}">{{likeNum}}</span> | ||
37 | </div> | 38 | </div> |
38 | </div> | 39 | </div> |
39 | </li> | 40 | </li> |
@@ -52,7 +53,7 @@ | @@ -52,7 +53,7 @@ | ||
52 | 53 | ||
53 | <h2 class="beauty-top-h2">本周试用排行榜</h2> | 54 | <h2 class="beauty-top-h2">本周试用排行榜</h2> |
54 | {{# top}} | 55 | {{# top}} |
55 | - <div class="top-list top-list-{{ranking}}"> | 56 | + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank"> |
56 | <span class="top-leading"></span> | 57 | <span class="top-leading"></span> |
57 | 58 | ||
58 | <div class="top-content"> | 59 | <div class="top-content"> |
@@ -61,7 +62,7 @@ | @@ -61,7 +62,7 @@ | ||
61 | <h3>{{subTitle}}</h3> | 62 | <h3>{{subTitle}}</h3> |
62 | </div> | 63 | </div> |
63 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> | 64 | <span class="top-like-num {{bestLike}}">{{likeNum}}</span> |
64 | - </div> | 65 | + </a> |
65 | {{/ top}} | 66 | {{/ top}} |
66 | {{/ topTen}} | 67 | {{/ topTen}} |
67 | </div> | 68 | </div> |
1 | {{> layout/writer_header320}} | 1 | {{> layout/writer_header320}} |
2 | <div class="trial-nav"> | 2 | <div class="trial-nav"> |
3 | - <span class="trial-nav-l trial-nav-active">试用中心</span> | 3 | + <span class="trial-nav-l">试用中心</span> |
4 | <span class="trial-nav-r">我的试用</span> | 4 | <span class="trial-nav-r">我的试用</span> |
5 | </div> | 5 | </div> |
6 | 6 | ||
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | {{> channel/banner320}} | 8 | {{> channel/banner320}} |
9 | <div class="home-content"> | 9 | <div class="home-content"> |
10 | <ul> | 10 | <ul> |
11 | - {{# content}} | 11 | + {{# contentCenter}} |
12 | <li class="content-item channel-{{channelType}} channel-beauty-trial"> | 12 | <li class="content-item channel-{{channelType}} channel-beauty-trial"> |
13 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 13 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> |
14 | <img class="lazy" data-original="{{img}}" | 14 | <img class="lazy" data-original="{{img}}" |
@@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
27 | 27 | ||
28 | <div class="trial-product-info"> | 28 | <div class="trial-product-info"> |
29 | <span>价格:{{price}}元 / </span> | 29 | <span>价格:{{price}}元 / </span> |
30 | - <span>规格:{{size}}ml 中样 / </span> | 30 | + <span>规格:{{size}} {{standand}} / </span> |
31 | <span>数量:{{num}}份</span> | 31 | <span>数量:{{num}}份</span> |
32 | </div> | 32 | </div> |
33 | <time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}"> | 33 | <time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}"> |
@@ -35,19 +35,108 @@ | @@ -35,19 +35,108 @@ | ||
35 | <span class="trial-time-overplus">距离结束还有{{timeOverplus}}</span> | 35 | <span class="trial-time-overplus">距离结束还有{{timeOverplus}}</span> |
36 | </time> | 36 | </time> |
37 | <div class="trial-submit"> | 37 | <div class="trial-submit"> |
38 | - <a class="apply-link" href="{{applyLink}}">免费申请</a> | ||
39 | - <span class="apply-like-num">{{likeNum}}</span> | 38 | + {{# isOver}}<b class="apply-link apply-link-over">活动已结束</b>{{/ isOver}} |
39 | + {{^ isOver}}<a class="apply-link" href="{{applyLink}}">免费申请</a>{{/ isOver}} | ||
40 | + <span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}">{{likeNum}}</span> | ||
40 | </div> | 41 | </div> |
41 | </li> | 42 | </li> |
42 | - {{/ content}} | 43 | + {{/ contentCenter}} |
43 | </ul> | 44 | </ul> |
45 | + {{# contentCenterSwitch}} | ||
44 | {{> channel/page320}} | 46 | {{> channel/page320}} |
47 | + {{/ contentCenterSwitch}} | ||
45 | </div> | 48 | </div> |
46 | </div> | 49 | </div> |
47 | <div class="trial-r-content trial-content"> | 50 | <div class="trial-r-content trial-content"> |
48 | - <div class="home-content"> | 51 | + <div class="home-content trial-tab-content-ing"> |
52 | + <ul> | ||
53 | + {{# trialIng}} | ||
54 | + <li class="content-item channel-{{channelType}} channel-beauty-trial"> | ||
55 | + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | ||
56 | + <img class="lazy" data-original="{{img}}" | ||
57 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
58 | + alt=""/> | ||
59 | + </a> | ||
60 | + | ||
61 | + <h2> | ||
62 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a> | ||
63 | + </h2> | ||
64 | + | ||
65 | + <h3> | ||
66 | + <a href="{{link}}" target="_blank" | ||
67 | + onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a> | ||
68 | + </h3> | ||
69 | + | ||
70 | + <time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}"> | ||
71 | + <span>申请时间:{{timeStart}}</span> | ||
72 | + </time> | ||
73 | + <div class="apply-status"> | ||
74 | + {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} | ||
75 | + </div> | ||
76 | + <div class="trial-submit"> | ||
77 | + <a class="apply-detail-link" href="{{applyDetailLink}}">查看详情</a> | ||
78 | + </div> | ||
79 | + </li> | ||
80 | + {{/ trialIng}} | ||
81 | + </ul> | ||
82 | + | ||
83 | + {{# trialIngSwitch}} | ||
84 | + {{> channel/page320}} | ||
85 | + {{/ trialIngSwitch}} | ||
86 | + | ||
87 | + {{^ trialIng}} | ||
88 | + <div class="noting-trial-tip"> | ||
89 | + <p>您还没有申请中的试用品</p> | ||
90 | + <b>立即去</b><a href="#">免费申请</a> | ||
91 | + </div> | ||
92 | + {{/ trialIng}} | ||
93 | + </div> | ||
94 | + <div class="home-content trial-tab-content-success"> | ||
95 | + <ul> | ||
96 | + {{# trialSuccess}} | ||
97 | + <li class="content-item channel-{{channelType}} channel-beauty-trial"> | ||
98 | + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | ||
99 | + <img class="lazy" data-original="{{img}}" | ||
100 | + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | ||
101 | + alt=""/> | ||
102 | + </a> | ||
103 | + | ||
104 | + <h2> | ||
105 | + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a> | ||
106 | + </h2> | ||
107 | + | ||
108 | + <h3> | ||
109 | + <a href="{{link}}" target="_blank" | ||
110 | + onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a> | ||
111 | + </h3> | ||
112 | + | ||
113 | + <time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}"> | ||
114 | + <span>申请时间:{{timeStart}}</span> | ||
115 | + </time> | ||
116 | + <div class="apply-status"> | ||
117 | + {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} | ||
118 | + </div> | ||
119 | + <div class="trial-submit"> | ||
120 | + <a class="apply-detail-link" href="{{applyDetailLink}}">查看详情</a> | ||
121 | + </div> | ||
122 | + </li> | ||
123 | + {{/ trialSuccess}} | ||
124 | + </ul> | ||
125 | + | ||
126 | + {{# trialSuccessSwitch}} | ||
127 | + {{> channel/page320}} | ||
128 | + {{/ trialSuccessSwitch}} | ||
129 | + | ||
130 | + {{^ trialSuccess}} | ||
131 | + <div class="noting-trial-tip"> | ||
132 | + <p>您还没有申请成功的试用品</p> | ||
133 | + <b>立即去</b><a href="#">免费申请</a> | ||
134 | + </div> | ||
135 | + {{/ trialSuccess}} | ||
136 | + </div> | ||
137 | + <div class="home-content trial-tab-content-fail"> | ||
49 | <ul> | 138 | <ul> |
50 | - {{# content}} | 139 | + {{# trialFail}} |
51 | <li class="content-item channel-{{channelType}} channel-beauty-trial"> | 140 | <li class="content-item channel-{{channelType}} channel-beauty-trial"> |
52 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 141 | <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> |
53 | <img class="lazy" data-original="{{img}}" | 142 | <img class="lazy" data-original="{{img}}" |
@@ -74,22 +163,30 @@ | @@ -74,22 +163,30 @@ | ||
74 | <a class="apply-detail-link" href="{{applyDetailLink}}">查看详情</a> | 163 | <a class="apply-detail-link" href="{{applyDetailLink}}">查看详情</a> |
75 | </div> | 164 | </div> |
76 | </li> | 165 | </li> |
77 | - {{/ content}} | 166 | + {{/ trialFail}} |
78 | </ul> | 167 | </ul> |
168 | + | ||
169 | + {{# trialFailSwitch}} | ||
79 | {{> channel/page320}} | 170 | {{> channel/page320}} |
171 | + {{/ trialFailSwitch}} | ||
172 | + | ||
173 | + {{^ trialFail}} | ||
174 | + <div class="noting-trial-tip"> | ||
175 | + <p>您还没有申请中的试用品</p> | ||
176 | + <b>立即去</b><a href="#">免费申请</a> | ||
177 | + </div> | ||
178 | + {{/ trialFail}} | ||
80 | </div> | 179 | </div> |
81 | </div> | 180 | </div> |
82 | {{> default/download320}} | 181 | {{> default/download320}} |
83 | <!--trialCat--> | 182 | <!--trialCat--> |
84 | -{{# trialCat}} | ||
85 | <div id="trial-cat"> | 183 | <div id="trial-cat"> |
86 | <div class="trial-cat-main"> | 184 | <div class="trial-cat-main"> |
87 | <ul> | 185 | <ul> |
88 | - <li><a href="{{ing}}" onclick="YOHODCLICK('trial','mobile','')"></a></li> | ||
89 | - <li><a href="{{success}}" onclick="YOHODCLICK('trial','mobile','')"></a></li> | ||
90 | - <li><a href="{{fail}}" onclick="YOHODCLICK('trial','mobile','')"></a></li> | 186 | + <li><span onclick="YOHODCLICK('trial','mobile','')"></span></li> |
187 | + <li><span onclick="YOHODCLICK('trial','mobile','')"></span></li> | ||
188 | + <li><span onclick="YOHODCLICK('trial','mobile','')"></span></li> | ||
91 | </ul> | 189 | </ul> |
92 | </div> | 190 | </div> |
93 | </div> | 191 | </div> |
94 | -{{/ trialCat}} | ||
95 | {{> layout/footer320}} | 192 | {{> layout/footer320}} |
@@ -12,7 +12,8 @@ | @@ -12,7 +12,8 @@ | ||
12 | <ul> | 12 | <ul> |
13 | {{# trialIng}} | 13 | {{# trialIng}} |
14 | <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}"> | 14 | <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}"> |
15 | - <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 15 | + <a class="img-link" href="{{link}}" target="_blank" |
16 | + onclick="YOHODCLICK('channel','mobile','content')"> | ||
16 | <img class="lazy" data-original="{{img}}" | 17 | <img class="lazy" data-original="{{img}}" |
17 | src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | 18 | src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" |
18 | alt=""/> | 19 | alt=""/> |
@@ -35,14 +36,19 @@ | @@ -35,14 +36,19 @@ | ||
35 | <div class="apply-status"> | 36 | <div class="apply-status"> |
36 | {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} | 37 | {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} |
37 | </div> | 38 | </div> |
38 | - <div class="trial-submit {{# over}} trial-over {{/ over}}"> | ||
39 | - <a class="apply-link" href="{{applyLink}}">免费申请</a> | ||
40 | - <span class="apply-like-num iconfont"> {{likeNum}}</span> | 39 | + <div class="trial-submit"> |
40 | + <a class="apply-link" href="{{applyDetailLink}}">查看详情</a> | ||
41 | </div> | 41 | </div> |
42 | </div> | 42 | </div> |
43 | </li> | 43 | </li> |
44 | {{/ trialIng}} | 44 | {{/ trialIng}} |
45 | </ul> | 45 | </ul> |
46 | + {{^ trialIng}} | ||
47 | + <div class="no-trial"> | ||
48 | + 您没有正在申请的试用品<br /> | ||
49 | + <span>立即去</span><a href="">免费申请</a> | ||
50 | + </div> | ||
51 | + {{/ trialIng}} | ||
46 | </div> | 52 | </div> |
47 | </div> | 53 | </div> |
48 | <div class="trial-tab-content-success"> | 54 | <div class="trial-tab-content-success"> |
@@ -50,7 +56,8 @@ | @@ -50,7 +56,8 @@ | ||
50 | <ul> | 56 | <ul> |
51 | {{# trialSuccess}} | 57 | {{# trialSuccess}} |
52 | <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}"> | 58 | <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}"> |
53 | - <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 59 | + <a class="img-link" href="{{link}}" target="_blank" |
60 | + onclick="YOHODCLICK('channel','mobile','content')"> | ||
54 | <img class="lazy" data-original="{{img}}" | 61 | <img class="lazy" data-original="{{img}}" |
55 | src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | 62 | src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" |
56 | alt=""/> | 63 | alt=""/> |
@@ -73,14 +80,19 @@ | @@ -73,14 +80,19 @@ | ||
73 | <div class="apply-status"> | 80 | <div class="apply-status"> |
74 | {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} | 81 | {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} |
75 | </div> | 82 | </div> |
76 | - <div class="trial-submit {{# over}} trial-over {{/ over}}"> | ||
77 | - <a class="apply-link" href="{{applyLink}}">免费申请</a> | ||
78 | - <span class="apply-like-num iconfont"> {{likeNum}}</span> | 83 | + <div class="trial-submit"> |
84 | + <a class="apply-link" href="{{applyDetailLink}}">查看详情</a> | ||
79 | </div> | 85 | </div> |
80 | </div> | 86 | </div> |
81 | </li> | 87 | </li> |
82 | {{/ trialSuccess}} | 88 | {{/ trialSuccess}} |
83 | </ul> | 89 | </ul> |
90 | + {{^ trialSuccess}} | ||
91 | + <div class="no-trial"> | ||
92 | + 您没有申请成功的试用品<br /> | ||
93 | + <span>立即去</span><a href="">免费申请</a> | ||
94 | + </div> | ||
95 | + {{/ trialSuccess}} | ||
84 | </div> | 96 | </div> |
85 | </div> | 97 | </div> |
86 | <div class="trial-tab-content-fail"> | 98 | <div class="trial-tab-content-fail"> |
@@ -88,7 +100,8 @@ | @@ -88,7 +100,8 @@ | ||
88 | <ul> | 100 | <ul> |
89 | {{# trialFail}} | 101 | {{# trialFail}} |
90 | <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}"> | 102 | <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}"> |
91 | - <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')"> | 103 | + <a class="img-link" href="{{link}}" target="_blank" |
104 | + onclick="YOHODCLICK('channel','mobile','content')"> | ||
92 | <img class="lazy" data-original="{{img}}" | 105 | <img class="lazy" data-original="{{img}}" |
93 | src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" | 106 | src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" |
94 | alt=""/> | 107 | alt=""/> |
@@ -111,14 +124,19 @@ | @@ -111,14 +124,19 @@ | ||
111 | <div class="apply-status"> | 124 | <div class="apply-status"> |
112 | {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} | 125 | {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}} |
113 | </div> | 126 | </div> |
114 | - <div class="trial-submit {{# over}} trial-over {{/ over}}"> | ||
115 | - <a class="apply-link" href="{{applyLink}}">免费申请</a> | ||
116 | - <span class="apply-like-num iconfont"> {{likeNum}}</span> | 127 | + <div class="trial-submit"> |
128 | + <a class="apply-link" href="{{applyDetailLink}}">查看详情</a> | ||
117 | </div> | 129 | </div> |
118 | </div> | 130 | </div> |
119 | </li> | 131 | </li> |
120 | {{/ trialFail}} | 132 | {{/ trialFail}} |
121 | </ul> | 133 | </ul> |
134 | + {{^ trialFail}} | ||
135 | + <div class="no-trial"> | ||
136 | + 您没有申请失败的试用品<br /> | ||
137 | + <span>立即去</span><a href="">免费申请</a> | ||
138 | + </div> | ||
139 | + {{/ trialFail}} | ||
122 | </div> | 140 | </div> |
123 | </div> | 141 | </div> |
124 | </div> | 142 | </div> |
-
Please register or login to post a comment