Merge branch 'master' into feature/v4.7.49

src/jfw/modules/app/src/web/templates/exhibition/index.html

@@ -65,7 +65,7 @@
         <div class="swiper-wrapper">
           <!-- 两端图尺寸不一致因此需要区分 -->
           {{range $i, $v :=Ad "app-exhibition-index-top" -1 .Host}}
-          <div class="swiper-slide">
+          <div class="swiper-slide" onclick="golink({{$v.S_link}})">
             <!-- pc 图 -->
             <img class="m_hide" src="{{$v.S_pic}}" alt="{{$v.S_remark}}">
             <!-- 移动 图-->
@@ -285,7 +285,12 @@
       ///jyapp/exhibition/details/(.*).html
       window.location.href = "/jyapp/exhibition/details/" + id + ".html"
     }
-
+    function golink(link){
+      if(link){
+        window.location.href = link
+      }
+      
+    }
   </script>
   <!--百度统计-->
   {{include "/common/baiducc.html"}}

src/web/staticres/common-module/exhibition/css/index_pc.css

@@ -68,13 +68,13 @@
   }
 
   .swiper_btn_box {
-    width: 1200px;
+    /* width: 1200px;
     height: 240px;
     left: 50%;
     top: 50%;
     transform: translate(-50%, -50%);
     position: absolute;
-    z-index: 99;
+    z-index: 99; */
 
   }
 

src/web/staticres/public-pc/css/sub-page.css

@@ -262,7 +262,7 @@ body.in-iframe {
 }
 
 .in-iframe #vm_exhibition .swiper_btn_box {
-  width: 65% !important;;
+  width: 65% !important;
   /* height: 160px !important; */
   left: 50%;
   top: 50%;

src/web/templates/exhibition/pc/index.html

@@ -47,7 +47,7 @@
         <div class="swiper-wrapper">
           <!-- 两端图尺寸不一致因此需要区分 -->
           {{range $i, $v :=Ad "pc-exhibition-index-top" -1 .Host}}
-          <div class="swiper-slide">
+          <div class="swiper-slide" onclick="golink({{$v.S_link}})">
             <!-- pc 图 -->
             <img class="m_hide" src="{{$v.S_pic}}" alt="{{$v.S_remark}}">
             <!-- 移动 图-->
@@ -273,6 +273,12 @@
         window.open(openHref) 
       }
     }
+    function golink(link){
+      if(link){
+        window.open(link)
+      }
+      
+    }
 
   </script>
   {{include "/common/pcbottom.html"}}

src/web/templates/exhibition/weixin/index.html

@@ -50,7 +50,7 @@
         <div class="swiper-wrapper">
           <!-- 两端图尺寸不一致因此需要区分 -->
           {{range $i, $v :=Ad "app-exhibition-index-top" -1 .Host}}
-          <div class="swiper-slide">
+          <div class="swiper-slide" onclick="golink({{$v.S_link}})">
             <!-- pc 图 -->
             <img class="m_hide" src="{{$v.S_pic}}" alt="{{$v.S_remark}}">
             <!-- 移动 图-->
@@ -265,6 +265,12 @@
       console.log("_id", id)
       window.location.href = "/exhibition/details/weixin/" + id + ".html"
     }
+    function golink(link){
+      if(link){
+        window.location.href = link
+      }
+      
+    }
   </script>
   {{include "/common/baiducc.html"}}
 </body>