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

src/jfw/front/swordfish.go

@@ -494,7 +494,11 @@ func (m *Front) PcAjaxReq() {
 				}
 				if len([]rune(s_word)) > 3 && int(count) < pc_pageSize && start == 0 {
 					secondKWS = jy.HttpEs(s_word, "ik_smart", config.Sysconfig["elasticsearch"].(string))
-					findfields := `"title"`
+					// 移动端数据导出改
+					//findfields := `"title"`
+					findfields := `"`
+					findfields += m.GetString("selectType")
+					findfields += `"`
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(area, publishtime, subtype))
 					secondLimit := 2*pc_pageSize - int(count)
 					secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, secondLimit, 0, false)

src/jfw/modules/app/src/app/front/dataExport.go

@@ -62,7 +62,8 @@ func (w *WxDataExport) ToSieve() error {
 			}
 		}
 		w.T["orderDetail"] = orderDetail
-	} else {
+	}
+	if myUserId == "" {
 		return errors.New("未登录")
 	}
 	w.Render("/dataExport/dataExport.html", &w.T)

src/jfw/modules/app/src/app/front/swordfish.go

@@ -459,6 +459,7 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
+						log.Println("11111")
 						list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, public.Lst.TotalPage*wx_pageSize, selectType, feld)
 					}
 				} else {
@@ -470,7 +471,11 @@ func (m *Front) WxsearchlistPaging() {
 				}
 				if len([]rune(s_word)) > 3 && listSize < wx_pageSize && pageNum == 1 {
 					secondKWS = jy.HttpEs(searchvalue, "ik_smart", config.Sysconfig["elasticsearch"].(string))
-					findfields := `"title"`
+					// 移动端数据导出改
+					//findfields := `"title"`
+					findfields := `"`
+					findfields += m.GetString("selectType")
+					findfields += `"`
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))
 					secondLimit := 2*wx_pageSize - listSize
 					secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, feld, 0, secondLimit, 0, false)
@@ -549,6 +554,7 @@ func (m *Front) WxsearchlistPaging() {
 				m.T["msgset"] = keys
 			}
 		}
+		log.Println("list:", list)
 		m.ServeJson(map[string]interface{}{
 			"limitFlag":     limitFlag,
 			"status":        isLimit,
@@ -581,9 +587,12 @@ func getWxsearchlistData_new(keywords, scope, publishtime, subtype, industry, mi
 	}
 	qstr := getSearchQuery(s_word, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))
 	if selectType == "all" { //全文搜索
+		log.Println("全文")
 		list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, field, (pageNum-1)*pageSize, pageSize, 100, true)
 	} else { //标题搜索
+		log.Println("标题")
 		list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, field, (pageNum-1)*pageSize, pageSize, 100, false)
