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

src/jfw/front/dataExport.go

@@ -81,6 +81,7 @@ func (d *DataExport) SieveData() error {
 	subType := d.GetString("subtype")
 	buyer := d.GetString("buyer")
 	winner := d.GetString("winner")
+	selectType := d.GetString("selectType")
 
 	var areaArr []string
 	var cityArr []string
@@ -124,6 +125,7 @@ func (d *DataExport) SieveData() error {
 			log.Println("keywordList", len(keywordList), keywordList)
 		}
 	}
+	log.Println("selectType", selectType)
 	if buyer != "" {
 		buyerArr = strings.Split(buyer, ",")
 		log.Println("buyerArr", buyerArr)
@@ -139,6 +141,7 @@ func (d *DataExport) SieveData() error {
 		"region":      regionArr,
 		"industry":    industryArr,
 		"keywords":    keywordList,
+		"selectType":  selectType,
 		"minprice":    minPrice,
 		"maxprice":    maxPrice,
 		"subtype":     subType,

src/jfw/modules/app/src/main.go

@@ -37,6 +37,9 @@ func main() {
 		if strings.HasSuffix(r.URL.String(), ".apk") {
 			w.Header().Set("Content-Type", "application/vnd.android.package-archive")
 		}
+		if strings.HasSuffix(r.URL.String(), ".xlsx") {
+			w.Header().Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+		}
 		http.StripPrefix("/jyapp/res/", http.FileServer(http.Dir("web/staticres/jyapp/res"))).ServeHTTP(w, r)
 	})
 	xweb.RunBase(":"+Sysconfig["webport"].(string), mux1)

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css

@@ -2,20 +2,19 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
+  overflow: scroll;
+  flex: 1;
 }
 .keyWord .content {
   flex: 1;
   overflow-y: scroll;
 }
 .keyWord .title {
-  height: 1.12rem;
-  font-size: .26rem;
-  color: #888;
-  padding: .2rem;
-  line-height: .85rem;
+  	height: .85rem;
+    font-size: .26rem;
+    color: #888;
+    padding: 0 .2rem;
+    line-height: .85rem;
 }
 .keyWord .enter{
   overflow: hidden;

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -57,14 +57,18 @@ $(function(){
         this.style.height = 'auto';
         this.style.height = this.scrollHeight + "px";
     });
-
-    //防止键盘把当前输入框给挡住
-    $('input[type="text"],textarea').focus(function () {
-        var target = this;
-        setTimeout(function(){
-            target.scrollIntoViewIfNeeded();
-        },400);
-    });
+    var u = navigator.userAgent;
+	var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+	var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+	if(isAndroid){
+		//防止键盘把当前输入框给挡住
+	    $('input[type="text"],textarea').focus(function () {
+	        var target = this;
+	        setTimeout(function(){
+	            target.scrollIntoViewIfNeeded();
+	        },400);
+	    });
+	}
 
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save').on('click', function(){

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

@@ -718,7 +718,8 @@ var SuperSearch = {
 			return false;
 		}
 		SuperSearch.reqParam.searchvalue=SuperSearch.s_words;
-		localStorage.keyWord = JSON.stringify([{"keyWord":SuperSearch.s_words}]);
+		//预览数据需要用
+		localStorage.keyWords = JSON.stringify([{"keyWord":SuperSearch.s_words}]);
 		//信息范围
 		var scope = [];
 		$("#supersearchPage .contentone .btn.active").each(function(){
@@ -951,10 +952,10 @@ var SuperSearch = {
 					}else{
 						$("#supersearchPage #hasNoData_tiptext>font:eq(0)").show();
 					}
-					if($("#search_all").hasClass("on")){
-						$("#supersearchPage #allSearchModel").hide();
-					}else{
+					if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
 						$("#supersearchPage #allSearchModel").show();
+					}else{
+						$("#supersearchPage #allSearchModel").hide();
 					}
 					$("#supersearchPage #list").text("");
 					SuperSearch.hasNoData();

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

@@ -328,6 +328,13 @@
         /* 选择匹配方式*/
         $('input:radio[name="way"]').click(function() {
             var checkValue = $('input:radio[name="way"]:checked').val();
+        	$(".read").each(function () {
+                var p = $(this).children().text();
+                if(p!==checkValue){
+                	$(".confirm").hide();
+                	$(".resetOne").show();
+                }
+           	});
             $('.match_way').hide(200);
             $('.match').html(checkValue);
             var selectType = "";
@@ -699,6 +706,8 @@
                 type = "按全文匹配";
             }
             $(".match").text(type);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //信息类型
         if(localStorage.subTypes!==undefined && localStorage.subTypes!==""){

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>

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>

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)"
+										 })
 									 }
 								 }
 							 })

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>

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>

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>

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>

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

