Merge branch 'develop' into test
Showing
3 changed files
with
5 additions
and
3 deletions
@@ -15,7 +15,9 @@ | @@ -15,7 +15,9 @@ | ||
15 | 数量:<span>{{num}}件</span> | 15 | 数量:<span>{{num}}件</span> |
16 | </p> | 16 | </p> |
17 | <p>申请时间:{{applicationDate}}</p> | 17 | <p>申请时间:{{applicationDate}}</p> |
18 | - <p>距离结束还有{{endTime}}</p> | 18 | + {{# endTime}} |
19 | + <p>距离结束还有{{.}}</p> | ||
20 | + {{/ endTime}} | ||
19 | </div> | 21 | </div> |
20 | {{/ trialInfo}} | 22 | {{/ trialInfo}} |
21 | </div> | 23 | </div> |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <footer class="girl-footer"> | 2 | <footer class="girl-footer"> |
3 | <span class="come-back" onclick="">返回顶部</span> | 3 | <span class="come-back" onclick="">返回顶部</span> |
4 | <div class="login-language"> | 4 | <div class="login-language"> |
5 | - <span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span> | 5 | + <span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span> |
6 | <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateCN')">繁体</a> | 6 | <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateCN')">繁体</a> |
7 | </div> | 7 | </div> |
8 | <ul class="info"> | 8 | <ul class="info"> |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <footer class="girl-footer"> | 2 | <footer class="girl-footer"> |
3 | <span class="come-back" onclick="">返回頂部</span> | 3 | <span class="come-back" onclick="">返回頂部</span> |
4 | <div class="login-language"> | 4 | <div class="login-language"> |
5 | - <span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span> | 5 | + <span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span> |
6 | <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateHK')">簡體</a> | 6 | <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateHK')">簡體</a> |
7 | </div> | 7 | </div> |
8 | <ul class="info"> | 8 | <ul class="info"> |
-
Please register or login to post a comment