Merge branch 'dev/v4.8.91_cyl' of qmx/jy into feature/v4.8.91

src/web/staticres/common-module/nps-common/css/nps.css

@@ -94,10 +94,8 @@
 /* pc端样式 */
 #npsMain.npsPc{
   margin: 0 auto;
-  width: 1200px;
 }
 #npsMain.npsPc .nps-content{
-  width: 980px;
   height: auto;
   padding: 32px 0;
   background: url('../image/pc_bg.png') no-repeat;

src/web/staticres/css/pc.css

@@ -1418,9 +1418,12 @@ form{
 	display: none;
 }
 /*****************招标详情页*************************/
+.biddetail-content-container {
+	width: 892px;
+	transition: width 0.1s ease;
+}
 .biddetail-content{
 /*	margin: 0px auto;*/
-    width: 940px;
 	background-color: #fff;
 	padding: 42px 40px;
 	margin-left: 0px;
@@ -1692,8 +1695,7 @@ form{
 	margin-left: -20px;
 }
 .otherinfo{
-	margin: 20px left;
-	width: 980px;
+	margin: 20px 0;
 	font-size: 16px;
 }
 .otherinfo ul{
@@ -1734,7 +1736,7 @@ form{
 	margin-right: 10px;
 }
 .otherinfo li .com-title{
-	width: 560px;
+	width: 500px;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -4347,6 +4349,7 @@ h6 {
 }*/
 /**dev2.1纠错**/
 .recoveryhead{
+	display: flex;
 	background-color: #FFF;
 /*    height: 50px;*/
 /*    border: 1px solid #ebebeb;*/
@@ -4376,7 +4379,7 @@ h6 {
 	position:fixed;
 	top: 0px;
     margin-top: 0px !important;
-    width: 980px;
+    width: 892px;
 	z-index: 99;
 }
 #tab2{
@@ -4509,14 +4512,14 @@ h6 {
     padding-right: 0px !important;
 }
 .cd-type{
-	width: 300px;
+	width: 260px;
     border-right: 1px solid #EBEBEB;
     padding: 10px;
     background-color: #F4F4F9;
     color: #686868;
 }
 .cd-cont{
-	width: 300px;
+	width: 260px;
 	border-right: 1px solid #EBEBEB;
     padding: 10px;
     font-size: 16px;
@@ -4538,19 +4541,19 @@ h6 {
 }
 .subpck .cont-cont{
 	padding-right: 40px;
-    width: 210px !important;
+    width: 190px !important;
 }
 .bidpck .cont-cont{
 	padding-right: 40px;
-    width: 240px !important;
+    width: 210px !important;
 }
 .winpck .cont-cont{
 	padding-right: 40px;
-    width: 444px !important;
+    width: 344px !important;
 }
 .amountpck .cont-cont{
 	padding-right: 40px;
-    width: 180px !important;
+    width: 150px !important;
 }
 .rec-null{
 	position: absolute;
@@ -4634,7 +4637,7 @@ h6 {
     margin-right: -40px;
 }
 .tab3{
-	width: 500px;
+	flex: 1;
     height: 45px;
     border-bottom: 1px solid #ebebeb;
     float: left;

src/web/staticres/pccss/index_pc.css

@@ -22,6 +22,10 @@
     padding-right: 20px;
 }
 
+.in-iframe .w {
+    width: 1200px!important;
+}
+
 .banner-remark {
     position: relative;
 }

src/web/staticres/public-pc/js/article-content.js

@@ -1048,6 +1048,12 @@ function jumpTab(n){
   return false;
 }
 $(function(){
+  if (goTemplateData.inIframe) {
+    $('.main-content').addClass('in-iframe-style')
+    $('.recoveryfat').css({ width: $('.biddetail-content').width() })
+  } else {
+    $('.main-content').addClass('in-outside-style')
+  }
   if ($("#trwidth").find(".preb-exam").length>0){
     $("#exaapprove").show();
   }

src/web/staticres/public-pc/js/header-nav-mini.js

@@ -9,15 +9,21 @@ var headerNavMini = {
   // (这个地方需要注意：这里写的值是第二个头部的真实显示高度。但是在未登陆下，第二个头部其实是不会显示的(高度为0)，但是这个变量仍然是72。)
   _headerNavSecondHeight: 72,
   init: function () {
+    this.initStyle()
     this.initEvents()
   },
   initStyle: function () {
+    var _this = this
     if (this.inIframe) {
       this.headerNav.hide()
       this.headerNavContainer.hide()
     } else {
       this.headerNav.show()
     }
+    // 加个延迟让二级导航的slideDown看起来不那么突兀
+    setTimeout(function () {
+      _this.secondHeaderShow()
+    }, 300)
   },
   headerFixed: function (f) {
     if (f) {
@@ -34,10 +40,9 @@ var headerNavMini = {
     // 头部占位
     this.headerNavPlaceholder.height(this._headerNavFixedHeight)
   },
-  // 登陆前不展示。登陆后工作台外的页面顶部统一展示(除了首页)
+  // 工作台外的页面顶部统一展示(除了首页)
   secondHeaderShow: function (login) {
     if (this.inIframe) return
-    if (!login) return
     // exclude中的页面不会显示第二个头部
     var pathname = location.pathname
     var excludeReg = [
@@ -134,9 +139,7 @@ var headerNavMini = {
       $('.login-register-button').show()
       $('.go-to-workspace').hide()
     }
-    this.initStyle()
     this.changeHeaderPlaceholder()
-    this.secondHeaderShow(login)
   },
   changeMenuActive: function (name) {
     this.headerNav.find('[name='+name+']').addClass('active')

src/web/templates/common/pc-header-nav-second.html

@@ -1,6 +1,4 @@
-{{$userId :=(session "userId")}}
-{{$noLogin :=(or (Eq $userId "") (Eq $userId nil))}}
-{{if and (not $noLogin) (not (Eq .Request.URL "/"))}}
+{{if not (Eq .Request.URL "/")}}
 <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/public-pc/css/pc-header-nav-second.css?v={{Msg "seo" "version"}}' />
 <section id="pc-header-nav-second" class="pc-header-nav-second" style="display: none;">
  <div class="pc-header-nav-second-head">

src/web/templates/pc/biddetail_rec.html

@@ -358,8 +358,12 @@
     <!-- 用户留资 -->
     <div id="vue-collect-user-info"></div>
     <div id="vue-collect-bid-info"></div>
+    <section class="w breadcrumb-nav">
+      <span><a style="color: #686868;" href="/">剑鱼标讯</a></span><span> > </span><span><a style="color: #686868;" {{if eq  .T.obj.stypeadd "NJXM"}} href="javascript:volid(0);" {{else if eq  .T.obj.stypeadd "ZBCGYX" }} href="javascript:volid(0);" {{else}} href="/list/stype/{{.T.obj.stypeadd}}.html" {{end}}>{{if .T.obj.subtype}}{{.T.obj.subtype}}{{else}}{{.T.obj.toptype}}{{end}}项目</a></span><span> > </span><span class="active">{{.T.obj.title}}</span>
+    </section>
     <div class="main-content" style="width: 1200px; position: relative; margin: 0 auto">
-        <div class="biddetail-content" style="width:980px; margin-left:0px;">
+      <div class="biddetail-content-container">
+        <div class="biddetail-content">
             {{if .T.obj.site}}
             {{if eq .T.obj.site "剑鱼信息发布平台"}}
             <div class="yhfb">用户发布</div>
@@ -1453,138 +1457,29 @@
                 </center>
                 {{if .T.obj.urltop}}<a class="trs" style="color:white">　</a>{{end}}
             </div>
-            <div class="exposure-content-right--group">
-                <div onclick="adv_statistics(this)" adv_name="PC快照页-右部" class="exposure-content-right" id="B1" style="cursor: default;">
-                    <!--通过下方脚本注入-->
-                </div>
-                <div onclick="adv_statistics(this)" adv_name="PC快照页-右部" class="exposure-content-right" id="B1-Medical">
-                    <!--通过下方脚本注入-->
-                </div>
-                <script>
-                  /**
-                   * @date 2022-10-15
-                   * 原有右侧曝光广告位区域，业务逻辑已无从确认
-                   * 从代码逻辑上包含排除非启用状态广告（新版已通过Ad 函数支持无需前端判断）、随机展示一个广告
-                   */
-                  {{$s:=(Ad "jy-pccontent-right" -1 .Host)}}
-                  var ADList={{$s}};
-                  var ExcludeList = ""
-                  if (ADList.length>0){
-                    for (var i=0;i<ADList.length;i++ ){
-                      if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
-                        break;
-                      }
-                      var random=Math.floor(Math.random()*ADList.length);
-                      if (ExcludeList.indexOf(random)>-1){
-                        continue;
-                      }
-                      var AD=ADList[random];
-                      if (AD.o_extend != undefined) {
-                        var nowTime = new Date().getTime();
-                        if (AD.o_extend.startTime!=undefined){
-                          var stArr = AD.o_extend.startTime.split("-");
-                          if (stArr.length==6){
-                            var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
-                            var stTime = new Date(stStr.replace(/-/g, '/')).getTime();
-                            //未开始
-                            if (stTime>nowTime){
-                              if (ExcludeList!=""){
-                                ExcludeList +="-"
-                              }
-                              ExcludeList = ExcludeList+ random
-                              continue
-                            }
-                          }
-                        }
-                        if (AD.o_extend.endTime!=undefined){
-                          var etArr = AD.o_extend.endTime.split("-");
-                          if (etArr.length==6){
-                            var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
-                            var etTime = new Date(etStr.replace(/-/g, '/')).getTime();
-                            //已结束
-                            if (etTime<nowTime){
-                              if (ExcludeList!=""){
-                                ExcludeList +="-"
-                              }
-                              ExcludeList = ExcludeList+ random
-                              continue
-                            }
-                          }
-                        }
-                      }
-                      var ADHtml = "";
-                      if(AD.s_pic){
-                        if(AD.s_link){
-                          ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
-                        }
-                        ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
-                        if(AD.s_link){
-                          ADHtml += "</a>";
-                        }
-                      }else {
-                        ADHtml += AD.s_script;
-                      }
-                      $("#B1").html(ADHtml);
-                      break;
-                    }
-                  }
-                  /**
-                   * @date 2022-10-15
-                   * 医疗卫生标签额外新增右侧曝光广告位区域
-                   */
-
-                  function addIndustryExclusive () {
-                    {{$s_medical:=(Ad "jy-pccontent-right--medical" -1 .Host)}}
-                    var ADListOfMedical = {{$s_medical}} || []
-                    var waitAppendHtml = ''
-
-                    /**
-                     * ADListOfMedical.forEach(function (item) {
-                     *         waitAppendHtml += `
-                     *         <div onclick="adv_statistics(this)" adv_name="${item.s_remark}" class="exposure-content-right" data-has-link="${Boolean(item.s_link)}">
-                     *             <a dataHref="${item.s_link}"> <img src="${item.s_pic}"> </a>
-                     *             <img src="${item.s_pic}">
-                     *         </div>
-                     *       `
-                     *  })
-                     */
-                    ADListOfMedical.forEach(function (item) {
-                      waitAppendHtml += "\n        <div onclick=\"adv_statistics(this)\" adv_name=\"".concat(item.s_remark, "\" class=\"exposure-content-right\" data-has-link=\"").concat(Boolean(item.s_link), "\">\n            <a dataHref=\"").concat(item.s_link, "\"> <img src=\"").concat(item.s_pic, "\"> </a>\n            <img src=\"").concat(item.s_pic, "\">\n        </div>\n      ");
-                    });
 
-                    $('#B1').after(waitAppendHtml)
-                  }
-
-                  try {
-                    if (goTemplateData.params.obj.indadd === 'YLWS' || goTemplateData.params.obj.industry === '医疗卫生') {
-                      addIndustryExclusive()
-                    }
-                  } catch (e) {}
-                </script>
-                <div class="_29p15mchdsg" style="margin-top: 12px"></div>
-
-            </div>
             <!--去掉一键报告排版问题-->
-            <!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog" style="width: 458px">
-            <div class="modal-content" style="width: 458px;margin: auto;height: 300px;">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                    <h4 class="modal-title" id="myModalLabel" style="font-size:14px;">请描述排版存在的问题（非必填）</h4>
-                </div>
-                <div class="modal-body" style="height: 181px;">
-                    <textarea class="form-control noresize" id="onekey-value" rows="6" maxlength="200"></textarea>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn" id="onekey">提交</button>
+              <!--<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+                <div class="modal-dialog" style="width: 458px">
+                    <div class="modal-content" style="width: 458px;margin: auto;height: 300px;">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                            <h4 class="modal-title" id="myModalLabel" style="font-size:14px;">请描述排版存在的问题（非必填）</h4>
+                        </div>
+                        <div class="modal-body" style="height: 181px;">
+                            <textarea class="form-control noresize" id="onekey-value" rows="6" maxlength="200"></textarea>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn" id="onekey">提交</button>
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
-    </div>-->
-            <!--S-- NPS评分 --S-->
-            <div id="nps-container"></div>
-            <!--E-- NPS评分 --E-->
-            <div class="otherinfo">
+              </div>-->
+              <!--S-- NPS评分 --S-->
+              <div id="nps-container"></div>
+              <!--E-- NPS评分 --E-->
+
+              <div class="otherinfo">
                 <!--同一个项目的其他招标信息-->
                 {{if .T.projectOther}}
                 <div class="com-title">
@@ -1594,7 +1489,7 @@
                     {{range $k,$v := .T.projectOther}}
                     <li>
                         <div class="com-index">{{$v.index}}.</div>
-                        <div class="com-title"><a href="/article/content/{{$v._id}}.html{{if $v.industry}}?industry={{$v.industry}}{{end}}" target="_blank">{{$v.title}}</a></div>
+                        <div class="com-title"><a href="/article/content/{{$v._id}}.html{{if $v.industry}}?industry={{$v.industry}}{{end}}" target="_blank" title="{{$v.title}}">{{$v.title}}</a></div>
                         <div class="com-status">
                             {{if $v.area}}<span class="com-area"><a href="/list/area/{{$v.areaadd}}.html">{{$v.area}}</a></span>{{end}}
                             {{if or (eq  $v.type "拟建") ( eq  $v.type "采购意向")}}
@@ -1616,7 +1511,7 @@
                     {{range $k,$v := .T.buyerOther}}
                     <li>
                         <div class="com-index">{{$v.index}}.</div>
-                        <div class="com-title"><a href="/article/content/{{$v._id}}.html{{if $v.industry}}?industry={{$v.industry}}{{end}}" target="_blank">{{$v.title}}</a></div>
+                        <div class="com-title"><a href="/article/content/{{$v._id}}.html{{if $v.industry}}?industry={{$v.industry}}{{end}}" target="_blank" title="{{$v.title}}">{{$v.title}}</a></div>
                         <div class="com-status">
                             {{if $v.area}}<span class="com-area"><a href="/list/area/{{$v.areaadd}}.html">{{$v.area}}</a></span>{{end}}
                             {{if or (eq  $v.type "拟建") ( eq  $v.type "采购意向")}}
@@ -1638,7 +1533,7 @@
                     {{range $k,$v := .T.winnerOther}}
                     <li>
                         <div class="com-index">{{$v.index}}.</div>
-                        <div class="com-title"><a href="/article/content/{{$v._id}}.html{{if $v.industry}}?industry={{$v.industry}}{{end}}" target="_blank">{{$v.title}}</a></div>
+                        <div class="com-title"><a href="/article/content/{{$v._id}}.html{{if $v.industry}}?industry={{$v.industry}}{{end}}" target="_blank" title="{{$v.title}}">{{$v.title}}</a></div>
                         <div class="com-status">
                             {{if $v.area}}<span class="com-area"><a href="/list/area/{{$v.areaadd}}.html">{{$v.area}}</a></span>{{end}}
                             {{if or (eq  $v.type "拟建") ( eq  $v.type "采购意向")}}
@@ -1653,73 +1548,190 @@
                     {{end}}
                 </ul>
                 {{end}}
-            </div>
-        </div>
-        <div   onclick="adv_statistics(this)" adv_name="PC快照页-底部"  class="adv-pccontent-bottom" id="B2" style="cursor:default;">
-            <script>
-              {{$s:=(Ad "jy-pccontent-bottom" -1 .Host)}}
-              var ADList={{$s}};
-              var ExcludeList = ""
-              if (ADList.length>0){
-                for (var i=0;i<ADList.length;i++ ){
-                  if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
-                    break;
-                  }
-                  var random=Math.floor(Math.random()*ADList.length);
-                  if (ExcludeList.indexOf(random)>-1){
-                    continue;
-                  }
-                  var AD=ADList[random];
-                  if (AD.o_extend != undefined) {
-                    var nowTime = new Date().getTime();
-                    if (AD.o_extend.startTime!=undefined){
-                      var stArr = AD.o_extend.startTime.split("-");
-                      if (stArr.length==6){
-                        var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
-                        var stTime = new Date(stStr.replace(/-/g, '/')).getTime();
-                        //未开始
-                        if (stTime>nowTime){
-                          if (ExcludeList!=""){
-                            ExcludeList +="-"
+              </div>
+
+              <div onclick="adv_statistics(this)" adv_name="PC快照页-底部"  class="adv-pccontent-bottom" id="B2" style="cursor:default;">
+                <script>
+                  {{$s:=(Ad "jy-pccontent-bottom" -1 .Host)}}
+                  var ADList={{$s}};
+                  var ExcludeList = ""
+                  if (ADList.length>0){
+                    for (var i=0;i<ADList.length;i++ ){
+                      if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+                        break;
+                      }
+                      var random=Math.floor(Math.random()*ADList.length);
+                      if (ExcludeList.indexOf(random)>-1){
+                        continue;
+                      }
+                      var AD=ADList[random];
+                      if (AD.o_extend != undefined) {
+                        var nowTime = new Date().getTime();
+                        if (AD.o_extend.startTime!=undefined){
+                          var stArr = AD.o_extend.startTime.split("-");
+                          if (stArr.length==6){
+                            var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+                            var stTime = new Date(stStr.replace(/-/g, '/')).getTime();
+                            //未开始
+                            if (stTime>nowTime){
+                              if (ExcludeList!=""){
+                                ExcludeList +="-"
+                              }
+                              ExcludeList = ExcludeList+ random
+                              continue
+                            }
                           }
-                          ExcludeList = ExcludeList+ random
-                          continue
                         }
-                      }
-                    }
-                    if (AD.o_extend.endTime!=undefined){
-                      var etArr = AD.o_extend.endTime.split("-");
-                      if (etArr.length==6){
-                        var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
-                        var etTime = new Date(etStr.replace(/-/g, '/')).getTime();
-                        //已结束
-                        if (etTime<nowTime){
-                          if (ExcludeList!=""){
-                            ExcludeList +="-"
+                        if (AD.o_extend.endTime!=undefined){
+                          var etArr = AD.o_extend.endTime.split("-");
+                          if (etArr.length==6){
+                            var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+                            var etTime = new Date(etStr.replace(/-/g, '/')).getTime();
+                            //已结束
+                            if (etTime<nowTime){
+                              if (ExcludeList!=""){
+                                ExcludeList +="-"
+                              }
+                              ExcludeList = ExcludeList+ random
+                              continue
+                            }
                           }
-                          ExcludeList = ExcludeList+ random
-                          continue
                         }
                       }
+                      var ADHtml = "";
+                      if(AD.s_pic){
+                        if(AD.s_link){
+                          ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+                        }
+                        ADHtml += "<img id='pc-article-content-bottom' src='"+AD.s_pic+"'>";
+                        if(AD.s_link){
+                          ADHtml += "</a>";
+                        }
+                      }else {
+                        ADHtml += AD.s_script;
+                      }
+                      $("#B2").html(ADHtml);
+                      break;
                     }
                   }
-                  var ADHtml = "";
-                  if(AD.s_pic){
-                    if(AD.s_link){
-                      ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+                </script>
+              </div>
+          </div>
+            <div class="exposure-content-right--group">
+                <!-- 广告位 -->
+                <section class="banner-right-container old-banner">
+                  <div onclick="adv_statistics(this)" adv_name="PC快照页-右部" class="exposure-content-right" id="B1" style="cursor: default;">
+                      <!--通过下方脚本注入-->
+                  </div>
+                  <div onclick="adv_statistics(this)" adv_name="PC快照页-右部" class="exposure-content-right" id="B1-Medical">
+                      <!--通过下方脚本注入-->
+                  </div>
+                  <script>
+                    /**
+                     * @date 2022-10-15
+                     * 原有右侧曝光广告位区域，业务逻辑已无从确认
+                     * 从代码逻辑上包含排除非启用状态广告（新版已通过Ad 函数支持无需前端判断）、随机展示一个广告
+                     */
+                    {{$s:=(Ad "jy-pccontent-right" -1 .Host)}}
+                    var ADList={{$s}};
+                    var ExcludeList = ""
+                    if (ADList.length>0){
+                      for (var i=0;i<ADList.length;i++ ){
+                        if (ExcludeList!=""&&ExcludeList.split("-").length==ADList.length){
+                          break;
+                        }
+                        var random=Math.floor(Math.random()*ADList.length);
+                        if (ExcludeList.indexOf(random)>-1){
+                          continue;
+                        }
+                        var AD=ADList[random];
+                        if (AD.o_extend != undefined) {
+                          var nowTime = new Date().getTime();
+                          if (AD.o_extend.startTime!=undefined){
+                            var stArr = AD.o_extend.startTime.split("-");
+                            if (stArr.length==6){
+                              var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+                              var stTime = new Date(stStr.replace(/-/g, '/')).getTime();
+                              //未开始
+                              if (stTime>nowTime){
+                                if (ExcludeList!=""){
+                                  ExcludeList +="-"
+                                }
+                                ExcludeList = ExcludeList+ random
+                                continue
+                              }
+                            }
+                          }
+                          if (AD.o_extend.endTime!=undefined){
+                            var etArr = AD.o_extend.endTime.split("-");
+                            if (etArr.length==6){
+                              var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+                              var etTime = new Date(etStr.replace(/-/g, '/')).getTime();
+                              //已结束
+                              if (etTime<nowTime){
+                                if (ExcludeList!=""){
+                                  ExcludeList +="-"
+                                }
+                                ExcludeList = ExcludeList+ random
+                                continue
+                              }
+                            }
+                          }
+                        }
+                        var ADHtml = "";
+                        if(AD.s_pic){
+                          if(AD.s_link){
+                            ADHtml += "<a dataHref='"+AD.s_link+"' target='_blank'>";
+                          }
+                          ADHtml += "<img id='pc-article-content-right' src='"+AD.s_pic+"'>";
+                          if(AD.s_link){
+                            ADHtml += "</a>";
+                          }
+                        }else {
+                          ADHtml += AD.s_script;
+                        }
+                        $("#B1").html(ADHtml);
+                        break;
+                      }
                     }
-                    ADHtml += "<img id='pc-article-content-bottom' src='"+AD.s_pic+"'>";
-                    if(AD.s_link){
-                      ADHtml += "</a>";
+                    /**
+                     * @date 2022-10-15
+                     * 医疗卫生标签额外新增右侧曝光广告位区域
+                     */
+
+                    function addIndustryExclusive () {
+                      {{$s_medical:=(Ad "jy-pccontent-right--medical" -1 .Host)}}
+                      var ADListOfMedical = {{$s_medical}} || []
+                      var waitAppendHtml = ''
+
+                      /**
+                       * ADListOfMedical.forEach(function (item) {
+                       *         waitAppendHtml += `
+                       *         <div onclick="adv_statistics(this)" adv_name="${item.s_remark}" class="exposure-content-right" data-has-link="${Boolean(item.s_link)}">
+                       *             <a dataHref="${item.s_link}"> <img src="${item.s_pic}"> </a>
+                       *             <img src="${item.s_pic}">
+                       *         </div>
+                       *       `
+                       *  })
+                       */
+                      ADListOfMedical.forEach(function (item) {
+                        waitAppendHtml += "\n        <div onclick=\"adv_statistics(this)\" adv_name=\"".concat(item.s_remark, "\" class=\"exposure-content-right\" data-has-link=\"").concat(Boolean(item.s_link), "\">\n            <a dataHref=\"").concat(item.s_link, "\"> <img src=\"").concat(item.s_pic, "\"> </a>\n            <img src=\"").concat(item.s_pic, "\">\n        </div>\n      ");
+                      });
+
+                      $('#B1').after(waitAppendHtml)
                     }
-                  }else {
-                    ADHtml += AD.s_script;
-                  }
-                  $("#B2").html(ADHtml);
-                  break;
-                }
-              }
-            </script>
+
+                    try {
+                      if (goTemplateData.params.obj.indadd === 'YLWS' || goTemplateData.params.obj.industry === '医疗卫生') {
+                        addIndustryExclusive()
+                      }
+                    } catch (e) {}
+                  </script>
+                </section>
+                <section class="banner-right-container seo-banner">
+                    {{include "/pc/tags/template/aside-news-cards.html"}}
+                </section>
+            </div>
         </div>
         <!-- 商机管理认领-自定义标签弹框 -->
         <div class="tags-box" id="entNicheTags">

src/web/templates/pc/newIndex.html

@@ -47,7 +47,7 @@
           <div class="banner-swiper swiper-container" id="new-pc-index-top-carousel">
             <div class="swiper-wrapper">
               {{range $ad := $ad_1}}
-              <a class="swiper-slide" target="_blank" href="{{$ad.S_link}}">
+              <a class="swiper-slide" target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
                 <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
               </a>
               {{end}}
@@ -72,7 +72,7 @@
                 <div class="banner-swiper swiper-container" id="new-pc-index-carousel">
                   <div class="swiper-wrapper">
                     {{range $ad := $ad_2}}
-                    <a class="swiper-slide" target="_blank" href="{{$ad.S_link}}">
+                    <a class="swiper-slide" target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
                       <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
                     </a>
                     {{end}}
@@ -97,7 +97,7 @@
               <div class="banner-swiper swiper-container" id="new-pc-index-middle-carousel">
                 <div class="swiper-wrapper">
                   {{range $ad := $ad_3}}
-                  <a class="swiper-slide banner-remark" target="_blank" href="{{$ad.S_link}}">
+                  <a class="swiper-slide banner-remark" target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
                     <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
                   </a>
                   {{end}}
@@ -118,7 +118,7 @@
                 <div class="banner-swiper swiper-container" id="new-pc-index-twenty-three-left">
                   <div class="swiper-wrapper">
                     {{range $ad := $ad_4}}
-                    <a class="swiper-slide banner-remark" target="_blank" href="{{$ad.S_link}}">
+                    <a class="swiper-slide banner-remark" target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
                       <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
                     </a>
                     {{end}}
@@ -133,7 +133,7 @@
                 <div class="banner-swiper swiper-container" id="new-pc-index-twenty-three-right">
                   <div class="swiper-wrapper">
                     {{range $ad := $ad_5}}
-                    <a class="swiper-slide banner-remark" target="_blank" href="{{$ad.S_link}}">
+                    <a class="swiper-slide banner-remark" target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
                       <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
                     </a>
                     {{end}}
@@ -208,7 +208,6 @@
       {{include "/common/pcbottom.html"}}
     </div>
   </section>
-
   <script src="//cdn-common.jianyu360.com/cdn/lib/vue/2.7.14/vue.min.js"></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/svga-web/svga.min.js></script>
   <script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js"></script>
@@ -224,12 +223,12 @@
   {{include "/pc/template/index/index-bottom-float-ad.html"}}
   <!-- 新用户弹窗 -->
   <!-- include "/common/pc_ad_dialog.html" -->
-  <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_2023.12.js?v={{Msg "seo" "version"}}'></script>
-  <script defer src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
-  <script defer type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_charts.js?v={{Msg "seo" "version"}}'></script>
   <script>
     haslogin('10')
   </script>
+  <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_2023.12.js?v={{Msg "seo" "version"}}'></script>
+  <script defer src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
+  <script defer type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_charts.js?v={{Msg "seo" "version"}}'></script>
 </body>
 
 </html>

src/web/templates/pc/template/index/banner-module-27.html

@@ -5,7 +5,7 @@
   <ul class="banner-module-list-27 clearfix">
     {{range $ad := $ad_27}}
     <li class="banner-module-item-27 banner-remark">
-      <a href="{{$ad.S_link}}" target="_blank">
+      <a {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}} target="_blank">
         <img src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
       </a>
     </li>

src/web/templates/pc/template/index/index-bottom-float-ad.html

@@ -1,63 +1,73 @@
-<div class="pc-index-bottom" style="display: none;">
-  <img class="bottom-member-ad" adv_name="PC首页广告位-底部" src="" alt="底部广告位">
-</div>
-
-<script>
-  $(function () {
-    // 首页底部广告位
-    {{$bottom:=(Ad "jy_pc_index_bottom" -1 .Host)}}
-    var bottom_img = ({{$bottom}})
-
-    // 首页底部样式调整，适配广告位
-    function fixBottomADHeight (type) {
-      var adHeight = $('.pc-index-bottom').height()
-      if (type) {
-        $(".jy_renzheng").css('padding-bottom', adHeight)
-        $(".j-bottom").attr('data-padding-bottom', Number($(".j-bottom").css('padding-bottom').replace('px', '')))
-        $(".j-bottom").css('padding-bottom', Number($(".j-bottom").css('padding-bottom').replace('px', '')) + adHeight)
-      } else {
-        $(".jy_renzheng").css('padding-bottom', 0)
-        $(".j-bottom").css('padding-bottom', Number($(".j-bottom").attr('data-padding-bottom')))
-      }
-    }
-    $('.pc-index-bottom .bottom-member-ad').on('load', function () {
-      fixBottomADHeight(true)
-    })
-    $('.pc-index-bottom .bottom-member-ad').attr('src', bottom_img[0].s_pic)
-    $('.pc-index-bottom .bottom-member-ad').unbind('click').click(function () {
-      window.open(bottom_img[0].s_link)
-    })
-
-
-    clearInterval(memberTimer)
-    var memberTimer = setInterval(function () {
-      if (window.memberStatus >= 0) {
-        clearInterval(memberTimer)
-      }
-      adBottomFn()
-    }, 2000)
-    function adBottomFn () {
-      if (window.memberStatus > 0) {
-        $('.pc-index-bottom').hide()
-        fixBottomADHeight(false)
-      } else {
-        var top1 = 0;
-        var top2 = 0;
-        var timer = null; 
-        $('.pc-index-bottom').fadeIn()
-        $(document).scroll(function(){
-          clearTimeout(timer)
-          timer = setTimeout(isScrollEnd, 1000);
-          top1 = document.documentElement.scrollTop || document.body.scrollTop;
-          $('.pc-index-bottom').fadeOut()
+{{$bottom:=(Ad "jy_pc_index_bottom" -1 .Host)}}
+{{if $bottom}}
+  {{if gt (len $bottom) 0}}
+    <div class="pc-index-bottom" style="display: none;">
+      <img class="bottom-member-ad" adv_name="PC首页广告位-底部" src="" alt="底部广告位">
+    </div>
+    
+    <script>
+      $(function () {
+        // 首页底部广告位
+        var bottom_img = ({{$bottom}})
+        // 首页底部样式调整，适配广告位
+        function fixBottomADHeight (type) {
+          var adHeight = $('.pc-index-bottom').height()
+          if (type) {
+            $(".jy_renzheng").css('padding-bottom', adHeight)
+            $(".j-bottom").attr('data-padding-bottom', Number($(".j-bottom").css('padding-bottom').replace('px', '')))
+            $(".j-bottom").css('padding-bottom', Number($(".j-bottom").css('padding-bottom').replace('px', '')) + adHeight)
+          } else {
+            $(".jy_renzheng").css('padding-bottom', 0)
+            $(".j-bottom").css('padding-bottom', Number($(".j-bottom").attr('data-padding-bottom')))
+          }
+        }
+        $('.pc-index-bottom .bottom-member-ad').on('load', function () {
+          fixBottomADHeight(true)
         })
-        function isScrollEnd() {
-          top2 = document.documentElement.scrollTop || document.body.scrollTop;
-          if(top1 == top2 && (window.memberStatus <= 0 || !window.memberStatus)){
+        if ($.isArray(bottom_img)) {
+          if (bottom_img[0]) {
+            if (bottom_img[0].s_pic) {
+              $('.pc-index-bottom .bottom-member-ad').attr('src', bottom_img[0].s_pic)
+            }
+            if (bottom_img[0].s_link) {
+              $('.pc-index-bottom .bottom-member-ad').unbind('click').click(function () {
+                window.open(bottom_img[0].s_link)
+              })
+            }
+          }
+        }
+    
+        clearInterval(memberTimer)
+        var memberTimer = setInterval(function () {
+          if (window.memberStatus >= 0) {
+            clearInterval(memberTimer)
+          }
+          adBottomFn()
+        }, 2000)
+        function adBottomFn () {
+          if (window.memberStatus > 0) {
+            $('.pc-index-bottom').hide()
+            fixBottomADHeight(false)
+          } else {
+            var top1 = 0;
+            var top2 = 0;
+            var timer = null; 
             $('.pc-index-bottom').fadeIn()
+            $(document).scroll(function(){
+              clearTimeout(timer)
+              timer = setTimeout(isScrollEnd, 1000);
+              top1 = document.documentElement.scrollTop || document.body.scrollTop;
+              $('.pc-index-bottom').fadeOut()
+            })
+            function isScrollEnd() {
+              top2 = document.documentElement.scrollTop || document.body.scrollTop;
+              if(top1 == top2 && (window.memberStatus <= 0 || !window.memberStatus)){
+                $('.pc-index-bottom').fadeIn()
+              }
+            }
           }
         }
-      }
-    }
-  })
-</script>
+      })
+    </script>
+  {{end}}
+{{end}}

src/web/templates/pc/template/index/partners-project-list.html

@@ -5,7 +5,7 @@
   <ul class="partners-project-list clearfix">
     {{range $ad := $ad_5}}
     <li class="partners-project-item">
-      <a href="{{$ad.S_link}}">
+      <a {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}} target="_blank">
         <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
       </a>
     </li>

src/web/templates/pc/template/index/user-info-card.html

@@ -43,7 +43,7 @@
     <ul class="user-power-list clearfix">
       {{range $ad := $ad_menu}}
         <li class="user-power-item pointer">
-          <a class="user-power-item-link" href="{{$ad.S_link}}">
+          <a class="user-power-item-link" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
             <span class="user-power-item-icon">
               <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
             </span>