Merge branch 'feature/v4.7.62' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.62

src/web/staticres/css/dev2/biddingSearch.css

@@ -15,9 +15,10 @@
 /*白色字体*/
 #searchInner .searchHeader {
   /*头部*/
+  margin-top: 24px;
   /* height: 110px; */
-  background-color: #f5f5fb;
-  border-top: 1px solid #e0e0e0;
+  /* background-color: #f5f5fb; */
+  /* border-top: 1px solid #e0e0e0; */
 }
 
 #searchInner .searchHeader .searchHeader-container {
@@ -120,11 +121,11 @@
 }
 
 
-@media only screen and (max-width:1440px),only screen and (max-device-width:1440px){
+/* @media only screen and (max-width:1440px),only screen and (max-device-width:1440px){
   #searchInner .searchHeader .searchHeader-container .searchInput form input[type='search'] {
     width: 500px;
   }
-}
+} */
 
 
 #searchInner .searchHeader .searchHeader-container .searchInput form input[type='submit'] {
@@ -389,7 +390,7 @@ margin-left: 176px;
 
 #searchInner .searchControl .searchTender .leftTitle {
   float: left;
-  width: 94px;
+  width: 98px;
   text-align: right;
   color: #686868;
   padding: 4px 15px 4px 0px;
@@ -715,7 +716,7 @@ border-radius:2px;
 
 #searchInner .searchControl .seaTender-inner .tabTitle {
   line-height: 46px;
-  border: 1px solid #e0e0e0;
+  border-bottom: 1px solid #e0e0e0;
 /*  background-color: #f5f4f9;*/
 }
 
@@ -1677,4 +1678,20 @@ position: absolute;
 }
 .change-search-input{
   padding: 16px 24px 10px 32px;
+}
+/* 未登录页面样式调整为与嵌入页面一样 */
+body{
+  background: #f2f2f4;
+}
+#searchInner .searchControl .searchTender,
+#searchInner .searchHeader-container,
+#searchInner .filter-header{
+  background: #fff;
+}
+#searchInner .searchHeader-container,
+#searchInner .searchControl .searchTender{
+  border-radius: 8px;
+}
+#searchInner .searchControl .searchTender{
+  border: 0;
 }

src/web/staticres/css/dev2/superSearch.css

@@ -133,16 +133,16 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 0 16px 0 30px;
+  padding: 0 16px 0 22px;
   margin: 0 -15px;
   height: 50px;
   line-height: 50px;
   background: #F5F5FB;
-  border: 1px solid #ECECEC;
+  border-bottom: 1px solid #ECECEC;
 }
 .filter-header .f-h-label{
   width: 100px;
-  padding-left: 16px;
+  padding-left: 10px;
   background-repeat: no-repeat;
   background-position: right center;
   background-size: 16px 16px;

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

@@ -150,6 +150,12 @@
   border-radius: 10px;
   cursor: pointer;
 }
+.jy-index-banner .custom-dot.light-swiper-bg-light-color .swiper-pagination-bullet {
+  background: rgba(255, 255, 255, 0.32);
+}
+.jy-index-banner .custom-dot.light-swiper-bg-light-color .swiper-pagination-bullet-active {
+  background: #fff
+}
 .jy-index-banner .custom-dot .swiper-pagination-bullet-active{
   background: #2CB7CA;
 }

src/web/staticres/js/superSearch.js

@@ -1104,7 +1104,7 @@ function autoModelFn (r) {
   if (mhFlag) {
     console.log(mhFlag, '模糊flag');
     if (r.list && r.list.length > 0) {
-      toastFn('精准搜索无结果，已为您自动切换到模糊搜索', 2000)
+      toastFn('精准搜索无结果，已为您自动切换到模糊搜索', 5000)
       autoSwitchModel = false
     } else {
       $("#zbSeatchT [name='searchMode']").val(0)

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

@@ -37,6 +37,7 @@ body.in-iframe {
 
 /* 标讯搜索 页面 */
 .in-iframe[data-page-name=supsearch] #searchInner .searchHeader {
+  margin-top: 0;
   border-top: unset;
 }
 .in-iframe[data-page-name=supsearch] #searchInner .searchHeader .searchHeader-container {

src/web/templates/pc/index.html

@@ -55,7 +55,7 @@
               <i></i>
             </div>
             <form method="post" action="/jylab/supsearch/index.html" class="form-search" id="zbIndex" name="zbIndex" target="stop" onsubmit="return false">
-              <input class="ser" onkeydown="onkeydownSearch()" autocomplete="off"  type="text" name="keywords" placeholder="请输入您想要查询的招标信息，多个关键词用空格隔开" id="keywords" value="" />
+              <input class="ser" onkeydown="onkeydownSearch()" autocomplete="off"  type="text" name="keywords" placeholder="请输入项目名称等关键词，例如：医疗设备" id="keywords" value="" />
               <input type="hidden" name="searchvalue">
               <input type="hidden" name="selectType" value="title">
               <input type="hidden">
@@ -511,12 +511,16 @@
                 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)
                 }
               }

src/web/templates/pc/supsearch.html

@@ -754,7 +754,7 @@ var IframeOnClick = {
 			<div class="searchInput clearfix" :class="{'change-search-input': showAddKeyword || keywordMult}">
         <div class="searchInput-left">
           <form action="/jylab/{{.T.module}}/index.html" method="post" id="zbSeatchT" class="clearfix" onsubmit="return beforeSubmit('F')">
-            <input class="searchname" autocomplete="off" type="search" id="searchinput" value="{{.T.keywords}}" name="keywords" placeholder="请输入您想要查询的招标信息，多个关键词用空格隔开" />
+            <input class="searchname" autocomplete="off" type="search" id="searchinput" value="{{.T.keywords}}" name="keywords" placeholder="请输入项目名称等关键词，例如：医疗设备" />
             <img src='{{Msg "seo" "cdn"}}/images/pc_20.png' id="t-clear" class="j-clearicon" style="display: none;">
             <input type="button" value="搜索" onclick="zbSeatch('zbSeatchT')"/>
             <input type="hidden" name="publishtime" value="{{.T.publishtime}}">
@@ -1628,7 +1628,7 @@ $(function(){
     }
     if (mhModel && autoSwitchModel) {
       if (goTemplateData.params.list) {
-        toastFn('精准搜索无结果，已为您自动切换到模糊搜索', 2000)
+        toastFn('精准搜索无结果，已为您自动切换到模糊搜索', 5000)
         autoSwitchModel = false
       } else {
         // 模糊搜索无结果时 再切回精准