@@ -9,24 +9,30 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}23">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}25">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}6"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <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{
@@ -65,11 +71,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:53px">
+    <div class="keyWord">
         <section class="content">
         <p class="title">示例：软件系统(关键词);  开发(附加词);  运维(排除词)</p>
         <!-- 添加关键词 -->
@@ -136,16 +143,32 @@
 
         </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 src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}48"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}53"></script>
     <script>
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){
                 window.location.reload();
             }
         });
+        
+        
+//		console.dir($('body').scrollHeight)
+	    document.body.addEventListener('focusin', () => {  //软键盘弹起事件
+//	    	document.body.height = document.documentElement.clientHeight;
+//      	alert("键盘弹起")
+			
+		})
+		document.body.addEventListener('focusout', () => { //软键盘关闭事件
+//		    alert("键盘收起")
+//			alert(document.documentElement.clientHeight)
+//			alert(document.getElementsByClassName("app-layout-header").scrollTop)
+		})
+        
+        
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
             var keyWord = localStorage.keyWord;

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>

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

@@ -846,6 +846,10 @@
 					$("#easyAlert").remove();
 				}
 			}
+			//
+            function showToast (content) {
+              EasyAlert.show(content,"",3000);
+            }
 		</script>
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}

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

@@ -347,6 +347,20 @@
 			    -webkit-transform: scaleY(.5);
 			    transform: scaleY(.5);
 			}
+			.easyalert {
+			    position: fixed;
+			    background-color: rgba(0,0,0,0.7);
+			    top: 50%;
+			    color: #fff;
+			    z-index: 999;
+			    border-radius: 6px;
+			    padding: 17px 20px;
+			    font-size: 15px;
+			    line-height: 22px;
+			    max-width: 260px;
+			    text-align: center;
+			    display: none;
+			}
 		</style>
 		<div class="app-layout-header">
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
@@ -806,6 +820,7 @@
 			            $(".loading_").hide();
 			            canpay = true;
 					})
+					
 				})
 				
 		        var interval
@@ -1305,6 +1320,36 @@
 			}
 			*/
 		
+			//提示框
+			var EasyAlert = {
+				timeout: null,
+				waitTime: 1000,
+				show: function(text, css, waitTime) {
+					if (this.timeout != null) {
+						clearTimeout(this.timeout);
+						this.hide();
+						this.timeout = null;
+					}
+					var thisClass = this;
+					this.timeout = setTimeout(function() {
+						thisClass.hide();
+						thisClass.timeout = null;
+					}, waitTime ? waitTime : this.waitTime);
+					$("body").append('<div class="easyalert" id="easyAlert">' + text + '</div>');
+					$("#easyAlert").css({
+						"left": "50%",
+						"margin-top": -($("#easyAlert").outerHeight() / 2),
+						"margin-left": -($("#easyAlert").outerWidth() / 2)
+					}).show();
+				},
+				hide: function() {
+					$("#easyAlert").remove();
+				}
+			}
+			//
+            function showToast (content) {
+              EasyAlert.show(content,"",3000);
+            }
 		</script>
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}

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

@@ -195,6 +195,20 @@
 		    -webkit-transform: scaleY(.5);
 		    transform: scaleY(.5);
 		}
