Procházet zdrojové kódy

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

wangshan před 5 roky
rodič
revize
33360774b1

+ 3 - 0
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{}{

+ 2 - 0
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;
 			}

+ 6 - 0
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();

+ 14 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -15,18 +15,24 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 <style>
+    .page{
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		justify-content: space-between;
+	}
     .app-layout-header{
         line-height: 44px;
         background-color: #FFFFFF;
         text-align: center;
         border-bottom: 1px solid #E6E6E6;
         font-size: 17px;
-        position: fixed;
+        /*position: fixed;*/
         padding-top: 20px;
-        z-index: 99999;
-        left: 0;
-        right: 0;
-        top: 0;
+        /*z-index: 99999;*/
+        /*left: 0;*/
+        /*right: 0;*/
+        /*top: 0;*/
         color: #444444;
     }
     body{
@@ -56,11 +62,12 @@
 
 </style>
 <body>
+<div class="page">
 <div class="app-layout-header">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
     附加词
 </div>
-<div class="keyWord" style="padding-top: 50px">
+<div class="keyWord">
     <section class="content">
     <p class="title">示例:开发(附加词)</p>
 <!-- 添加附加词 -->
@@ -115,6 +122,7 @@
     </div>
 
     </div>
+   </div>
     <script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>

+ 23 - 15
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html

@@ -15,20 +15,26 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     <style>
-        .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;
-        }
+        .page{
+			display: flex;
+			flex-direction: column;
+			height: 100%;
+			justify-content: space-between;
+		}
+	    .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;
+	    }
         body{
             background: rgba(245,244,249,1)!important;
         }
@@ -48,11 +54,12 @@
         }
     </style>
     <body>
+    	<div class="page">
     <div class="app-layout-header">
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
         附加词
     </div>
-    <div class="keyWord" style="padding-top: 50px;">
+    <div class="keyWord">
         <section class="content">
         <p class="title">示例:开发(附加词)</p>
     <!-- 添加附加词 -->
@@ -96,6 +103,7 @@
         </div>
 
         </div>
+       </div>
         <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>

+ 12 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html

@@ -780,6 +780,10 @@
 								 $(this).addClass("active");
 								 if($(this).parent().prev().prop("class") !== "tab municipality"){
 									 $(this).parent().slideDown();
+									 $(this).parent().prev().find('i').css({
+										 "display":"inline-block",
+							 			 "transform":"rotate(-180deg)"
+									 })
 								 }
 							 }
 						 })
@@ -810,6 +814,10 @@
 									 });
 									 if($(this).prop("class") !== "tab municipality"){
 										 $(this).next().slideDown();
+										 $(this).find('i').css({
+											 "display":"inline-block",
+								 			 "transform":"rotate(-180deg)"
+										 })
 									 }
 								 }
 							 });
@@ -818,6 +826,10 @@
 									 $(this).addClass("active");
 									 if($(this).parent().prev().prop("class") !== "tab municipality"){
 										 $(this).parent().slideDown();
+										 $(this).parent().prev().find('i').css({
+											 "display":"inline-block",
+								 			 "transform":"rotate(-180deg)"
+										 })
 									 }
 								 }
 							 })

+ 22 - 14
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -15,20 +15,26 @@
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 <style>
-	.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;
+	.page{
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		justify-content: space-between;
 	}
+    .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;
+    }
 	body{
 		background: rgba(245,244,249,1)!important;
 	}
@@ -60,11 +66,12 @@
 </style>
 
 <body>
+	<div class="page">
 <div class="app-layout-header">
 	<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 	采购单位
 </div>
-<div class="keyWord" style="padding-top:70px">
+<div class="keyWord">
 	<section class="content">
 	<div class="enter addkeyWord">
 		<input type="text" class="enterOne" placeholder="采购单位名称" />
@@ -87,6 +94,7 @@
 <div class="addKeyWord">
 	<i class="iconfont icon-tianjia"></i>
 </div>
+</div>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}33"></script>

+ 23 - 15
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html

@@ -15,20 +15,26 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     <style>
-        .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;
-        }
+        .page{
+			display: flex;
+			flex-direction: column;
+			height: 100%;
+			justify-content: space-between;
+		}
+	    .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;
+	    }
         body{
             background: rgba(245,244,249,1)!important;
         }
