跟新首页时间显示格式，详情页变脸、翻转效果

lore-w
Commit ead44f0ac0561486493a652f26fa84f2674b872a 2 parents e38d0189 4a989f32
Showing 6 changed files with 41 additions and 44 deletions
partials/default/default_advt.html
partials/layout/footer_fan.html
partials/layout/footer_jian.html
partials/layout/header.html
partials/layout/header_fan.html
partials/layout/header_jian.html
--- a/partials/default/default_advt.html
View file @ead44f0
+++ b/partials/default/default_advt.html
View file @ead44f0
@@ -12,7 +12,7 @@
                    </div>
             </div>
-            <div class="pagination-content">
+            <div class="pagination-content"{{^ bannerLength}} style="display:none;" {{/ bannerLength}}>
                 <div class="pagination pagination-adv">
                     {{# data}}
                     <span class="swiper-pagination-switch {{# isChoosen }}swiper-visible-switch{{/ isChoosen}}"></span>
--- a/partials/layout/footer_fan.html
View file @ead44f0
+++ b/partials/layout/footer_fan.html
View file @ead44f0
-<div class="return-to-top" style="opacity: 0.7;"></div>
-<div class="bottom-content">
+
+        <div class="return-to-top" style="opacity: 0.7;"></div>
+        <div class="bottom-content">
             <div class="boys">
                 <span class="boybitmap"></span>
                 <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
@@ -19,8 +20,8 @@
                     <a class="detail" target="_blank" href="{{girlDownloadUrl}}">線上週刊，帶你覽遍世界仙蹤</a>
                 </span>
             </div>
-</div>
-<div class="bottom-right">
+        </div>
+        <div class="bottom-right">
             <div class="div-right">
                 <span class="span-links">
                     <a class="links" href="{{aboutUsUrl}}">關於我們</a><a class="line"></a>
@@ -34,11 +35,14 @@
                     CopyRight © 2015 南京新與力文化傳播有限公司 蘇ICP備09011225號
                 </span>
             </div>
-</div>
-{{> common/menu}}
-{{> common/menu_withleft}}
-<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
-{{> common/script}}
-</body>
+        </div>
+    </body>
+
+    {{> common/menu}}
+    {{> common/menu_withleft}}
+    <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
+    <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
+    {{> common/script}}
 </html>
+
--- a/partials/layout/footer_jian.html
View file @ead44f0
+++ b/partials/layout/footer_jian.html
View file @ead44f0
-<div class="return-to-top" style="opacity: 0.7;"></div>
-<div class="bottom-content">
+
+
+
+        <div class="return-to-top" style="opacity: 0.7;"></div>
+        <div class="bottom-content">
             <div class="boys">
                 <span class="boybitmap"></span>
                 <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
@@ -19,8 +22,8 @@
                     <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
                 </span>
             </div>
-</div>
-<div class="bottom-right">
+        </div>
+        <div class="bottom-right">
             <div class="div-right">
                 <span class="span-links">
                     <a class="links" href="{{aboutUsUrl}}">关于我们</a><a class="line"></a>
@@ -34,10 +37,17 @@
                     CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
                 </span>
             </div>
-</div>
-{{> common/menu}}
-{{> common/menu_withleft}}
-<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
-{{> common/script}}
-</body>
+        </div>
+
+    </body>
+        {{> common/menu}}
+        {{> common/menu_withleft}}
+
+
+        <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
+        <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
+        <script type="text/javascript">
+            seajs.use("index");
+        </script>
+        {{> common/script}} 
 </html>
--- a/partials/layout/header.html
View file @ead44f0
+++ b/partials/layout/header.html
View file @ead44f0
+
 {{^ fanti}}
     {{> layout/header_jian}}
 {{/ fanti}}
--- a/partials/layout/header_fan.html
View file @ead44f0
+++ b/partials/layout/header_fan.html
View file @ead44f0
@@ -5,7 +5,7 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title>Yoho!Girls | No Fashion, No Life!</title>
-        <link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
+        <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
     </head>
     <body>
         <!--开头的集团导航-->
@@ -139,8 +139,8 @@
                 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
                 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
                 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
-                <li class="jianfan"><a class="unchoosen"  href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
+                <li class="jianfan"><a class="unchoosen"  href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
             </ul>
         </div>
@@ -235,18 +235,7 @@
                 </div>
             </div>
         </div>     
-
-<<<<<<< HEAD
-        
-=======
         {{# scrollToContent}}
         <input type="hidden" id="scrollToContent"/>
         {{/ scrollToContent}}
-
-
-
-
-
-        
->>>>>>> 65e095413b9461edae5df8f4c33a342188216925
--- a/partials/layout/header_jian.html
View file @ead44f0
+++ b/partials/layout/header_jian.html
View file @ead44f0
@@ -17,7 +17,9 @@
                 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
                 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
                 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
+
                 <li class="jianfan"><a class="choosen"  href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen"  href="/go/location">繁</a></li>
+
             </ul>
         </div>
@@ -235,17 +237,8 @@
                 </div>
             </div>
         </div>
-<<<<<<< HEAD
-=======
+
         {{# scrollToContent}}
         <input type="hidden" id="scrollToContent"/>
         {{/ scrollToContent}}
-
-
-
-
-
-
-        
->>>>>>> 65e095413b9461edae5df8f4c33a342188216925