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

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

@@ -631,9 +631,6 @@
 				                }else{
 				                  JyObj.aliPay(data.data)
 				                }
-				                 //清除我已阅读缓存
-						      sessionStorage.removeItem("readClause");
-							  sessionStorage.removeItem("index");
 				                checkPaySuccess(data.order)
 							} catch (e) {
 								alert(e)
@@ -647,6 +644,9 @@
         //支付完成跳转
         function checkPaySuccess(orderCode){
           if(interval){
+             //清除我已阅读缓存
+	        sessionStorage.removeItem("readClause");
+		    sessionStorage.removeItem("index");
             clearInterval(interval);
           }
          interval=setInterval(function() {

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

@@ -141,6 +141,14 @@
 		if(userId == ""||userId==null){
 			window.location.href = "/jyapp/free/login?to=back";
 		}else{
+			//判断 是标题搜索还是全文搜索
+			var em_selectType=$(".options").children(".search-title").children("em").html();
+			console.log(em_selectType)
+			if(em_selectType=="全文搜索"){
+				SuperSearch.reqParam.selectType="all";
+			}else if(em_selectType=="标题搜索"){
+				SuperSearch.reqParam.selectType="title";
+			}
 			$.ajax({
 				type: "post",
 				url: "/jyapp/front/dataExport/searchExport",

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

@@ -448,6 +448,10 @@
 				}
 			}
 			
+			function onceMore(){
+				window.location.href="/jyapp/front/dataExport/toSieve";
+			}
+
 			function deleteOrder(id,obj) {
 			        $.confirm({
 			            title: '提示信息',

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

@@ -146,6 +146,14 @@
 	function toSearchExport(){
 		$(".loading_").show();
 		SuperSearch.setSessionStorage();
+		//判断 是标题搜索还是全文搜索
+			var em_selectType=$(".options").children(".search-title").children("em").html();
+			console.log(em_selectType)
+			if(em_selectType=="全文搜索"){
+				SuperSearch.reqParam.selectType="all";
+			}else if(em_selectType=="标题搜索"){
+				SuperSearch.reqParam.selectType="title";
+			}
 		$.ajax({
 			type: "post",
 			url: "/front/wx_dataExport/searchExport",