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

src/jfw/jyutil/jyutil.go

@@ -145,13 +145,12 @@ func Getopenid(code string) (openid string) {
 	defer util.Catch()
 	recturl := fmt.Sprintf(config.Wxoauthinfo, code)
 	resp, err := http.Get(recturl)
-	defer resp.Body.Close()
 	if err != nil {
 		log.Println(err.Error())
 		return
 	}
+	defer resp.Body.Close()
 	bs, _ := ioutil.ReadAll(resp.Body)
-	resp.Body.Close()
 	data := map[string]interface{}{}
 	json.Unmarshal(bs, &data)
 	openid, _ = data["openid"].(string)

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

@@ -787,7 +787,7 @@ var SuperSearch = {
 		SuperSearch.reqParam.publishtime=SuperSearch.setPublishtime();
 	
 		//全文or标题
-		if($("#supersearchPage #search_title").hasClass("on")){
+		if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
 			SuperSearch.reqParam.selectType="title";
 		}else{
 			SuperSearch.reqParam.selectType="all";
@@ -1407,20 +1407,24 @@ var SuperSearch = {
 	},
 	//全文搜索
 	allSearch: function(){
-	    $("#supersearchPage #search_all").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-search-title").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("全文搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
 	    //记录
 	    if(localStorage){
-	        //localStorage.selectType="allSearch";
+	        localStorage.selectType="all";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();
 	},
 	//标题搜索
 	titleSearch: function(){
-	    $("#supersearchPage #search_title").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("标题搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
 	    //记录
 	    if(localStorage){
-	       // localStorage.selectType="titleSearch";
+	       localStorage.selectType="title";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();

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

@@ -330,14 +330,23 @@
 					    $("#bottombox").css("position","fixed");
 					}
 			   	});
-				if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
-					$(".email_check_ok").show();
-					$(".email_input").val(sessionStorage.getItem("order_email"+userId + {{.T._id}}));
-					finishEmailVerity = true;
-				} else if (email_lastInput != "") {
-					$(".email_check_ok").show();
-					$(".email_input").val(email_lastInput);
-					finishEmailVerity = true;
+				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null){
+					$(".email_check_ok").hide();
+					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
+					$(".email_input").parents('div.form-control').siblings().slideDown();
+					var lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}))
+					//clearInterval(r)
+					//sendemailTimer(lstimes);
+				}else {
+					if (sessionStorage.getItem("order_email"+userId+ {{.T._id}}) != null) {
+						$(".email_check_ok").show();
+						$(".email_input").val(sessionStorage.getItem("order_email"+userId + {{.T._id}}));
+						finishEmailVerity = true;
+					} else if (email_lastInput != "") {
+						$(".email_check_ok").show();
+						$(".email_input").val(email_lastInput);
+						finishEmailVerity = true;
+					}
 				}
 				if (email_lastVerity > 0) {
 					sendemailTimer(email_lastVerity);
@@ -673,10 +682,14 @@
 			function sendemailTimer(t) {
 				$(".sendCode").text("" + t + "s");
 				$(".sendCode").attr("disabled", "disabled");
+				sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 				r = setInterval(function() {
 					t--;
 					$(".sendCode").text("" + t + "s")
+					sessionStorage.setItem("send_code_"+{{.T._id}}, t);
 					if (t <= 0) {
+						sessionStorage.removeItem("send_code_"+{{.T._id}});
+						sessionStorage.removeItem("send_email_"+{{.T._id}});
 						clearInterval(r)
 						$(".sendCode").text("发送验证码");
 						if (!finishEmailVerity) {

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

@@ -175,6 +175,7 @@
 						$(this).addClass("active").siblings().removeClass("active");
 					})
 				})
+				$(".buttons-tab .tab-link").eq((parseInt({{.T.dataType}})-parseInt(1))).addClass("active").siblings().removeClass("active");
 				//
 				$(".app-layout-header .app-back").click(function(){
 					window.history.back();

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -31,12 +31,11 @@ if(getUrlParam("f")=="push"){
 	}
 }
 $(function(){
-  
 	if(sessionStorage.getItem(sessionStorage.userId+"_searchTime")){
 		$("#kongH").addClass("kongH");
 		document.getElementsByClassName("icon_time")[0].style.display="block";
 		document.getElementsByClassName("time_choice")[0].style.display="none";
-    $(".showType_bg").hide();
+    	$(".showType_bg").hide();
 		initMobiscroll_()
 	}else{
     $(".showType_bg").show();
@@ -115,9 +114,9 @@ function initpage(){
 			hasNoDataByTime();
 			return
 		}
-    if(sessionStorage.closeAdvert=="true"){
-      closeAdvert=true;
-    }
+	    if(sessionStorage.closeAdvert=="true"){
+	      closeAdvert=true;
+	    }
 		pageIndex = sessionStorage.historypushPageIndexCache;
 		hasNextPage = sessionStorage.historypushHasNextPage=="true"?true:false;
 		scrollTop = sessionStorage.historypushScrollTop;
@@ -125,7 +124,7 @@ function initpage(){
 			words = sessionStorage.historypushWords.split(",");
 		}
 		dataCache = JSON.parse(sessionStorage.historypushDataCache);
-   	$("#list>*").remove();
+   		$("#list>*").remove();
 		$(".showType").css("display","flex");
 		structureHtml(dataCache,true);
 		//appendList($(listCache),$(tableCache));
@@ -191,6 +190,7 @@ function initpage(){
 			t_time_str=t_date.Format("yyyy年MM月dd日");
 			$("#starttime_").attr("date-value",ttt);
 			$("#starttime_").val(t_time_str);
+			isRightShow(t_time_str);
 			
 			document.getElementsByClassName("icon_time")[0].style.display="block";
 			if($(".icon_time").css("display")=='none') {
@@ -200,7 +200,7 @@ function initpage(){
 				document.getElementsByClassName("time_choice")[0].style.display="none";
 			}
 			$(".showType").css("display","flex");
-			$(".showType_bg").show();
+			$(".showType_bg").hide();
 		}
 		//$("#list").css("visibility","hidden");
 		dataCache = dataCache.concat(firstPage);

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

@@ -301,6 +301,7 @@ function addDelInput(t,type) {
   }
   $(d).html(text)
   text = $(d).text()
+  text = text.replace(/\s/g,"")
   // console.log('--text--', text)
   var box = 'inputDel_' + type
   var template = null
@@ -352,6 +353,7 @@ function addDelInputB(t,type) {
     }
     $(d).html(text);
     text = $(d).text();
+    text = text.replace(/\s/g,"")
     var box = 'inputDel_' + type;
     var arr = box;
     switch (type) {

src/web/staticres/js/wxSupersearch.js

@@ -753,7 +753,7 @@ var SuperSearch = {
 		SuperSearch.reqParam.publishtime=SuperSearch.setPublishtime();
 	
 		//全文or标题
-		if($("#supersearchPage #search_title").hasClass("on")){
+		if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
 			SuperSearch.reqParam.selectType="title";
 		}else{
 			SuperSearch.reqParam.selectType="all";
@@ -1323,20 +1323,24 @@ var SuperSearch = {
 	},
 	//全文搜索
 	allSearch: function(){
-	    $("#supersearchPage #search_all").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-search-title").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("全文搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
 	    //记录
 	    if(localStorage){
-	        //localStorage.selectType="allSearch";
+	        localStorage.selectType="all";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();
 	},
 	//标题搜索
 	titleSearch: function(){
-	    $("#supersearchPage #search_title").addClass("on").siblings().removeClass("on");
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		$(".selected-export .options .search-title").find("em").text("标题搜索");
+		$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
 	    //记录
 	    if(localStorage){
-	       // localStorage.selectType="titleSearch";
+	       localStorage.selectType="title";
 	    }
 	    //将所选标签值作为参数传递
 	    SuperSearch.formSubmit();

src/web/templates/pc/dataExport_sieve.html

@@ -636,7 +636,7 @@
 (function(undefined) {}).call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
 </script>
 <script src="{{Msg "seo" "cdn"}}/dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/dataExport/js/conditions_order.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/dataExport/js/conditions_order.js?v={{Msg "seo" "version"}}4"></script>
 </body>
 <script type="text/javascript">
     var industrylist = {{.T.industrylist}};

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

@@ -8,7 +8,7 @@
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}3"></script>
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}4" />
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}5" />
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/public.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/choose_area.css?v={{Msg "seo" "version"}}5">
@@ -418,7 +418,7 @@
 	</div>
 
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}3"></script>
+		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}4"></script>
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 		<script>
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});

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

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>行业</title>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}5">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}7">
     <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/industry.css?v={{Msg "seo" "version"}}5">
     {{include "/common/weixin.html"}}

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

@@ -307,14 +307,23 @@
 					    $("#bottombox").css("position","fixed");
 					}
 			   	});
-				if (sessionStorage.getItem("order_email"+{{.T._id}})!=null){
-					$(".email_check_ok").show();
-					$(".email_input").val(sessionStorage.getItem("order_email"+{{.T._id}}));
-					finishEmailVerity=true;
-				}else if(email_lastInput!=""){
-					$(".email_check_ok").show();
-					$(".email_input").val(email_lastInput);
-					finishEmailVerity=true;
+				if (sessionStorage.getItem("send_email_"+{{.T._id}})!=null&&sessionStorage.getItem("send_code_"+{{.T._id}})!=null){
+					$(".email_check_ok").hide();
+					$(".email_input").val(sessionStorage.getItem("send_email_"+{{.T._id}}));
+					$(".email_input").parents('div.form-control').siblings().slideDown();
+					var lstimes = parseInt(sessionStorage.getItem("send_code_"+{{.T._id}}))
+					//clearInterval(r)
+					//sendemailTimer(lstimes);
+				}else {
+					if (sessionStorage.getItem("order_email"+{{.T._id}})!=null){
+						$(".email_check_ok").show();
+						$(".email_input").val(sessionStorage.getItem("order_email"+{{.T._id}}));
+						finishEmailVerity=true;
+					}else if(email_lastInput!=""){
+						$(".email_check_ok").show();
+						$(".email_input").val(email_lastInput);
+						finishEmailVerity=true;
+					}
 				}
 				if(email_lastVerity>0){
 					sendemailTimer(email_lastVerity);
@@ -413,7 +422,6 @@
 					if(email_input.indexOf("@")>0){
 						if(email_input!=email_lastInput){
 							$(this).parents('div.form-control').siblings().slideDown();
-							console.log(email_lastVerity)
 							if(email_lastVerity>0){
 								$("#sendCode").attr("disabled", true);
 								$(".verity_input").attr("readonly",true);
@@ -509,6 +517,8 @@
 					if(verity.length==6){
 						$.post("/front/dataExport/checkMailVerify",{"emailVerity":verity,"email":email},function(data){
 							if(data.success){
+								sessionStorage.removeItem("send_code_"+{{.T._id}});
+								sessionStorage.removeItem("send_email_"+{{.T._id}});
 								finishEmailVerity=true;
 								if(readClause&&finishPhoneVerity){
 									$(".toPay").removeAttr("disabled")
@@ -623,11 +633,15 @@
 			function sendemailTimer(t){
 				$(".sendCode").text(""+t+"s");
 				$(".sendCode").attr("disabled","disabled");
+				sessionStorage.setItem("send_email_"+{{.T._id}}, $(".email_input").val().replace(/\s*/g,""));
 				r=setInterval(function(){
 					t--;
 					$(".sendCode").text(""+t+"s")
+					sessionStorage.setItem("send_code_"+{{.T._id}}, t);
 					if(t<=0){
-						clearInterval(r)
+						sessionStorage.removeItem("send_code_"+{{.T._id}});
+						sessionStorage.removeItem("send_email_"+{{.T._id}});
+						clearInterval(r);
 						$(".sendCode").text("发送验证码");
 						if(!finishEmailVerity){
 							$(".verity_input").attr("readonly",true);

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