+		.easyalert {
+		    position: fixed;
+		    background-color: rgba(0,0,0,0.7);
+		    top: 50%;
+		    color: #fff;
+		    z-index: 999;
+		    border-radius: 6px;
+		    padding: 17px 20px;
+		    font-size: 15px;
+		    line-height: 22px;
+		    max-width: 260px;
+		    text-align: center;
+		    display: none;
+		}
 	</style>
 		<script>
 			var pay_way="wx_app";
@@ -516,6 +530,36 @@
 	            return n+n2;
 	        }
 			
+			//提示框
+			var EasyAlert = {
+				timeout: null,
+				waitTime: 1000,
+				show: function(text, css, waitTime) {
+					if (this.timeout != null) {
+						clearTimeout(this.timeout);
+						this.hide();
+						this.timeout = null;
+					}
+					var thisClass = this;
+					this.timeout = setTimeout(function() {
+						thisClass.hide();
+						thisClass.timeout = null;
+					}, waitTime ? waitTime : this.waitTime);
+					$("body").append('<div class="easyalert" id="easyAlert">' + text + '</div>');
+					$("#easyAlert").css({
+						"left": "50%",
+						"margin-top": -($("#easyAlert").outerHeight() / 2),
+						"margin-left": -($("#easyAlert").outerWidth() / 2)
+					}).show();
+				},
+				hide: function() {
+					$("#easyAlert").remove();
+				}
+			}
+			//
+            function showToast (content) {
+              EasyAlert.show(content,"",3000);
+            }
 		</script>		
 		<div class="app-layout-header">
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>

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>

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>

src/jfw/modules/weixin/src/config.json

@@ -8,11 +8,11 @@
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
-    "webdomain": "http://web-jydev-ws.jianyu360.cn",
-    "appid": "wx5b1c6e7cc4dac0e4",
-    "apptoken": "top2015top2015",
-    "appsecret": "b026103ffebd2291b3edb7a269612112",
-    "proxysess": "http://web-jydev-ws.jianyu360.cn/front/sess/%s",
+    "webdomain": "http://web-jydev-xzh.jianyu360.cn",
+    "appid": "wx41a95e706276804d",
+    "apptoken": "topnet2018topnet2018",
+    "appsecret": "1b385c7dd14274c5e0898b9b208580b7",
+    "proxysess": "http://web-jydev-xzh.jianyu360.cn/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
     "tpl_subscribe_push_id": "IY_RWWzMlwDK6hcd6RAzTec6qre8n5r8PNOOUM_hgk0",

src/web/staticres/dataExport/css/conditions.css

