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

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/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," ");	 
@@ -577,7 +584,7 @@
         //区域
         if(localStorage.areaHtml!==undefined && localStorage.areaHtml!==""){
             var area = localStorage.areaHtml;
-            var areaHtml = area.replace(/、/g," ").replace(/(.:福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
+            var areaHtml = area.replace(/、/g," ").replace(/(安徽||福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
             $("#area").text(areaHtml);
             $(".confirm").hide();
             $(".resetOne").show();
@@ -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/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," ");	 
@@ -530,7 +535,7 @@
         //区域
         if(localStorage.areaHtml!==undefined && localStorage.areaHtml!==""){
             var area = localStorage.areaHtml;
-            var areaHtml = area.replace(/、/g," ").replace(/(.:福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
+            var areaHtml = area.replace(/、/g," ").replace(/(安徽||福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
             $("#area").text(areaHtml);
             $(".confirm").hide();
             $(".resetOne").show();
@@ -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/dataExport/dataExport_keyWord.html

@@ -254,7 +254,7 @@
                                 str = "编辑 附加词 ("+appended+")";
                             }
                         }else{
-                            str =  "添加 附加词";
+                            str = "添加 附加词";
                         }
                         $(".addAdjunctWord").text(str);
                         if(keys[a].exclude !== undefined){

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

@@ -208,7 +208,7 @@
                             str = "编辑 附加词 ("+appended+")";
                         }
                     }else{
-                        str =  "添加 附加词";
+                        str = "添加 附加词";
                     }
                     $(".addAdjunctWord").text(str);
                     if(keys[a].exclude !== undefined){