Merge branch 'develop' into test

@@ -15,7 +15,9 @@
             数量：<span>{{num}}件</span>
         </p>
         <p>申请时间：{{applicationDate}}</p>
-        <p>距离结束还有{{endTime}}</p>
+        {{# endTime}}
+        <p>距离结束还有{{.}}</p>
+        {{/ endTime}}
     </div>
     {{/ trialInfo}}
 </div>
\ No newline at end of file

@@ -2,7 +2,7 @@
 <footer class="girl-footer">
     <span class="come-back" onclick="">返回顶部</span>
     <div class="login-language">
-        <span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span>
+        <span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span>
         <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateCN')">繁体</a>
     </div>
     <ul class="info">

@@ -2,7 +2,7 @@
 <footer class="girl-footer">
     <span class="come-back" onclick="">返回頂部</span>
     <div class="login-language">
-        <span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span>
+        <span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span>
         <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateHK')">簡體</a>
     </div>
     <ul class="info">