@@ -130,13 +130,13 @@ button {
       width: 130px; }
   .conditions-box .line-box {
     width: 1140px;
-    border-bottom: 1px solid #E0E0E0;
+    /*border-bottom: 1px solid #E0E0E0;*/
     padding-bottom: 20px;
     box-sizing: border-box; }
     .conditions-box .line-box.p20 {
       padding: 20px 0; }
     .conditions-box .line-box .left {
-      width: 70px;
+      width: 114px;
       line-height: 36px;
       text-align: right;
       color: #1D1D1D;
@@ -176,8 +176,8 @@ button {
   box-sizing: border-box; }
   .select-area-box > span.select-area {
     cursor: pointer;
-    padding: 0 6px;
-    margin-right: 10px; }
+    padding: 0 6.9px;
+    /*margin-right: 10px;*/}
     .select-area-box > span.select-area.click {
       background: #F5F5FB;
       border: 1px solid #e0e0e0;
@@ -430,10 +430,10 @@ input {
   #inputDel_0 .delete-close {
     float: left;
     height: auto;
-    width: 336px;
+    width: 324px;
     text-align: left;
     line-height: 22px;
-    padding: 11px 25px 11px 15px;
+    padding: 8px 25px 9px 15px;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;

src/web/staticres/js/wxSupersearch.js

@@ -683,7 +683,8 @@ var SuperSearch = {
 			return false;
 		}
 		SuperSearch.reqParam.searchvalue=SuperSearch.s_words;
-		localStorage.keyWord = JSON.stringify([{"keyWord":SuperSearch.s_words}]);
+		//预览数据需要用
+		localStorage.keyWords = JSON.stringify([{"keyWord":SuperSearch.s_words}]);
 		//信息范围
 		var scope = [];
 		$("#supersearchPage .contentone .btn.active").each(function(){
@@ -891,10 +892,10 @@ var SuperSearch = {
 					}else{
 						$("#supersearchPage #hasNoData_tiptext>font:eq(0)").show();
 					}
-					if($("#search_all").hasClass("on")){
-						$("#supersearchPage #allSearchModel").hide();
-					}else{
+					if($(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal')=="searchtitle"){
 						$("#supersearchPage #allSearchModel").show();
+					}else{
+						$("#supersearchPage #allSearchModel").hide();
 					}
 					$("#supersearchPage #list").text("");
 					SuperSearch.hasNoData();

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%;

src/web/staticres/wx_dataExport/js/additionWord.js

@@ -35,13 +35,18 @@ $(function(){
         this.style.height = this.scrollHeight + "px";
     });
 
-    //防止键盘把当前输入框给挡住
-    $('input[type="text"],textarea').focus(function () {
-        var target = this;
-        setTimeout(function(){
-            target.scrollIntoViewIfNeeded();
-        },400);
-    });
+    var u = navigator.userAgent;
+	var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+	var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+	if(isAndroid){
+		//防止键盘把当前输入框给挡住
+	    $('input[type="text"],textarea').focus(function () {
+	        var target = this;
+	        setTimeout(function(){
+	            target.scrollIntoViewIfNeeded();
+	        },400);
+	    });
+	}
 
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
     $('.addkeyWord input.enterOne').on('input', function() {

src/web/staticres/wx_dataExport/js/keyWord.js

@@ -272,16 +272,18 @@ $(function(){
         $(oSpan).val('').focus().val(val);
         $(".addKeyWord").hide();
     });
-    //
-    //防止键盘把当前输入框给挡住
-    $('input[type="text"],textarea').focus(function () {
-        var target = this;
-        setTimeout(function(){
-            target.scrollIntoViewIfNeeded();
-        },400);
-    });
-
-
+    var u = navigator.userAgent;
+	var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+	var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+	if(isAndroid){
+		//防止键盘把当前输入框给挡住
+	    $('input[type="text"],textarea').focus(function () {
+	        var target = this;
+	        setTimeout(function(){
+	            target.scrollIntoViewIfNeeded();
+	        },400);
+	    });
+	}
     // 编辑删除
     $('.showKeyWord').on('click', '.deleteKey', function(e) {
         var jQueryDOM = $(this).parents('li');

src/web/templates/pc/dataExport_sieve.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/font_624651_c3e1rnkx3cn.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/reset_pc.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/conditions.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/dataExport/css/conditions.css?v={{Msg "seo" "version"}}7">
     <script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/My97DatePicker/WdatePicker.js?v={{Msg "seo" "version"}}"></script>
     <script language="javascript" type="text/javascript" src="{{Msg "seo" "cdn"}}/dataExport/js/delbox.js?v={{Msg "seo" "version"}}"></script>
 
@@ -136,7 +136,7 @@
         }
 
         .ss {
-            width: 336px;
+            width: 324px;
         }
     </style>
     <style>
@@ -219,7 +219,7 @@
             font-size: 14px;
             line-height: 30px;
             position: absolute;
-            right: 0;
+            right: 40px;
             top: 0;
             cursor: pointer;
         }
@@ -336,14 +336,14 @@
 		    padding: 14px 0;
 		}
 		.conditions-box .line-box {
-		    width: 1140px;
-		    border-bottom: 1px solid #E0E0E0;
+		    width: 1200px;
+		    /*border-bottom: 1px solid #E0E0E0;*/
 		    padding-bottom: 15px;
 		    box-sizing: border-box;
 		}
 
         .tro{
-            width:1048px;
+            width:1010px;
             height:110px;
             background:rgba(254,254,254,1);
             border:1px dashed rgba(224,224,224,1);
@@ -353,7 +353,7 @@
         }
         .tro img{
             position: relative;
-            left: -500px;
+            left: -480px;
             top: 15px;
         }
         .tro p:nth-of-type(1){
@@ -381,6 +381,45 @@
             margin-top: 8px;
             margin-left: 42px;
         }
+        .heng{
+        	width:1140px;
+			height:1px;
+			background:rgba(224,224,224,1);
+			opacity:1;
+        }
+        .selectType{
+        	padding: 0 15px;
+        }
+        .textAll{
+        	width:102px;
+			height:36px;
+			text-align: center;
+			line-height: 30px;
+			border:1px solid rgba(224,224,224,1);
+			border-radius:4px;
+			font-size:14px;
+			font-family:Microsoft YaHei;
+			font-weight:400;
+			color:rgba(29,29,29,1);
+			opacity:1;
+        }
+        .textTitle{
+        	width:102px;
+			height:36px;
+			text-align: center;
+			line-height: 30px;
+			border:1px solid rgba(224,224,224,1);
+			border-radius:4px;
+			font-size:14px;
+			font-family:Microsoft YaHei;
+			font-weight:400;
+			color:rgba(29,29,29,1);
+			opacity:1;
+        }
+        .select{
+        	border-color: #2CB7CA;
+    		color: #2CB7CA;
+        }
     </style>
 </head>
 <body>
@@ -444,6 +483,7 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
         <!--区域-->
         <div class="line-box float-box">
             <div class="left" style="padding-top: 8px">区域</div>
@@ -479,6 +519,7 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
         <!--行业-->
         <div class="line-box float-box p20">
             <div class="left">行业</div>
@@ -496,6 +537,7 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
         <!--关键词-->
         <div class="line-box float-box p20">
             <div class="left" style="position: relative">
@@ -553,6 +595,22 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
+        <!--
+        	作者：1151584137@qq.com
+        	时间：2019-10-15
+        	描述：关键词匹配方式
+        -->
+        <div class="line-box float-box p20">
+        	<div class="left" style="position: relative">
+                	关键词匹配方式
+            </div>
+            <div class="selectType">
+                <button class="textAll select">按全文匹配</button>
+                <button class="textTitle">按标题匹配</button>
+            </div>
+        </div>
+        <div class="heng"></div>
         <!--金额-->
         <div class="line-box float-box p20">
             <div class="left" style="padding-top: 8px;">金额</div>
@@ -573,6 +631,7 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
         <!--信息类型-->
         <!--信息类型-->
         <div class="line-box float-box p20">
@@ -591,6 +650,7 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
         <!--采购单位-->
         <div class="line-box float-box p20">
             <div class="left">采购单位</div>
@@ -607,6 +667,7 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
         <!--中标单位-->
         <div class="line-box float-box p20">
             <div class="left">中标单位</div>
@@ -623,6 +684,7 @@
                 </div>
             </div>
         </div>
+        <div class="heng"></div>
         <!--确定筛选-->
         <div class="button-box">
             <button class="sussecc" id="sieve">确定</button>
@@ -868,6 +930,22 @@
             $("#minprice").val("");
             $("#maxprice").val("");
         }
+        //
+        if(localStorage.selectType!==""&&localStorage.selectType!==undefined){
+        	var selectType = localStorage.selectType;
+        	var select = '';
+        	if(selectType === "title"){
+        		select = "按标题匹配";
+        	}else if(selectType === "all"){
+        		select = "按全文匹配";
+        	}
+        	$(".selectType button").each(function(){
+        		if($(this).text()===select){
+        			$(".selectType button").removeClass("select");
+        			$(this).addClass("select");
+        		}
+        	});
+        }
 
         //行业
         var industryhtml = '<span class="info-select-now all">全部</span>';
@@ -1351,6 +1429,15 @@
         var subType = getSubType();
         var buyer = getBuyers();
         var winner = getWinners();
+        //关键词匹配方式
+        var select = $(".selectType .select").text();
+        var selectType = '';
+        if(select === "按全文匹配"){
+        	selectType = "all";
+        }else if(select === "按标题匹配"){
+        	selectType = "title";
+        }
+        localStorage.selectType = selectType;
 
         var param = {
             "publishtime": date,
@@ -1359,6 +1446,7 @@
             "region":region.toString() == "全国" ? "" : region.toString(),
             "industry": industry.toString() == "全部" ? "" : industry.toString(),
             "keyword": JSON.stringify(keyword),
+            "selectType":selectType,
             "minprice": price[0],
             "maxprice": price[1],
             "subtype": subType.toString() == "全部" ? "" : subType.toString(),
@@ -1405,6 +1493,9 @@
         $(".add-input-w > div > input").remove();
         $(".add-input-w").hide();
         window["inputDel_0"] = [];
+        //selectType
+        $(".selectType button").removeClass("select");
+        $(".selectType button").eq(0).addClass("select");
         //price
         $("#minprice").val("");
         $("#maxprice").val("");
@@ -1644,6 +1735,11 @@
         }
         openMore = !openMore
     })
+    //关键词匹配方式
+    $(".selectType button").on('click', function(){
+    	$(".selectType button").removeClass("select")
+    	$(this).addClass("select")
+    });
 
 </script>
 </html>

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

@@ -278,7 +278,14 @@
         });
         /* 选择匹配方式*/
         $('input:radio[name="way"]').click(function() {
-            var checkValue = $('input:radio[name="way"]:checked').val();
+        	var checkValue = $('input:radio[name="way"]:checked').val();
+        	$(".read").each(function () {
+                var p = $(this).children().text();
+                if(p!==checkValue){
+                	$(".confirm").hide();
+                	$(".resetOne").show();
+                }
+           	});
             $('.match_way').hide(200);
             $('.match').html(checkValue);
             var selectType = "";
@@ -552,6 +559,7 @@
 	        }else{
 				localStorage.winner = "";
 			}
+			console.log(filter["publishtime"])
 	        //时间
 	        if(filter["publishtime"]!=""){
 				var timeflag = true;
@@ -584,6 +592,8 @@
 				localStorage.date = "";
 	            localStorage.removeItem("export_starttime");
 	            localStorage.removeItem("export_endtime");
+				//localStorage.export_starttime = 0;//1970-01-01
+				//localStorage.export_endtime = Date.parse(new Date())/1000;
 			}
 	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
 				localStorage.selectType = filter["selectType"];
@@ -650,6 +660,8 @@
                 type = "按全文匹配";
             }
             $(".match").text(type);
+            $(".confirm").hide();
+            $(".resetOne").show();
         }
         //信息类型
         if(localStorage.subTypes!==undefined && localStorage.subTypes!==""){
@@ -849,6 +861,7 @@
             localStorage.removeItem("area");
             localStorage.removeItem("industry");
             localStorage.removeItem("keyWord");
+            localStorage.removeItem("selectType");
             localStorage.removeItem("price");
             localStorage.removeItem("subType");
             localStorage.removeItem("subTypes");
@@ -866,6 +879,7 @@
             $("#subType").text("");
             $("#winner").text("");
             $("#buyer").text("");
+            $(".match").text("按标题匹配");
             //
             $(".chooseTime ul li").removeClass('active');
             $(".chooseTime ul li:eq(0)").addClass('active');

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

@@ -221,13 +221,18 @@
                 this.style.height = this.scrollHeight + "px";
             });
 
