xuzhiheng 5 years ago
parent
commit
a6da8790b9

+ 1 - 0
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -718,6 +718,7 @@ var SuperSearch = {
 			return false;
 			return false;
 		}
 		}
 		SuperSearch.reqParam.searchvalue=SuperSearch.s_words;
 		SuperSearch.reqParam.searchvalue=SuperSearch.s_words;
+		localStorage.keyWord = JSON.stringify([{"keyWord":SuperSearch.s_words}]);
 		//信息范围
 		//信息范围
 		var scope = [];
 		var scope = [];
 		$("#supersearchPage .contentone .btn.active").each(function(){
 		$("#supersearchPage .contentone .btn.active").each(function(){

+ 163 - 36
src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -162,6 +162,7 @@
 		<script>
 		<script>
 			var bz = '<tr><td>序号</td><td>公告标题</td><td>公告内容</td><td>剑鱼标讯地址</td><td>省份</td><td>城市</td><td>发布时间</td><td>项目名称</td><td>采购单位</td><td>中标单位</td><td>中标价<br>(万元)</td><td>币种</td><td>公告类别</td></tr>';
 			var bz = '<tr><td>序号</td><td>公告标题</td><td>公告内容</td><td>剑鱼标讯地址</td><td>省份</td><td>城市</td><td>发布时间</td><td>项目名称</td><td>采购单位</td><td>中标单位</td><td>中标价<br>(万元)</td><td>币种</td><td>公告类别</td></tr>';
 			var gj = '<tr><td>序号</td><td>公告标题</td><td>公告内容</td><td>公告地址</td><td>剑鱼标讯地址</td><td>省份</td><td>城市</td><td>发布时间</td><td>项目名称</td><td>项目编号</td><td>采购单位</td><td>采购单位<br>联系人</td><td>采购单位<br>联系电话</td><td>预算<br>(万元)</td><td>开标日期</td><td>中标单位</td><td>中标价<br>(万元)</td><td>招标机构</td><td>项目范围</td><td>币种</td><td>公告类别</td></tr>';
 			var gj = '<tr><td>序号</td><td>公告标题</td><td>公告内容</td><td>公告地址</td><td>剑鱼标讯地址</td><td>省份</td><td>城市</td><td>发布时间</td><td>项目名称</td><td>项目编号</td><td>采购单位</td><td>采购单位<br>联系人</td><td>采购单位<br>联系电话</td><td>预算<br>(万元)</td><td>开标日期</td><td>中标单位</td><td>中标价<br>(万元)</td><td>招标机构</td><td>项目范围</td><td>币种</td><td>公告类别</td></tr>';
+			var keys = [];
 			$(function() {
 			$(function() {
 				loading(true);
 				loading(true);
 				tab({{.T.dataType}});
 				tab({{.T.dataType}});
@@ -185,6 +186,12 @@
 			function tab(t){
 			function tab(t){
 				$.post("/jyapp/front/dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
 				$.post("/jyapp/front/dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
 					console.log(r.res)
 					console.log(r.res)
+					if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+						var keyWordArr = JSON.parse(localStorage.keyWord);
+						for(var i in keyWordArr){
+							keys.push(keyWordArr[i].keyWord);
+						}
+					}
 					if(r.res.data){
 					if(r.res.data){
 						var res = r.res.data;
 						var res = r.res.data;
 						var aHtml = bz;
 						var aHtml = bz;
@@ -192,48 +199,168 @@
 							$(".tabs").css("min-width","2820px");
 							$(".tabs").css("min-width","2820px");
 							$("#d_bz").attr("class","d_gj");
 							$("#d_bz").attr("class","d_gj");
 							aHtml = gj;
 							aHtml = gj;
+							var a = 0;
+							for(var i in res){
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index !== -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["href"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["projectcode"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["buyerperson"]+'</td>'
+													+'<td>'+res[i]["buyertel"]+'</td>'
+													+'<td>'+res[i]["budget"]+'</td>'
+													+'<td>'+res[i]["bidopentime"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["agency"]+'</td>'
+													+'<td>'+res[i]["projectscope"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>';
+										}
+										break
+									}
+								}else{
+									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
+											+'<td>'+res[i]["title"]+'</td>'
+											+'<td>'+res[i]["detail"]+'</td>'
+											+'<td>'+res[i]["href"]+'</td>'
+											+'<td>'+res[i]["url"]+'</td>'
+											+'<td>'+res[i]["area"]+'</td>'
+											+'<td>'+res[i]["city"]+'</td>'
+											+'<td>'+res[i]["publishtime"]+'</td>'
+											+'<td>'+res[i]["projectname"]+'</td>'
+											+'<td>'+res[i]["projectcode"]+'</td>'
+											+'<td>'+res[i]["buyer"]+'</td>'
+											+'<td>'+res[i]["buyerperson"]+'</td>'
+											+'<td>'+res[i]["buyertel"]+'</td>'
+											+'<td>'+res[i]["budget"]+'</td>'
+											+'<td>'+res[i]["bidopentime"]+'</td>'
+											+'<td>'+res[i]["s_winner"]+'</td>'
+											+'<td>'+res[i]["bidamount"]+'</td>'
+											+'<td>'+res[i]["agency"]+'</td>'
+											+'<td>'+res[i]["projectscope"]+'</td>'
+											+'<td>'+res[i]["currency"]+'</td>'
+											+'<td>'+res[i]["subtype"]+'</td>'
+											+'</tr>';
+								}
+							}
 							for(var i in res){
 							for(var i in res){
-								aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
-										+'<td>'+res[i]["title"]+'</td>'
-										+'<td>'+res[i]["detail"]+'</td>'
-										+'<td>'+res[i]["href"]+'</td>'
-										+'<td>'+res[i]["url"]+'</td>'
-										+'<td>'+res[i]["area"]+'</td>'
-										+'<td>'+res[i]["city"]+'</td>'
-										+'<td>'+res[i]["publishtime"]+'</td>'
-										+'<td>'+res[i]["projectname"]+'</td>'
-										+'<td>'+res[i]["projectcode"]+'</td>'
-										+'<td>'+res[i]["buyer"]+'</td>'
-										+'<td>'+res[i]["buyerperson"]+'</td>'
-										+'<td>'+res[i]["buyertel"]+'</td>'
-										+'<td>'+res[i]["budget"]+'</td>'
-										+'<td>'+res[i]["bidopentime"]+'</td>'
-										+'<td>'+res[i]["s_winner"]+'</td>'
-										+'<td>'+res[i]["bidamount"]+'</td>'
-										+'<td>'+res[i]["agency"]+'</td>'
-										+'<td>'+res[i]["projectscope"]+'</td>'
-										+'<td>'+res[i]["currency"]+'</td>'
-										+'<td>'+res[i]["subtype"]+'</td>'
-										+'</tr>'
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index === -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["href"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["projectcode"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["buyerperson"]+'</td>'
+													+'<td>'+res[i]["buyertel"]+'</td>'
+													+'<td>'+res[i]["budget"]+'</td>'
+													+'<td>'+res[i]["bidopentime"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["agency"]+'</td>'
+													+'<td>'+res[i]["projectscope"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>';
+										}
+										break
+									}
+								}
 							}
 							}
 						}else{
 						}else{
 							$(".tabs").css("min-width","2020px");
 							$(".tabs").css("min-width","2020px");
 							$("#d_bz").attr("class","d_bz");
 							$("#d_bz").attr("class","d_bz");
+							var a = 0;
+							for(var i in res){
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index !== -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>'
+										}
+										break
+									}
+								}else{
+									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
+											+'<td>'+res[i]["title"]+'</td>'
+											+'<td>'+res[i]["detail"]+'</td>'
+											+'<td>'+res[i]["url"]+'</td>'
+											+'<td>'+res[i]["area"]+'</td>'
+											+'<td>'+res[i]["city"]+'</td>'
+											+'<td>'+res[i]["publishtime"]+'</td>'
+											+'<td>'+res[i]["projectname"]+'</td>'
+											+'<td>'+res[i]["buyer"]+'</td>'
+											+'<td>'+res[i]["s_winner"]+'</td>'
+											+'<td>'+res[i]["bidamount"]+'</td>'
+											+'<td>'+res[i]["currency"]+'</td>'
+											+'<td>'+res[i]["subtype"]+'</td>'
+											+'</tr>';
+								}
+							}
 							for(var i in res){
 							for(var i in res){
-								aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
-										+'<td>'+res[i]["title"]+'</td>'
-										+'<td>'+res[i]["detail"]+'</td>'
-										+'<td>'+res[i]["url"]+'</td>'
-										+'<td>'+res[i]["area"]+'</td>'
-										+'<td>'+res[i]["city"]+'</td>'
-										+'<td>'+res[i]["publishtime"]+'</td>'
-										+'<td>'+res[i]["projectname"]+'</td>'
-										+'<td>'+res[i]["buyer"]+'</td>'
-										+'<td>'+res[i]["s_winner"]+'</td>'
-										+'<td>'+res[i]["bidamount"]+'</td>'
-										+'<td>'+res[i]["currency"]+'</td>'
-										+'<td>'+res[i]["subtype"]+'</td>'
-										+'</tr>'
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index === -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>'
+										}
+										break
+									}
+								}
 							}
 							}
 						}
 						}
 						$("#d_bz").html(aHtml);
 						$("#d_bz").html(aHtml);

+ 2 - 2
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -14,7 +14,7 @@
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}3"></script>
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 <!--2.8-->
 <!--2.8-->
@@ -470,7 +470,7 @@
 									<button class="btn">单一</button>
 									<button class="btn">单一</button>
 									<button class="btn">竞价</button>
 									<button class="btn">竞价</button>
 									<button class="btn">变更</button>
 									<button class="btn">变更</button>
-									<button class="btn">其</button>
+									<button class="btn">其</button>
 								</li>
 								</li>
 								<li>
 								<li>
 									<div id="dqbtn" style="width:5.6em" data-value="结果">招标结果</div>
 									<div id="dqbtn" style="width:5.6em" data-value="结果">招标结果</div>

+ 1 - 0
src/web/staticres/js/wxSupersearch.js

@@ -683,6 +683,7 @@ var SuperSearch = {
 			return false;
 			return false;
 		}
 		}
 		SuperSearch.reqParam.searchvalue=SuperSearch.s_words;
 		SuperSearch.reqParam.searchvalue=SuperSearch.s_words;
+		localStorage.keyWord = JSON.stringify([{"keyWord":SuperSearch.s_words}]);
 		//信息范围
 		//信息范围
 		var scope = [];
 		var scope = [];
 		$("#supersearchPage .contentone .btn.active").each(function(){
 		$("#supersearchPage .contentone .btn.active").each(function(){

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}4">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}5">
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
 	{{include "/common/weixin.html"}}
 	{{include "/common/weixin.html"}}
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>

+ 163 - 39
src/web/templates/weixin/dataExport/dataExport_previewData.html

@@ -177,64 +177,188 @@
 						var res = r.res.data;
 						var res = r.res.data;
 						var aHtml = bz;
 						var aHtml = bz;
 						if(t==2){
 						if(t==2){
-							$(".tabs").css("min-width","4020px");
+							$(".tabs").css("min-width","2820px");
 							$("#d_bz").attr("class","d_gj");
 							$("#d_bz").attr("class","d_gj");
 							aHtml = gj;
 							aHtml = gj;
+							var a = 0;
 							for(var i in res){
 							for(var i in res){
-								aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
-										+'<td>'+res[i]["title"]+'</td>'
-										+'<td>'+res[i]["detail"]+'</td>'
-										+'<td>'+res[i]["href"]+'</td>'
-										+'<td>'+res[i]["url"]+'</td>'
-										+'<td>'+res[i]["area"]+'</td>'
-										+'<td>'+res[i]["city"]+'</td>'
-										+'<td>'+res[i]["publishtime"]+'</td>'
-										+'<td>'+res[i]["projectname"]+'</td>'
-										+'<td>'+res[i]["projectcode"]+'</td>'
-										+'<td>'+res[i]["buyer"]+'</td>'
-										+'<td>'+res[i]["buyerperson"]+'</td>'
-										+'<td>'+res[i]["buyertel"]+'</td>'
-										+'<td>'+res[i]["budget"]+'</td>'
-										+'<td>'+res[i]["bidopentime"]+'</td>'
-										+'<td>'+res[i]["s_winner"]+'</td>'
-										+'<td>'+res[i]["bidamount"]+'</td>'
-										+'<td>'+res[i]["agency"]+'</td>'
-										+'<td>'+res[i]["projectscope"]+'</td>'
-										+'<td>'+res[i]["currency"]+'</td>'
-										+'<td>'+res[i]["subtype"]+'</td>'
-										+'</tr>'
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index !== -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["href"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["projectcode"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["buyerperson"]+'</td>'
+													+'<td>'+res[i]["buyertel"]+'</td>'
+													+'<td>'+res[i]["budget"]+'</td>'
+													+'<td>'+res[i]["bidopentime"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["agency"]+'</td>'
+													+'<td>'+res[i]["projectscope"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>';
+										}
+										break
+									}
+								}else{
+									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
+											+'<td>'+res[i]["title"]+'</td>'
+											+'<td>'+res[i]["detail"]+'</td>'
+											+'<td>'+res[i]["href"]+'</td>'
+											+'<td>'+res[i]["url"]+'</td>'
+											+'<td>'+res[i]["area"]+'</td>'
+											+'<td>'+res[i]["city"]+'</td>'
+											+'<td>'+res[i]["publishtime"]+'</td>'
+											+'<td>'+res[i]["projectname"]+'</td>'
+											+'<td>'+res[i]["projectcode"]+'</td>'
+											+'<td>'+res[i]["buyer"]+'</td>'
+											+'<td>'+res[i]["buyerperson"]+'</td>'
+											+'<td>'+res[i]["buyertel"]+'</td>'
+											+'<td>'+res[i]["budget"]+'</td>'
+											+'<td>'+res[i]["bidopentime"]+'</td>'
+											+'<td>'+res[i]["s_winner"]+'</td>'
+											+'<td>'+res[i]["bidamount"]+'</td>'
+											+'<td>'+res[i]["agency"]+'</td>'
+											+'<td>'+res[i]["projectscope"]+'</td>'
+											+'<td>'+res[i]["currency"]+'</td>'
+											+'<td>'+res[i]["subtype"]+'</td>'
+											+'</tr>';
+								}
+							}
+							for(var i in res){
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index === -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["href"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["projectcode"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["buyerperson"]+'</td>'
+													+'<td>'+res[i]["buyertel"]+'</td>'
+													+'<td>'+res[i]["budget"]+'</td>'
+													+'<td>'+res[i]["bidopentime"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["agency"]+'</td>'
+													+'<td>'+res[i]["projectscope"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>';
+										}
+										break
+									}
+								}
 							}
 							}
 						}else{
 						}else{
 							$(".tabs").css("min-width","2020px");
 							$(".tabs").css("min-width","2020px");
 							$("#d_bz").attr("class","d_bz");
 							$("#d_bz").attr("class","d_bz");
+							var a = 0;
+							for(var i in res){
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index !== -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>'
+										}
+										break
+									}
+								}else{
+									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
+											+'<td>'+res[i]["title"]+'</td>'
+											+'<td>'+res[i]["detail"]+'</td>'
+											+'<td>'+res[i]["url"]+'</td>'
+											+'<td>'+res[i]["area"]+'</td>'
+											+'<td>'+res[i]["city"]+'</td>'
+											+'<td>'+res[i]["publishtime"]+'</td>'
+											+'<td>'+res[i]["projectname"]+'</td>'
+											+'<td>'+res[i]["buyer"]+'</td>'
+											+'<td>'+res[i]["s_winner"]+'</td>'
+											+'<td>'+res[i]["bidamount"]+'</td>'
+											+'<td>'+res[i]["currency"]+'</td>'
+											+'<td>'+res[i]["subtype"]+'</td>'
+											+'</tr>';
+								}
+							}
 							for(var i in res){
 							for(var i in res){
-								aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
-										+'<td>'+res[i]["title"]+'</td>'
-										+'<td>'+res[i]["detail"]+'</td>'
-										+'<td>'+res[i]["url"]+'</td>'
-										+'<td>'+res[i]["area"]+'</td>'
-										+'<td>'+res[i]["city"]+'</td>'
-										+'<td>'+res[i]["publishtime"]+'</td>'
-										+'<td>'+res[i]["projectname"]+'</td>'
-										+'<td>'+res[i]["buyer"]+'</td>'
-										+'<td>'+res[i]["s_winner"]+'</td>'
-										+'<td>'+res[i]["bidamount"]+'</td>'
-										+'<td>'+res[i]["currency"]+'</td>'
-										+'<td>'+res[i]["subtype"]+'</td>'
-										+'</tr>'
+								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									for(var m in keys){
+										var re =new RegExp(keys[m], "g");
+										var index = res[i]["title"].search(re);
+										if(index === -1){
+											a++;
+											aHtml+='<tr><td>'+a+'</td>'
+													+'<td>'+res[i]["title"]+'</td>'
+													+'<td>'+res[i]["detail"]+'</td>'
+													+'<td>'+res[i]["url"]+'</td>'
+													+'<td>'+res[i]["area"]+'</td>'
+													+'<td>'+res[i]["city"]+'</td>'
+													+'<td>'+res[i]["publishtime"]+'</td>'
+													+'<td>'+res[i]["projectname"]+'</td>'
+													+'<td>'+res[i]["buyer"]+'</td>'
+													+'<td>'+res[i]["s_winner"]+'</td>'
+													+'<td>'+res[i]["bidamount"]+'</td>'
+													+'<td>'+res[i]["currency"]+'</td>'
+													+'<td>'+res[i]["subtype"]+'</td>'
+													+'</tr>'
+										}
+										break
+									}
+								}
 							}
 							}
 						}
 						}
 						$("#d_bz").html(aHtml);
 						$("#d_bz").html(aHtml);
 						$('td').each(function(){
 						$('td').each(function(){
-						    var tt = this.innerText;
+							var tt = this.innerText;
 							if(tt=="undefined"||tt=="null"){
 							if(tt=="undefined"||tt=="null"){
 								$(this).html("");
 								$(this).html("");
 							}
 							}
 						});
 						});
 						makeP();
 						makeP();
+					}else if(r.res.msg){
+						$(".tabs").css({"min-width":"0px","display": "none"});
+						$(".noData").text("今日已超出预览次数").show();
+						loading(false);
 					}else{
 					}else{
 						$(".tabs").css({"min-width":"0px","display": "none"});
 						$(".tabs").css({"min-width":"0px","display": "none"});
-						$(".noData").show();
+						$(".noData").text("暂无数据").show();
 						loading(false);
 						loading(false);
 					}
 					}
 				})
 				})

+ 2 - 2
src/web/templates/weixin/search/mainSearch.html

@@ -22,7 +22,7 @@
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}3"></script>
 <!--2.8-->
 <!--2.8-->
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
@@ -520,7 +520,7 @@
 								<button class="btn">单一</button>
 								<button class="btn">单一</button>
 								<button class="btn">竞价</button>
 								<button class="btn">竞价</button>
 								<button class="btn">变更</button>
 								<button class="btn">变更</button>
-								<button class="btn">其</button>
+								<button class="btn">其</button>
 							</li>
 							</li>
 							<li>
 							<li>
 								<div id="dqbtn" style="width:81px;" data-value="结果">招标结果</div>
 								<div id="dqbtn" style="width:81px;" data-value="结果">招标结果</div>