Merge branch 'dev4.5.2' of ssh://127.0.0.1:10022/qmx/jy into dev4.5.2

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -980,8 +980,11 @@ function hasNoData() {
         $(".findnull_").css("display", "none")
     }
     if(!NoDataShow) {
-        $(".findnull_").css("display", "none")
-        $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
+        if(!myInfo.haskey){
+            $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
+        } else {
+            $(".findnull_").css("display", "block").siblings('.empty').hide()
+        }
     }
 }
 

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -1321,7 +1321,7 @@
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
 					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
 				</span><br>
-            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>
+<!--            <div style="display:none;" id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>-->
         </div>
         <div class="text-center" id="feedback" style="width:100%;">
             <div class="jy_sprite_main sprite_jyyjfk" style="transform: scale(1.21);margin-top: 15px;"></div>

src/web/templates/pc/index.html

@@ -122,7 +122,8 @@
 			<div class="search">
 				<form method="post" action="/jylab/supsearch/index.html" id="zbIndex">
 					<input class="ser" autocomplete="off"  type="text" name="keywords" placeholder="请输入您想要查询的招标信息" id="keywords" value="" />
-					<input type="hidden" name="searchvalue">
+          <input type="hidden" name="searchvalue">
+          <input type="hidden" name="publishtime" value="lately-30">
 					<input class="btn" type="button" onclick="zbSeatch('zbIndex')" />
 				</form>
         <div class="index_search_thikn">

src/web/templates/pc/supsearch.html

@@ -1164,7 +1164,7 @@ $(function(){
 						<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
 						<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
 					</span><br>
-					<div style="display:none;" id="allSearchModel">试试<span onclick="NullSuperSearch()" style="color:#2cb7ca;text-decoration:underline;line-height: 30px;cursor: pointer;">全文搜索</span></div>
+<!--					<div style="display:none;" id="allSearchModel">试试<span onclick="NullSuperSearch()" style="color:#2cb7ca;text-decoration:underline;line-height: 30px;cursor: pointer;">全文搜索</span></div>-->
 				</div>
 			</div>
 			<div class="working" style="display: none;">

src/web/templates/weixin/wxsearchlist.html

@@ -674,7 +674,7 @@ body{
 <div>
 	<div class="selLable" id="selLable" >
 		<div class="com-title"><!--height:30px; margin-top:20px;-->
-			<span onclick="allSearch()" id="span1" >全文搜索</span><img src="{{Msg "seo" "cdn"}}/images/wx/line@2x.png" style="height:30px;vertical-align:middle;"><span id="span2" onclick="titleSearch()"  style="color:black;">标题搜索</span>
+<!--			<span onclick="allSearch()" id="span1" >全文搜索</span><img src="{{Msg "seo" "cdn"}}/images/wx/line@2x.png" style="height:30px;vertical-align:middle;"><span id="span2" onclick="titleSearch()"  style="color:black;">标题搜索</span>-->
 		</div>
 	</div>
 	<div class="wxsearch">