@@ -55,11 +61,12 @@
     </style>
 
     <body>
+    	<div class="page">
     <div class="app-layout-header">
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
         采购单位
     </div>
-    <div class="keyWord" style="padding-top: 70px;">
+    <div class="keyWord">
         <section class="content">
         <div class="enter addkeyWord">
         <input type="text" class="enterOne" placeholder="采购单位名称" />
@@ -80,6 +87,7 @@
 
         </section>
         </div>
+       </div>
         <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
     <script>

+ 14 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -15,18 +15,24 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 <style>
+    .page{
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		justify-content: space-between;
+	}
     .app-layout-header{
         line-height: 44px;
         background-color: #FFFFFF;
         text-align: center;
         border-bottom: 1px solid #E6E6E6;
         font-size: 17px;
-        position: fixed;
+        /*position: fixed;*/
         padding-top: 20px;
-        z-index: 99999;
-        left: 0;
-        right: 0;
-        top: 0;
+        /*z-index: 99999;*/
+        /*left: 0;*/
+        /*right: 0;*/
+        /*top: 0;*/
         color: #444444;
     }
     body{
@@ -56,11 +62,12 @@
 
 </style>
 <body>
+	<div class="page">
 <div class="app-layout-header">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
     排除词
 </div>
-<div class="keyWord" style="padding-top: 50px">
+<div class="keyWord">
     <section class="content">
     <p class="title">示例:运维(排除词)</p>
 <!-- 添加附加词 -->
@@ -115,6 +122,7 @@
     </div>
 
     </div>
+   </div>
     <script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>

+ 23 - 15
src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html

@@ -15,20 +15,26 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     <style>
-        .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;
-        }
+        .page{
+			display: flex;
+			flex-direction: column;
+			height: 100%;
+			justify-content: space-between;
+		}
+	    .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;
+	    }
         body{
             background: rgba(245,244,249,1)!important;
         }
@@ -48,11 +54,12 @@
         }
     </style>
     <body>
+    	<div class="page">
     <div class="app-layout-header">
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
         排除词
     </div>
-    <div class="keyWord" style="padding-top: 50px;">
+    <div class="keyWord">
         <section class="content">
         <p class="title">示例:运维(排除词)</p>
     <!-- 添加附加词 -->
@@ -104,6 +111,7 @@
         </div>
 
         </div>
+       </div>
         <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>

+ 14 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

@@ -15,18 +15,24 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 <style>
+    .page{
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		justify-content: space-between;
+	}
     .app-layout-header{
         line-height: 44px;
         background-color: #FFFFFF;
         text-align: center;
         border-bottom: 1px solid #E6E6E6;
         font-size: 17px;
-        position: fixed;
+        /*position: fixed;*/
         padding-top: 20px;
-        z-index: 99999;
-        left: 0;
-        right: 0;
-        top: 0;
+        /*z-index: 99999;*/
+        /*left: 0;*/
+        /*right: 0;*/
+        /*top: 0;*/
         color: #444444;
     }
     body{
@@ -48,11 +54,12 @@
     }
 </style>
 <body>
+	<div class="page">
 <div class="app-layout-header">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
     关键词
 </div>
-<div class="keyWord" style="padding-top: 50px;">
+<div class="keyWord">
 	<section class="content">
     <p class="title">示例:软件系统(关键词);  开发(附加词);  运维(排除词)</p>
     <!-- 添加关键词 -->
@@ -99,6 +106,7 @@
 
     </div>
 
+</div>
 </div>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>

+ 22 - 14
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -15,20 +15,26 @@
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	</head>
 	<style>
-		.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;
+		.page{
+			display: flex;
+			flex-direction: column;
+			height: 100%;
+			justify-content: space-between;
 		}
+	    .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;
+	    }
 		body{
 			background: rgba(245,244,249,1)!important;
 		}
@@ -58,11 +64,12 @@
 		}
 	</style>
 	<body>
+		<div class="page">
 	<div class="app-layout-header">
 		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 		中标单位
 	</div>
