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

src/web/staticres/css/pc/index.css

@@ -1093,10 +1093,6 @@ cursor: pointer;
   transition-timing-function: linear !important;
 }
 
-.jy-index-partners .swiper-container,
-.jy-index-partners .swiper-container .swiper-slide {
-  cursor: auto;
-}
 .jy-index-partners .swiper-slide {
   width: auto !important;
   padding: 4px 8px;

src/web/staticres/dataExport/css/conditions.css

@@ -930,7 +930,9 @@ input.sm {
   align-items: center;
   justify-content: space-between;
   padding-bottom: 32px;
-  height: 100%;
+}
+.no-data-text-hd {
+  margin-bottom: 20px;
 }
 .noDataDialog .el-button.el-button--primary{
   padding: 0;

src/web/staticres/pccss/index_pc.css

@@ -965,7 +965,7 @@
 .buyer-list-cell-num-container .highlight-text {
     font-size: 18px;
     font-weight: 700;
-    line-height: 28px;
+    line-height: 22px;
 }
 
 /* ent-service-module */
@@ -1156,6 +1156,7 @@
     height: 36px;
     line-height: 36px;
     border: none;
+    border-radius: 6px;
 }
 .chart-search-container .search-button {
     margin-left: -8px;

src/web/staticres/pccss/index_swiper.css

@@ -12,6 +12,14 @@
   width: 100%;
   object-fit: cover;
 }
+/* swiper-no-swiping 禁止鼠标滑动 */
+.swiper-no-pointer.swiper-container,
+.swiper-no-pointer.swiper-container .swiper-slide,
+.swiper-no-pointer,
+.swiper-no-pointer .swiper-slide {
+  cursor: auto;
+}
+
 .custom-dot {
   bottom: 10%;
   text-align: center;

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

@@ -42,8 +42,8 @@
                     <li class="menu-item message-menu login-show" id="noticed" style="display: none;">
                         <a class="message-menu-link" href="/swordfish/frontPage/messageCenter/sess/index">
                             <div class="icon-img-message">
-                                <img src="/images/index/message2@2x.png" class="message-img" alt="">
-                                <img src="/images/index/message2@2x.png" class="message-img-active" alt="">
+                                <img src="/images/index/message2_2x.png" class="message-img" alt="消息">
+                                <img src="/images/index/message2_2x.png" class="message-img-active" alt="消息">
                                 <!-- <img src="/images/index/message-active.png" class="message-img-active" alt=""> -->
                             </div>
                             <span class="tips" id="tips" style="display: none">99+</span>
@@ -75,12 +75,12 @@
 </section>
 
 <!-- Modal -->
-<div class="modal fade" id="downloadApp" tabindex="-1" aria-labelledby="downloadApp" aria-hidden="true">
+<!-- <div class="modal fade" id="downloadApp" tabindex="-1" aria-labelledby="downloadApp" aria-hidden="true">
     <div class="modal-dialog">
         <div class="download-scan-group">
             <img src='/images/index/download-app.png' alt="下载APP">
             <div class="close-icon pointer" data-dismiss="modal"></div>
         </div>
     </div>
-</div>
+</div> -->
 <script src='{{Msg "seo" "cdn"}}/public-pc/js/header-nav-mini.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/common/pc-login-dialog.html

@@ -188,7 +188,7 @@
           <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称" />
           <div class="autocomplete-box">
             <ul>
-              <li>xxxxxx</li>
+              <li> </li>
             </ul>
           </div>
         </div>

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

@@ -307,9 +307,40 @@
   var pageIndex = {
     init: function() {
       this.lunBoFn() // banner轮播
+      this.calcHeaderTheme()
       this.setCopyRightForBottom() // 设置copyright
     },
+    calcHeaderTheme: function () {
+      var img = null
+      var activeSlide = document.getElementsByClassName('swiper-slide-active')
+      console.log(activeSlide)
+      if (activeSlide.length > 0) {
+        img = activeSlide[0].children[0]
+      } else {
+        img = $('#bannerSwiper').find('swiper-slide:eq(0) img')[0]
+      }
+      var theme = $(img).attr('data-theme')
+      var opa = $(document).scrollTop() / 20
+      if (opa < 1) {
+        if (theme === 'light') {
+          setTimeout(function(){
+            $('.public-nav').addClass('light-bg-dark-color').removeClass('light-bg-light-color')
+            $('.swiper-pagination').addClass('light-swiper-bg-dark-color').removeClass('light-swiper-bg-light-color')
+            $('.loginBtn').css('color', '#1d1d1d')
+          }, 100)
+        } else {
+          setTimeout(function(){
+            $('.public-nav').addClass('light-bg-light-color').removeClass('light-bg-dark-color')
+            $('.loginBtn').css('color', '#fff')
+            var a = $('.jy-index .jy-index-banner .custom-dot .swiper-pagination-bullet-active')
+            // $('.jy-index .jy-index-banner .custom-dot .swiper-pagination-bullet').css('background', 'rgba(255, 255, 255, 0.32)')
+            $('.swiper-pagination').addClass('light-swiper-bg-light-color').removeClass('light-swiper-bg-dark-color')
+          }, 100)
+        }
+      }
+    },
     lunBoFn: function () {
+      var calcHeaderTheme = this.calcHeaderTheme()
       // banner广告位轮播
       var bannerSwiper = new Swiper('#bannerSwiper', {
         slidesPerView: 1,
@@ -327,26 +358,7 @@
         loop: $('#bannerSwiper').find('.swiper-slide').length > 1 ? true : false, // imageList.length > 1 ? true : false
         on: {
           slideChangeTransitionStart: function() {
-            var img = document.getElementsByClassName('swiper-slide-active')[0].children[0];
-            var theme = $(img).attr('data-theme')
-            var opa = $(document).scrollTop() / 20
-            if (opa < 1) {
-              if (theme === 'light') {
-                setTimeout(function(){
-                  $('.public-nav').addClass('light-bg-dark-color').removeClass('light-bg-light-color')
-                  $('.swiper-pagination').addClass('light-swiper-bg-dark-color').removeClass('light-swiper-bg-light-color')
-                  $('.loginBtn').css('color', '#1d1d1d')
-                }, 100)
-              } else {
-                setTimeout(function(){
-                  $('.public-nav').addClass('light-bg-light-color').removeClass('light-bg-dark-color')
-                  $('.loginBtn').css('color', '#fff')
-                  var a = $('.jy-index .jy-index-banner .custom-dot .swiper-pagination-bullet-active')
-                  // $('.jy-index .jy-index-banner .custom-dot .swiper-pagination-bullet').css('background', 'rgba(255, 255, 255, 0.32)')
-                  $('.swiper-pagination').addClass('light-swiper-bg-light-color').removeClass('light-swiper-bg-dark-color')
-                }, 100)
-              }
-            }
+            calcHeaderTheme()
           }
         }
       });

src/web/templates/pc/dataExport_sieve.html

@@ -1336,8 +1336,8 @@
       width="30%"
       center>
       <div class="no-data-text">
-        <p>未匹配到数据</p>
-        <p>对不起，没有匹配到数据，请修改数据导出条件</p>
+        <p class="no-data-text-hd">未匹配到数据</p>
+        <p class="no-data-text-bd">对不起，没有匹配到数据，请修改数据导出条件</p>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="goModify">立即修改</el-button>

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}}">
+      <a href="{{$ad.S_link}}" target="_blank">
         <img src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
       </a>
     </li>

src/web/templates/pc/template/index/banner-partners.html

@@ -13,13 +13,13 @@
 </style>
 <div class="jy-index-partners">
   <h3 class="module-title">合作伙伴</h3>
-  <div class="partners-container swiper-container">
+  <div class="partners-container swiper-container swiper-no-pointer">
     <div class="swiper-mask mask-left"></div>
     <div class="swiper-mask mask-right"></div>
     <div class="swiper-wrapper">
       <div class="swiper-slide">
         <div class="img-box">
-          <img src='{{Msg "seo" "cdn"}}/images/index/huawei.png?v={{Msg "seo" "version"}}' />
+          <img src='{{Msg "seo" "cdn"}}/images/index/huawei.png?v={{Msg "seo" "version"}}' alt="华为" />
         </div>
         <div class="img-box">
           <img src='{{Msg "seo" "cdn"}}/images/index/xinyu.png?v={{Msg "seo" "version"}}' />

src/web/templates/pc/template/index/bidding-good-news-card.html

@@ -1,4 +1,4 @@
-<section class="notice-card">
+<section class="notice-card zb-xibao">
   <header class="notice-card-header">
     <h3 class="notice-card-title notice-header-bg">剑鱼会员中标喜报</h3>
   </header>
@@ -8,7 +8,7 @@
       {{range $kk,$vv := $v}}
       <li class="notice-card-list-item">
         <i class="notice-item-prefix-icon j-icon base-icon icon-img-sahua"></i>
-        <p class="notice-card-list-item-content ellipsis"><a class="cms-link" href="/nologin/content/{{$vv}}.html">[恭贺]{{$kk}}</a></p>
+        <p class="notice-card-list-item-content ellipsis"><a class="cms-link" target="_blank" href="/nologin/content/{{$vv}}.html" title="[恭贺]{{$kk}}">[恭贺]{{$kk}}</a></p>
       </li>
       {{end}}
       {{end}}

src/web/templates/pc/template/index/cms-card-deep.html

@@ -1,6 +1,9 @@
 <section class="cms-card header-deep-theme jianyu-school-card">
   <header class="cms-card-header">
     <h3 class="cms-card-title">剑鱼学堂</h3>
+    <div class="cms-card-header-right">
+      <a class="pointer cms-link" href="/jySchool/index" target="_blank">查看更多 ></a>
+    </div>
   </header>
   <main class="cms-card-content border-ec">
     <ul class="cms-card-list clearfix">

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

@@ -10,7 +10,7 @@
           <h3 class="title-left-line">数字化营销</h3>
         </header>
         <main class="service-desc-main">
-          <p class="service-desc-text">实现用户在平台上完成资讯、销售线索、销售就会、客户的全线跟踪处理。</p>
+          <p class="service-desc-text">实现用户在平台上完成资讯、销售线索、销售机会、客户的全线跟踪处理。</p>
           <ul class="service-desc-list clearfix">
             <li>
               <a class="service-desc-button s-main cms-link" href="/swordfish/frontPage/digitalMarketing/free/index" target="_blank">专属情报库</a>

src/web/templates/pc/template/index/hot-industry-card.html

@@ -16,7 +16,7 @@
         </li>
         {{end}}
         <li class="fr more">
-          <a class="cms-link highlight-text" href="/tags/industry/all.html?expand={{$ke}}">更多 ></a>
+          <a class="cms-link highlight-text" target="_blank" href="/tags/industry/all.html?expand={{$ke}}">更多 ></a>
         </li>
       </ul>
     </div>

src/web/templates/pc/template/index/notice-card.html

@@ -2,14 +2,14 @@
   <header class="notice-card-header">
     <h3 class="notice-card-title notice-header-bg">优秀供应商</h3>
   </header>
-  <main class="notice-card-content swiper-container swiper-no-swiping">
+  <main class="notice-card-content swiper-container swiper-no-swiping swiper-no-pointer">
     <section class="swiper-wrapper">
       {{range $k,$v := .T.supplyEnt}}
       <ul class="notice-card-list swiper-slide clearfix">
         {{range $n := $v}}
         <li class="notice-card-list-item">
           <i class="notice-item-prefix-icon j-icon base-icon icon-img-sahua"></i>
-          <p class="notice-card-list-item-content ellipsis">{{$n.name}}</p>
+          <p class="notice-card-list-item-content ellipsis" title="{{$n.name}}">{{$n.name}}</p>
         </li>
         {{end}}
       </ul>
@@ -18,9 +18,9 @@
   </main>
   <footer class="notice-card-footer">
     {{if .T.hasLogin}}
-    <a class="service-desc-button s-confirm button-blink" href="/swordfish/page_web_pc/issued/info">免费发布信息</a>
+    <a class="service-desc-button s-confirm button-blink" target="_blank" href="/swordfish/page_web_pc/issued/info">免费发布信息</a>
     {{else}}
-    <a class="service-desc-button s-confirm button-blink" href="/swordfish/frontPage/InformationDistribution/free/index">免费发布信息</a>
+    <a class="service-desc-button s-confirm button-blink" target="_blank" href="/swordfish/frontPage/InformationDistribution/free/index">免费发布信息</a>
     {{end}}
   </footer>
   <!-- <main class="notice-card-content notice-card-list empty">

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

@@ -16,7 +16,7 @@
         <ul class="cms-card-list clearfix">
           {{range $vv := $v.listData}}
           <li class="cms-card-list-item">
-            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="/nologin/content/{{$vv._id}}.html" target="_blank">{{$vv.title}}</a>
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="{{$vv.title}}" href="/nologin/content/{{$vv._id}}.html" target="_blank">{{$vv.title}}</a>
             <span class="cms-card-list-item-right">{{$vv.publish_time}}</span>
           </li>
           {{end}}

src/web/templates/pc/template/index/search-module.html

@@ -4,7 +4,7 @@
     <!-- 大login图 -->
     <h2 class="login-container-large">
       <a class="logo-link" href="/">
-        <img class="logo-img" src="/images/index/new/logo-200x132@2x.png" alt="">
+        <img class="logo-img" src="/images/index/new/logo.png" alt="剑鱼标讯">
       </a>
       <p class="logo-text">全国招标信息免费看，不遮挡</p>
     </h2>
@@ -46,7 +46,7 @@
           {{range $i,$v := .T.hotKeyArrUnLogin}}
             {{if lt $i 10}}
             <li class="hot-key-item">
-              <a class="cms-link" title="{{$v.Name}}" href="{{$v.Url}}">{{$v.Name}}</a>
+              <a class="cms-link" target="_blank" title="{{$v.Name}}" href="{{$v.Url}}">{{$v.Name}}</a>
             </li>
             {{end}}
           {{end}}
@@ -54,7 +54,7 @@
           {{range $i,$v := .T.hotkey}}
             {{if lt $i 10}}
             <li class="hot-key-item">
-              <a class="cms-link" href="{{if  $hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords={{$v}}&searchvalue=&selectType=title">{{$v}}</a>
+              <a class="cms-link" target="_blank" href="{{if  $hasLogin}}/page_workDesktop/work-bench/page?link={{end}}/jylab/supsearch/index.html?keywords={{$v}}&searchvalue=&selectType=title">{{$v}}</a>
             </li>
             {{end}}
           {{end}}