Merge branch 'develop' into test

happyhour7@163.com
Commit 524cbfc1504952d7e4b2b830e0c15c3686755e02 2 parents 02b46464 129101b8
Showing 8 changed files with 48 additions and 8 deletions
actions/default/index.html
actions/default/index_hk.html
actions/default/index_with_nothing.html
actions/default/index_with_nothing_hk.html
actions/default/index_without_advert.html
actions/default/index_without_advert_hk.html
actions/default/index_without_centerbanner.html
actions/default/index_without_centerbanner_hk.html
--- a/actions/default/index.html
View file @524cbfc
+++ b/actions/default/index.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a" {{^ link}} style="cursor:default;" {{/ link}}  href="{{.}}" target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="{{alt}}"> 
     </span>
     {{/ tvs}}
--- a/actions/default/index_hk.html
View file @524cbfc
+++ b/actions/default/index_hk.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a" {{^ link}} style="cursor:default;" {{/ link}} href="{{.}}" target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="{{alt}}"> 
     </span>
     {{/ tvs}}
--- a/actions/default/index_with_nothing.html
View file @524cbfc
+++ b/actions/default/index_with_nothing.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a"  {{^ link}} style="cursor:default;" {{/ link}} href="{{link}}" target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="''"> 
     </span>
     {{/ tvs}}
--- a/actions/default/index_with_nothing_hk.html
View file @524cbfc
+++ b/actions/default/index_with_nothing_hk.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a" href="{{link}}" {{^ link}} style="cursor:default;" {{/ link}}  target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="''"> 
     </span>
     {{/ tvs}}
--- a/actions/default/index_without_advert.html
View file @524cbfc
+++ b/actions/default/index_without_advert.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a"  {{^ link}} style="cursor:default;" {{/ link}} href="{{link}}" target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="''"> 
     </span>
     {{/ tvs}}
--- a/actions/default/index_without_advert_hk.html
View file @524cbfc
+++ b/actions/default/index_without_advert_hk.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a" {{^ link}} style="cursor:default;" {{/ link}}  href="{{link}}" target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="''"> 
     </span>
     {{/ tvs}}
--- a/actions/default/index_without_centerbanner.html
View file @524cbfc
+++ b/actions/default/index_without_centerbanner.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a" href="{{link}}" {{^ link}} style="cursor:default;" {{/ link}}  target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="''"> 
     </span>
     {{/ tvs}}
--- a/actions/default/index_without_centerbanner_hk.html
View file @524cbfc
+++ b/actions/default/index_without_centerbanner_hk.html
View file @524cbfc
@@ -4,7 +4,12 @@
 <div class="tv-area">
     {{# tvs}}
     <span class="tv"> 
-         <a class="tv-a"  {{^ link}} style="cursor:default;" {{/ link}} href="{{link}}" target="_blank"></a>
+         {{# link}}
+             <a class="tv-a"  href="{{link}}" target="_blank"></a>
+         {{/ link}}
+         {{^ link}}
+             <span class="tv-a"  href="{{link}}" target="_blank"></span>
+         {{/ link}}
         <img class="tv-img" src="{{img}}" alt="''"> 
     </span>
     {{/ tvs}}