+		log.Println("end")
 	}
 
 	if list != nil {

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

@@ -679,6 +679,7 @@ var SuperSearch = {
 		sessionStorage.removeItem("superSearch_shaxuan");
 		sessionStorage.removeItem("superSearch_shaxuanFlag");
 		sessionStorage.removeItem("superSearch_searchType");
+		sessionStorage.removeItem("superSearch_showType");
 		sessionStorage.removeItem("superSearch_interceptWord");
 		sessionStorage.removeItem("superSearch_hasNoData_tiptext");
 		sessionStorage.removeItem("superSearch_allSearchModel_isshow");
@@ -1432,7 +1433,7 @@ var SuperSearch = {
 	//展示方式
 	//1.列表展示数据
 	showlist: function() {
-		localStorage.superSearch_showType="showlist";
+		sessionStorage.superSearch_showType="showlist";
 	    $("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
 	    $("#supersearchPage #wrapper #table").addClass("hidden");
 	    $("#supersearchPage #wrapper #list").removeClass("hidden");
@@ -1462,7 +1463,7 @@ var SuperSearch = {
 				}
 			},1000);
 		}
-		localStorage.superSearch_showType="showTable";
+		sessionStorage.superSearch_showType="showTable";
 	  	$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 	  	$("#supersearchPage #wrapper #table").removeClass("hidden");
 	  	$("#supersearchPage #wrapper #list").addClass("hidden");
@@ -1753,7 +1754,7 @@ var SuperSearch = {
 	    SuperSearch.beforeSubmit();
 	},
 	showType: function(){
-		if(localStorage.superSearch_showType=="showtable"){
+		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");

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

@@ -466,6 +466,7 @@
             $("#endtime").mobiscroll('show');
         });
 		var onceDetail = {{.T.orderDetail}}
+		console.log(onceDetail)
 		if(onceDetail!=""){
 			var filter = onceDetail["filter"];
 	        //金额
@@ -479,6 +480,7 @@
 			//区域
 			if(filter["area"]!=null&&filter["area"]!=""){
 				localStorage.province = filter["area"];
+				localStorage.areaHtml = filter["area"].join(',').replace(/,/g,"、")
 			}else{
 				localStorage.province = "";
 			}
@@ -489,6 +491,11 @@
 				localStorage.city = "";
 				localStorage.area = "";
 			}
+			if(filter["region"]!=null&&filter["region"]!=""){
+				localStorage.areaHtml = filter["region"];
+			}else{
+				localStorage.areaHtml = localStorage.area;
+			}
 	        //行业
 			if(filter["industry"]!=null&&filter["industry"]!=""){
 				localStorage.industry = filter["industry"].join(',').replace(/,/g," ");	 
@@ -731,8 +738,8 @@
             localStorage.date = date;
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
-            if(localStorage.area!==undefined&&localStorage.area!==""){
-                area = localStorage.area;
+            if(localStorage.areaHtml!==undefined&&localStorage.areaHtml!==""){
+                area = localStorage.areaHtml;
             }
             if(localStorage.province!==undefined&&localStorage.province!==""){
                 province = localStorage.province;

src/jfw/modules/app/src/web/templates/staticpage/dataExport_serviceterms.html

@@ -5,6 +5,8 @@
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link href="/jyapp/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<script src="/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
     <title>剑鱼标讯线上购买与服务条款</title>
 	<style type="text/css">
 	.public-nav{
@@ -102,10 +104,47 @@
 		display: inline-block;
 		margin-left: 10px;
 	}
+	.app-layout-header {
+	    line-height: 44px;
+	    background-color: #FFFFFF;
+	    text-align: center;
+	    border-bottom: 1px solid #E6E6E6;
+	    font-size: 17px;
+	    position: fixed;
+	    padding-top: 20px;
+	    z-index: 99999;
+	    left: 0;
+	    right: 0;
+	    top: 0;
+	    color: #444444;
+	}
+	.app-layout-header>.app-back_ {
+	    position: absolute;
+	    font-size: 19px;
+	    padding-top: 20px;
+	    padding-left: 11px;
+	    padding-right: 40px;
+	    padding-bottom: 7px;
+	    left: 0px;
+	    top: 18px;
+	    color: #444444;
+	}
 	</style>
+	<script>
+	$(function(){
+        //
+        $(".app-back_").on("click", function () {
+            history.go(-1);
+        });
+	})
+	</script>
 </head>
 <body>
 <section style="margin: auto;padding: 2rem 1rem" class="main">
+	<div class="app-layout-header">
+		<span class="app-back_ jyapp-icon jyapp-icon-zuojiantou"></span>
+		剑鱼标讯线上购买与服务条款
+	</div>
     <p>
 	<div class="MsoNormal" align="center" style="font-size:10.5pt;text-align:center;margin-bottom:20px;">
 		<b><span style="font-size: 1.5rem;line-height: 2rem;">剑鱼标讯产品与服务线上购买服务条款<span></span></span></b>

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"}}22111111"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.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>
 <!--2.8-->

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

@@ -443,6 +443,11 @@
 				localStorage.city = "";
 				localStorage.area = "";
 			}
+			if(filter["region"]!=null&&filter["region"]!=""){
+				localStorage.areaHtml = filter["region"];
+			}else{
+				localStorage.areaHtml = localStorage.area;
+			}
 	        //行业
 			if(filter["industry"]!=null&&filter["industry"]!=""){
 				localStorage.industry = filter["industry"].join(',').replace(/,/g," ");	 
@@ -682,8 +687,8 @@
             localStorage.date = date;
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
-            if(localStorage.area!==undefined&&localStorage.area!==""){
-                area = localStorage.area;
+            if(localStorage.areaHtml!==undefined&&localStorage.areaHtml!==""){
+                area = localStorage.areaHtml;
             }
             if(localStorage.province!==undefined&&localStorage.province!==""){
                 province = localStorage.province;

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

@@ -147,13 +147,12 @@
 		$(".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";
-			}
+		var em_selectType=$(".options").children(".search-title").children("em").html();
+		if(em_selectType=="全文搜索"){
+			SuperSearch.reqParam.selectType="all";
+		}else if(em_selectType=="标题搜索"){
+			SuperSearch.reqParam.selectType="title";
+		}
 		$.ajax({
 			type: "post",
 			url: "/front/wx_dataExport/searchExport",
@@ -161,6 +160,7 @@
 			dataType: "json",
 			success: function(data){
 				if(data._id!=""){
+					$(".loading_").hide();
 					window.location.href="/weixin/pay/dataexport?id="+data._id+"&source=d"
 					//window.location.href="/front/pay/redirect?id="+data._id+"&source=d"
 				}