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

src/jfw/front/dataExport.go

@@ -490,6 +490,7 @@ func (d *DataExport) SuperSearchExport() error {
 			isIntercept = true
 		}
 		_, _, keywords = jy.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		keywords = strings.Replace(keywords, "+", " ", -1)
 		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
 	}
 	//时间

src/jfw/front/supsearch.go

@@ -268,6 +268,7 @@ func (p *Pcsearch) PcSearchIndex() error {
 				secondFlag = "T"
 			}
 		}
+		s_word = strings.Replace(s_word, "+", " ", -1)
 		SaveUserSearchLog(p.Request, util.ObjToString(p.GetSession("userId")), count, "pc", "超级搜索", map[string]interface{}{
 			"search_word":        s_word,
 			"search_area":        area,

src/jfw/front/ws_dataExport.go

@@ -360,6 +360,7 @@ func (w *WsDataExport) SearchExport() error {
 			isIntercept = true
 		}
 		_, _, keywords = jy.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		keywords = strings.Replace(keywords, "+", " ", -1)
 		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
 	}
 	//时间

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

@@ -363,6 +363,7 @@ func (w *WsDataExport) SearchExport() error {
 			isIntercept = true
 		}
 		_, _, keywords = jy.InterceptSearchKW(keywords, isIntercept, len(industrySave) == 0)
+		keywords = strings.Replace(keywords, "+", " ", -1)
 		KeyWordSave = append(KeyWordSave, public.KeyWord{Keyword: keywords})
 	}
 	//时间

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

@@ -315,6 +315,11 @@
             }
         });
         //
+        var scrollTop = 0;
+        $(window).scroll(function(){
+			scrollTop = $(this).scrollTop();
+		});
+        //
         $('.match').click(function () {
             $('.match_way').slideDown('slow');
             var selectType = $(this).text();
@@ -343,7 +348,7 @@
             }else if(checkValue === "按全文匹配"){
                 selectType = "all";
             }
-            localStorage.selectType = selectType;
+            localStorage.export_selectType = selectType;
         });
         $(".cancel").click(function() {
             $('.match_way').hide(200)
@@ -641,9 +646,9 @@
 	            localStorage.removeItem("export_endtime");
 			}
 	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
-				localStorage.selectType = filter["selectType"];
+				localStorage.export_selectType = filter["selectType"];
 	        }else{
-				localStorage.selectType = "";
+				localStorage.export_selectType = "";
 			}
 			window.history.replaceState({}, '数据导出', 'toSieve');
 		}
@@ -697,8 +702,8 @@
             $(".resetOne").show();
         }
         //关键词选择方式
-        if(localStorage.selectType!==""&&localStorage.selectType!==undefined){
-            var selectType = localStorage.selectType;
+        if(localStorage.export_selectType!==""&&localStorage.export_selectType!==undefined){
+            var selectType = localStorage.export_selectType;
             var type = "";
             if(selectType === "title"){
                 type = "按标题匹配";
@@ -813,7 +818,6 @@
         if($("#keyword").text()===""){
             sessionStorage.removeItem("keyWord")
         }
-        //
 
         //筛选条件发送
         $(".saveData").on('click', function () {
@@ -864,8 +868,8 @@
             if(localStorage.winner!==undefined&&localStorage.winner!==""){
                 winner = localStorage.winner;
             }
-            if(localStorage.selectType!==undefined&&localStorage.selectType!==""){
-                selectType = localStorage.selectType;
+            if(localStorage.export_selectType!==undefined&&localStorage.export_selectType!==""){
+                selectType = localStorage.export_selectType;
             }else{
                 var type = $(".match").text();
                 if(type === "按标题匹配"){
@@ -873,7 +877,7 @@
                 }else if(type === "按全文匹配"){
                     selectType = "all";
                 }
-                localStorage.selectType = selectType;
+                localStorage.export_selectType = selectType;
             }
             $.ajax({
                 type: 'post',
@@ -909,7 +913,7 @@
             localStorage.removeItem("area");
             localStorage.removeItem("industry");
             localStorage.removeItem("keyWord");
-            localStorage.removeItem("selectType");
+            localStorage.removeItem("export_selectType");
             localStorage.removeItem("price");
             localStorage.removeItem("subType");
             localStorage.removeItem("subTypes");

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

@@ -57,7 +57,7 @@
 		color: #2cb7ca;
 	}
 	.addKeyWord {
-		width: 100%;
+		left: 44%;
 		position: fixed;
 		text-align: center;
 		bottom: 10%;

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

@@ -57,7 +57,7 @@
 			color: #2cb7ca;
 		}
 		.addKeyWord {
-			width: 100%;
+			left: 44%;
 			position: fixed;
 			text-align: center;
 			bottom: 10%;

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

@@ -294,7 +294,7 @@
             }else if(checkValue === "按全文匹配"){
                 selectType = "all";
             }
-            localStorage.selectType = selectType;
+            localStorage.export_selectType = selectType;
         });
         $(".cancel").click(function() {
             $('.match_way').hide(200)
@@ -596,9 +596,9 @@
 				//localStorage.export_endtime = Date.parse(new Date())/1000;
 			}
 	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
-				localStorage.selectType = filter["selectType"];
+				localStorage.export_selectType = filter["selectType"];
 	        }else{
-				localStorage.selectType = "";
+				localStorage.export_selectType = "";
 			}
 			window.history.replaceState({}, '数据导出', 'toSieve');
 		}
@@ -651,8 +651,8 @@
             $(".resetOne").show();
         }
         //关键词选择方式
-        if(localStorage.selectType!==""&&localStorage.selectType!==undefined){
-            var selectType = localStorage.selectType;
+        if(localStorage.export_selectType!==""&&localStorage.export_selectType!==undefined){
+            var selectType = localStorage.export_selectType;
             var type = "";
             if(selectType === "title"){
                 type = "按标题匹配";
@@ -816,8 +816,8 @@
             if(localStorage.winner!==undefined&&localStorage.winner!==""){
                 winner = localStorage.winner;
             }
-            if(localStorage.selectType!==undefined&&localStorage.selectType!==""){
-                selectType = localStorage.selectType;
+            if(localStorage.export_selectType!==undefined&&localStorage.export_selectType!==""){
+                selectType = localStorage.export_selectType;
             }else{
                 var type = $(".match").text();
                 if(type === "按标题匹配"){
@@ -825,7 +825,7 @@
                 }else if(type === "按全文匹配"){
                     selectType = "all";
                 }
-                localStorage.selectType = selectType;
+                localStorage.export_selectType = selectType;
             }
             $.ajax({
                 type: 'post',
@@ -861,7 +861,7 @@
             localStorage.removeItem("area");
             localStorage.removeItem("industry");
             localStorage.removeItem("keyWord");
-            localStorage.removeItem("selectType");
+            localStorage.removeItem("export_selectType");
             localStorage.removeItem("price");
             localStorage.removeItem("subType");
             localStorage.removeItem("subTypes");

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"}}3"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}4"></script>
 <!--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/iconfont/iconfont.css?v={{Msg "seo" "version"}}">