-	<div class="keyWord" style="padding-top:70px;">
+	<div class="keyWord">
 			<div class="enter addkeyWord">
 			<input type="text" class="enterOne" placeholder="中标单位名称" />
 			<div class="btn">
@@ -83,6 +90,7 @@
 	<div class="addKeyWord">
 		<i class="iconfont icon-tianjia"></i>
 	</div>
+	</div>
 	<script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
 	<script src="/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	<script>

+ 23 - 15
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html

@@ -15,20 +15,26 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     <style>
-        .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;
-        }
+        .page{
+			display: flex;
+			flex-direction: column;
+			height: 100%;
+			justify-content: space-between;
+		}
+	    .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;
+	    }
         body{
             background: rgba(245,244,249,1)!important;
         }
@@ -54,11 +60,12 @@
         }
     </style>
     <body>
+    	<div class="page">
     <div class="app-layout-header">
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
         中标单位
     </div>
-    <div class="keyWord" style="padding-top: 70px;">
+    <div class="keyWord">
         <section class="content">
         <div class="enter addkeyWord">
         <input type="text" class="enterOne" placeholder="中标单位名称" />
@@ -78,6 +85,7 @@
         </div>
             </section>
         </div>
+       </div>
         <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>

+ 3 - 3
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-->

+ 15 - 6
src/web/staticres/wx_dataExport/css/money.css

@@ -1,7 +1,14 @@
 body {
   background: #fff;
   font-size: 0.3rem;
-  padding-bottom: 0.94rem;
+  /*padding-bottom: 0.94rem;*/
+}
+body .industry{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  overflow: scroll;
+  flex: 1;
 }
 body .industry .all {
   padding: 0.3rem;
@@ -17,6 +24,9 @@ body .industry .all span {
   line-height: .7rem;
   font-weight: bold;
 }
+body .industry .connect{
+	flex: 1;
+}
 body .industry .connect h3 {
   font-size: .26rem;
   color: #686868;
@@ -53,14 +63,13 @@ body .industry .connect .connectMain span input {
   font-size: 16px;
 }
 body .industry .resetOne {
-  position: fixed;
+	display: flex;
+  /*position: fixed;
   left: 0;
   bottom: 0;
-  width: 100%;
+  width: 100%;*/
   border-top: 1px solid #F4F4F9;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
+  
 }
 body .industry .resetOne button {
   width: 50%;

+ 22 - 2
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 == "")	{

+ 12 - 0
src/web/templates/weixin/dataExport/dataExport_area.html

@@ -744,6 +744,10 @@
 								 $(this).addClass("active");
 								 if($(this).parent().prev().prop("class") !== "tab municipality"){
 									 $(this).parent().slideDown();
+									 $(this).parent().prev().find('i').css({
+										 "display":"inline-block",
+							 			 "transform":"rotate(-180deg)"
+									 })
 								 }
 							 }
 						 })
@@ -774,6 +778,10 @@
 									 });
 									 if($(this).prop("class") !== "tab municipality"){
 										 $(this).next().slideDown();
+										 $(this).find('i').css({
+											 "display":"inline-block",
+								 			 "transform":"rotate(-180deg)"
+										 })
 									 }
 								 }
 							 });
@@ -782,6 +790,10 @@
 									 $(this).addClass("active");
 									 if($(this).parent().prev().prop("class") !== "tab municipality"){
 										 $(this).parent().slideDown();
+										 $(this).parent().prev().find('i').css({
+											 "display":"inline-block",
+								 			 "transform":"rotate(-180deg)"
+										 })
 									 }
 								 }
 							 })

+ 9 - 2
src/web/templates/weixin/dataExport/dataExport_price.html

@@ -8,7 +8,7 @@
     <title>金额</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <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/money.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/money.css?v={{Msg "seo" "version"}}6">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="/js/jquery.js"></script>
@@ -22,9 +22,15 @@
 	.width100{
     	width: 100% !important;
     }
+    .page{
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		justify-content: space-between;
+	}
 </style>
 <body>
-
+<div class="page">
     <div class="industry">
         <div class="all"><span class="active">全部</span> </div>
         
@@ -47,6 +53,7 @@
         </div>
 
     </div>
+    </div>
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     $(function () {