wangshan hace 5 años
padre
commit
2f2fe9e32c

+ 6 - 3
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -77,7 +77,8 @@ var SuperSearch = {
 		}
 		this.initFlag = true;
 		$("#supersearchPage #wrapper .more").on("click",function(){
-			JyObj.openExternalLink(myDomain()+"/sjdc/index.html","");
+			toSearchExport();
+			//JyObj.openExternalLink(myDomain()+"/sjdc/index.html","");
 		});
 		$("#supersearchPage #feedback").on("tap",function(){
 			SuperSearch.goToFeedbackPage();
@@ -500,7 +501,7 @@ var SuperSearch = {
 		});
 		SuperSearch.initMobiscroll();
 		//返回时 是否显示table的查看更多
-		if($(".showlist").hasClass("on")){
+		if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
 			SuperSearch.isTable(false);
 		}else{
 			SuperSearch.isTable(true);
@@ -667,7 +668,7 @@ var SuperSearch = {
 		});
 		//判断是否是table  (2.7.5table只显示20条数据)
 		if(!sessionStorage.superSearch_showType){
-			if($(".showlist").hasClass("on")){
+			if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
 				SuperSearch.isTable(false);
 			}else{
 				SuperSearch.isTable(true);
@@ -1773,12 +1774,14 @@ var SuperSearch = {
 //			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").removeClass("hidden");
 			$("#supersearchPage #wrapper #list").addClass("hidden");
+			SuperSearch.isTable(true);
 		}else{
 			$(".selected-export .show-list").find("em").text("列表显示");
 			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
 //			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").addClass("hidden");
 			$("#supersearchPage #wrapper #list").removeClass("hidden");
+			SuperSearch.isTable(false);
 		} 
 	},
 	getIndustry: function(){

+ 7 - 4
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/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/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}11"></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"}}"></script>
 <!--2.8-->
@@ -133,8 +133,12 @@
 		
 		//
 		$(".export").on("click",function(){
+			toSearchExport();
+		})
+	})
+	function toSearchExport(){
+		$(".loading_").show();
 			SuperSearch.setSessionStorage();
-			$(".loading_").show();
 			$.ajax({
 				type: "post",
 				url: "/jyapp/front/dataExport/searchExport",
@@ -150,8 +154,7 @@
 					$(".loading_").hide();
 				}
 			})
-		})
-	})
+	}
 </script>
 </head>
 <body>

+ 5 - 3
src/web/staticres/js/wxSupersearch.js

@@ -468,9 +468,9 @@ var SuperSearch = {
 		SuperSearch.initMobiscroll();
 		//返回时 是否显示table的查看更多
 		if($(".showlist").hasClass("on")){
-			SuperSearch.isTable(false);
+			//SuperSearch.isTable(false);
 		}else{
-			SuperSearch.isTable(true);
+			//SuperSearch.isTable(true);
 		}
 	},
 	recoveryPage: function(){
@@ -630,7 +630,7 @@ var SuperSearch = {
 		});
 		//判断是否是table  (2.7.5table只显示20条数据)
 		if(!sessionStorage.superSearch_showType){
-			if($(".showlist").hasClass("on")){
+			if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showtable"){
 				SuperSearch.isTable(false);
 			}else{
 				SuperSearch.isTable(true);
@@ -1666,12 +1666,14 @@ var SuperSearch = {
 //			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").addClass("hidden");
 			$("#supersearchPage #wrapper #list").removeClass("hidden");
+			SuperSearch.isTable(false);
 		}else if(sessionStorage.superSearch_showType=="showtable"){
 			$(".selected-export .show-list").find("em").text("表格显示");
 			$(".newdialog .sub-show-list").find("li[dataval='showtable']").addClass("active");
 //			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").removeClass("hidden");
 			$("#supersearchPage #wrapper #list").addClass("hidden");
+			SuperSearch.isTable(true);
 		}
 	    SuperSearch.beforeSubmit();
 	},

+ 19 - 16
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"}}/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/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}21"></script>
 <!--2.8-->
 <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"}}">
@@ -140,22 +140,25 @@
         })
 		//
 		$(".export").on("tap",function(){
-			SuperSearch.setSessionStorage();
-
-			$.ajax({
-				type: "post",
-				url: "/front/wx_dataExport/searchExport",
-				data: SuperSearch.reqParam,
-				dataType: "json",
-				success: function(data){
-					if(data._id!=""){
-						window.location.href="/weixin/pay/dataexport?id="+data._id+"&source=d"
-						//window.location.href="/front/pay/redirect?id="+data._id+"&source=d"
-					}
-				}
-			})
+			toSearchExport();
 		})
 	})
+	function toSearchExport(){
+		$(".loading_").show();
+		SuperSearch.setSessionStorage();
+		$.ajax({
+			type: "post",
+			url: "/front/wx_dataExport/searchExport",
+			data: SuperSearch.reqParam,
+			dataType: "json",
+			success: function(data){
+				if(data._id!=""){
+					window.location.href="/weixin/pay/dataexport?id="+data._id+"&source=d"
+					//window.location.href="/front/pay/redirect?id="+data._id+"&source=d"
+				}
+			}
+		})
+	}
 </script>
 	<style>
 		#searchIndex .content li:nth-of-type(1) a {
@@ -565,7 +568,7 @@
 				<div class="TableTip" id="TableTip" style="display:none;"><img class="tableclose" src="{{Msg "seo" "cdn"}}/images/table_close.png"><div class="TableText">推荐使用电脑浏览器访问剑鱼标讯网站<br>jianyu360.com查看数据表格,体验更佳。</div></div>
 			</div>
       <div class="shade_table">
-        <div class="more" onclick="SuperSearch.setSessionStorage();location.href='http://res.jianyu360.com/sjdc/index.html'">
+        <div class="more" onclick="toSearchExport()">
           查看更多
         </div>
       </div>