Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -886,6 +886,10 @@ var SuperSearch = {
 			$(".newdialog .sub-search-title").find("li").removeClass("active");
 			$(".selected-export .options .search-title").find("em").text("标题搜索");
 			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
+			
+			$(".newdialog .sub-show-list").find("li").removeClass("active");
+			$(".selected-export .show-list").find("em").text("列表显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
 		}
 		//
 		$.ajax({

src/jfw/modules/app/src/web/templates/dataExport/dataExport_previewData.html

@@ -241,9 +241,13 @@
 							}
 						});
 						makeP();
+					}else if(r.res.msg){
+						$(".tabs").css({"min-width":"0px","display": "none"});
+						$(".noData").text("今日已超出预览次数").show();
+						loading(false);
 					}else{
 						$(".tabs").css({"min-width":"0px","display": "none"});
-						$(".noData").show();
+						$(".noData").text("暂无数据").show();
 						loading(false);
 					}
 				})

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"}}22"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}2211"></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>
 <!--2.8-->

src/web/staticres/js/wxSupersearch.js

@@ -455,10 +455,10 @@ var SuperSearch = {
 		});
 		SuperSearch.initMobiscroll();
 		//返回时 是否显示table的查看更多
-		if($(".showlist").hasClass("on")){
-			//SuperSearch.isTable(false);
+		if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
+			SuperSearch.isTable(false);
 		}else{
-			//SuperSearch.isTable(true);
+			SuperSearch.isTable(true);
 		}
 	},
 	recoveryPage: function(){
@@ -614,7 +614,7 @@ var SuperSearch = {
 		});
 		//判断是否是table  (2.7.5table只显示20条数据)
 		if(!sessionStorage.superSearch_showType){
-			if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showtable"){
+			if($(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal')=="showlist"){
 				SuperSearch.isTable(false);
 			}else{
 				SuperSearch.isTable(true);
@@ -818,13 +818,8 @@ var SuperSearch = {
 		} else {
 			//判断显示信息方式  列表or表格
 			$("#supersearchPage #wrapper").removeClass("hidden");
-			if($("#supersearchPage .showType .showlist").hasClass("on")){
-				$("#supersearchPage #list").removeClass("hidden");
-				$("#supersearchPage #table").addClass("hidden");
-			}else{
-				$("#supersearchPage #list").addClass("hidden");
-				$("#supersearchPage #table").removeClass("hidden");
-			}
+			$("#supersearchPage #list").removeClass("hidden");
+			$("#supersearchPage #table").addClass("hidden");
 		}
 	},
 	formSubmit: function (nw){    //提交表单，获取数据
@@ -857,6 +852,10 @@ var SuperSearch = {
 			$(".newdialog .sub-search-title").find("li").removeClass("active");
 			$(".selected-export .options .search-title").find("em").text("标题搜索");
 			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
+			
+			$(".newdialog .sub-show-list").find("li").removeClass("active");
+			$(".selected-export .show-list").find("em").text("列表显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
 		}
 		$.ajax({
 			type: "post",
@@ -1382,7 +1381,6 @@ var SuperSearch = {
 		  	$("#supersearchPage #wrapper #list").addClass("hidden");
 			SuperSearch.isTable(true);
 		},300)
-		
 	},
 	isTable:function(flag){
 		if(flag){ //table

src/web/staticres/wx_dataExport/css/base.css

@@ -8,7 +8,7 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fiel
     padding: 0;
 }
 html,body {
-     max-width: 750px;
+    /* max-width: 750px;
     -webkit-text-size-adjust: 100%;
     margin: 0 auto;
     height: 100%;
@@ -18,7 +18,7 @@ html,body {
     font-size: .24rem;
     background:rgba(245,244,249,1);;
     color: #3d3d3d;
-    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
+    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;*/
 }
 
 ul,ol {

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -290,6 +290,9 @@
 					readClause=true;
 					sessionStorage.readClause="true";
 					$(".toPay").removeAttr("disabled");
+					$(".fixed-bottom-box .weui-check").attr("checked",true);
+				}else{
+					$(".fixed-bottom-box .weui-check").attr("checked",false);
 				}
 				//软键盘弹起 
 				var oHeight = $(document).height(); //浏览器当前的高度
@@ -541,6 +544,9 @@
 					if(previewDataTime<50){
 						previewDataTime++
 						var dataType = $(".choose").find("div.active").index()+1;
+						//清除我已阅读缓存
+						sessionStorage.removeItem("readClause");
+						sessionStorage.removeItem("index");
 						window.open("/front/wx_dataExport/toPreview/"+{{.T._id}}+"?dataType="+dataType);
 					}else{
 						EasyAlert.show("预览数据次数超出今日上限！","",3000);

src/web/templates/weixin/search/mainSearch.html

@@ -22,9 +22,9 @@
 <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"}}21"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}41"></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/css/base.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/css/search_tab.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">