Merge branch 'master' into feature/v4.8.88

src/web/staticres/pccss/index_pc.css

@@ -1001,7 +1001,15 @@
     width: 100%;
 }
 
-
+.service-desc-button a:hover,
+.service-desc-button a:focus {
+    text-decoration: none;
+}
+.service-flow-chart-link {
+    display: block;
+    width: 584px;
+    height: 314px;
+}
 .service-desc-button {
     display: flex;
     align-items: center;

src/web/templates/pc/supsearch.html

@@ -2882,13 +2882,14 @@ function checkTagDisabled () {
       // aHref += aHref.indexOf('?') > -1 ? '&aside=0' : '?aside=0'
       var targetLink = '/article/content/' + thisId + aHref
       // 在iframe里，往工作桌面跳转。不在iframe里，正常跳转
-      if(goTemplateData.inIframe){
-        var workspaceTargetLink = location.origin + targetLink
-        var wordspcePage = '/page_workDesktop/work-bench/page?link=' + encodeURIComponent(workspaceTargetLink)
-        window.open(wordspcePage)
-      } else {
-        window.open(targetLink)
-      }
+      // if(goTemplateData.inIframe){
+      //   var workspaceTargetLink = location.origin + targetLink
+      //   var wordspcePage = '/page_workDesktop/work-bench/page?link=' + encodeURIComponent(workspaceTargetLink)
+      //   window.open(wordspcePage)
+      // } else {
+      //   window.open(targetLink)
+      // }
+      window.open(targetLink)
     }else{//没有登录跳转新的详情
       checkVisited('nologin')
       // 渠道合作页,未登录跳转需要弹出登录，重置到已登录后的详情页

src/web/templates/pc/template/index/ent-service-module.html

@@ -29,9 +29,16 @@
       </section>
     </div>
     <div class="service-module-content-right">
+      {{$ad_ent_service:=(Ad "new-pc-index-ent-service" 1 .Host)}}
+      {{if $ad_5}}
       <div class="service-flow-chart">
-        <img src="/images/index/ent-service-flow-chart_2x.png" alt="">
+        {{range $ad := $ad_ent_service}}
+        <a class="service-flow-chart-link" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
+          <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
+        </a>
+        {{end}}
       </div>
+      {{end}}
     </div>
-  </main> 
+  </main>
 </section>