修改缺陷

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

@@ -245,6 +245,9 @@ func (m *MyOrder) MyOrderPaging() error {
 			if v["id"] != nil && orderMoney != nil && v["order_code"] != nil {
 				v["token"] = public.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), v["pay_way"].(string), queryM["user_id"].(string))
 			}
+			if v["filter_id"] != nil {
+				v["filter_id"] = util.SE.Encode2Hex(v["filter_id"].(string))
+			}
 		}
 	}
 	m.ServeJson(map[string]interface{}{

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

@@ -95,6 +95,8 @@
 
         // 窗口调整
         $win.off('resize').on('resize',function(){
+			//移动端数据导出改 --> 软键盘弹起改变窗口高度问题
+		//	return;
 			if(win != window){
 				return;
 			}

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

@@ -401,6 +401,9 @@ var EntSearch = {
 		if(!sessionStorage){
 			return;
 		}
+		if(sessionStorage.entSearch_input){
+			$("#ent_searchinput").val(sessionStorage.entSearch_input);
+		}
 		if(sessionStorage.entSearch_noDataCache=="null"){
 			EntSearch.noDataCache = null;
         	$("#entsearchPage #set_search").addClass("hidden");
@@ -456,6 +459,7 @@ var EntSearch = {
         if(!sessionStorage){
 			return;
         }
+		sessionStorage.entSearch_input=$("#ent_searchinput").val();
         sessionStorage.entSearch_scrollTop = $("#entsearchPage .app-layout-content-b").scrollTop();
         sessionStorage.entSearch_listCache = $('#entsearchPage #wrapper tbody').html();
         sessionStorage.entSearch_pageNumCache = EntSearch.reqParam["pageNum"];
@@ -481,6 +485,7 @@ var EntSearch = {
 		sessionStorage.removeItem("entSearch_scrollTop");
 		sessionStorage.removeItem("searchpageName");
 		sessionStorage.removeItem("cancelFollowVersion");
+		sessionStorage.removeItem("entSearch_input");
 	},
 	initDropload: function (hasNextPage,pgNum){
         //上拉分页
@@ -698,6 +703,7 @@ var EntSearch = {
 		if(!EntSearch.beforeSubmit()){
 			return;
 		}
+		//sessionStorage.ent_input=$("#ent_searchinput").val();
 		$("#entsearchPage .nullcontent").addClass("hidden");
 		$("#entsearchPage #set_search").addClass("hidden");
         $("#entsearchPage #ent_searchinput").blur();

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

@@ -3,7 +3,7 @@
 {{include "/common/meta.html"}}
 <link href="/jyapp/css/bootstrap.min.css" rel="stylesheet">
 <link href="/jyapp/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/jyapp/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jyapp/css/common.css?v={{Msg "seo" "version"}}1" rel="stylesheet">
 <link href="/jyapp/css/wxsearch.css?v={{Msg "seo" "version"}}1" rel="stylesheet" type="text/css" >
 <link href="/jyapp/mobiscroll/mobiscroll.min.css" rel="stylesheet">
 <link href="/jyapp/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
@@ -12,9 +12,9 @@
 <script src="/jyapp/js/jy.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/js.html"}}
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
-<script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}12223"></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"}}3"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}123456"></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_applyInvoice.html

@@ -154,7 +154,18 @@
 			var companyName =document.getElementById("companyName");
 			//纳税人识别正则
 			   taxNumer.onblur = function(){
-			   		 this.scrollIntoView();
+			   		var nu = navigator.userAgent;
+					var isAndroid = nu.indexOf('Android') > -1 || nu.indexOf('Adr') > -1; //android终端
+					var isiOS = !!nu.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+			   		var target = this;
+					if(isAndroid){
+			            setTimeout(function(){
+			                target.scrollIntoViewIfNeeded();
+			            },400);
+		            }
+					if(isiOS){
+						scrollTop(0)
+					}
 			    	var taxNumerValue = taxNumer.value;
 			    	var b = taxNumer_reg.test(taxNumerValue);
 				if(taxNumerValue == ""){
@@ -183,7 +194,16 @@
 	       		 }
 			//公司识别正则
 			   companyName.onblur = function(){
-			   		this.scrollIntoView();
+				   	var nu = navigator.userAgent;
+					var isAndroid = nu.indexOf('Android') > -1 || nu.indexOf('Adr') > -1; //android终端
+					var isiOS = !!nu.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+			   		var target = this;
+					if(isAndroid){
+			            setTimeout(function(){
+			                target.scrollIntoViewIfNeeded();
+			            },400);
+		            }
+
 			    	var companyNameValue = companyName.value;
 			    	var b = companyName_reg.test(companyNameValue);
 			    	if (companyNameValue == "")	{