-            //防止键盘把当前输入框给挡住
-            $('input[type="text"],textarea').focus(function () {
-                var target = this;
-                setTimeout(function(){
-                    target.scrollIntoViewIfNeeded();
-                },400);
-            });
+            var u = navigator.userAgent;
+			var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+			var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+			if(isAndroid){
+				//防止键盘把当前输入框给挡住
+			    $('input[type="text"],textarea').focus(function () {
+			        var target = this;
+			        setTimeout(function(){
+			            target.scrollIntoViewIfNeeded();
+			        },400);
+			    });
+			}
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
             $('.addkeyWord input.enterOne').on('input', function() {

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)"
+										 })
 									 }
 								 }
 							 })

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

@@ -20,10 +20,11 @@
 		color: #2cb7ca;
 	}
 	.addKeyWord {
-		width: 100%;
+		/*width: 100%;*/
 		position: fixed;
 		text-align: center;
 		bottom: 10%;
+		left: 45%;
 	}
 	.keyWord .enter .btn .save-btn {
 		float: right;

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

@@ -234,13 +234,18 @@
                 }
             });
 
-            //防止键盘把当前输入框给挡住
-            $('input[type="text"],textarea').focus(function () {
-                var target = this;
-                setTimeout(function(){
-                    target.scrollIntoViewIfNeeded();
-                },400);
-            });
+            var u = navigator.userAgent;
+			var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+			var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+			if(isAndroid){
+				//防止键盘把当前输入框给挡住
+			    $('input[type="text"],textarea').focus(function () {
+			        var target = this;
+			        setTimeout(function(){
+			            target.scrollIntoViewIfNeeded();
+			        },400);
+			    });
+			}
 
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){

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

@@ -110,13 +110,15 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}82"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}85"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+        //回退刷新
         $(function(){
             var isinitpage = false;
             $(window).bind("pageshow", function(event){
                 if(event.originalEvent.persisted){
+                	//监听到了回退
                     IOSsession();
                     var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
             		buttonDOM.prop("disabled", false);
@@ -128,10 +130,12 @@
                 isinitpage = true;
             }
         });
+        //history.back刷新
         window.addEventListener('pageshow', function(e) {
             // 通过persisted属性判断是否存在 BF Cache
             if (e.persisted) {
                 if (sessionStorage.IOSsession!==""&&sessionStorage.IOSsession!==undefined){
+                    //监听到了history.back
                     location.reload();
                 }
             }

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

@@ -183,7 +183,6 @@
 			}
 			function tab(t){
 				$.post("/front/wx_dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
-					console.log(r.res)
 					if(r.res.data){
 						var res = r.res.data;
 						var aHtml = bz;
@@ -193,7 +192,6 @@
 							aHtml = gj;
 							var a = 0;
 							for(var i in res){
-								console.log(res[i]["title"])
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");

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 () {		

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

@@ -20,10 +20,11 @@
 			color: #2cb7ca;
 		}
 		.addKeyWord {
-			width: 100%;
+			/*width: 100%;*/
 			position: fixed;
 			text-align: center;
 			bottom: 10%;
+			left: 45%;
 		}
 		.keyWord .enter .btn .save-btn {
 			float: right;
@@ -140,13 +141,18 @@
 				}
 			});
 
-			//防止键盘把当前输入框给挡住
-			$('input[type="text"],textarea').focus(function () {
-				var target = this;
-				setTimeout(function(){
-					target.scrollIntoViewIfNeeded();
-				},400);
-			});
+			var u = navigator.userAgent;
+			var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+			var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+			if(isAndroid){
+				//防止键盘把当前输入框给挡住
+			    $('input[type="text"],textarea').focus(function () {
+			        var target = this;
+			        setTimeout(function(){
+			            target.scrollIntoViewIfNeeded();
+			        },400);
+			    });
+			}
 
 			// 添加 按钮的点击事件
 			$('.addkeyWord .btn .save-btn').on('click', function(){

src/web/templates/weixin/wxinfocontent.html

@@ -75,7 +75,7 @@ body{
 	margin:0;
 	color: #333;
 	display: none;
-	padding-bottom: 50px;
+	/*padding-bottom: 50px;*/
 }
 table {
     border-collapse: inherit !important;

src/web/templates/weixin/wxinfocontent_rec.html

@@ -19,7 +19,7 @@ body{
 	margin:0;
 	color: #333;
 	display: none;
-	padding-bottom: 50px;
+	/*padding-bottom: 50px;*/
 }
 table {
     border-collapse: inherit !important;