xiugai

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

@@ -1,7 +1,16 @@
 html .page {
   background: #F5F4F9;
-  padding-bottom: .94rem;
-    font-size: .24rem;
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  font-size: .24rem;
+}
+html .page .main{
+  flex: 1;
+  overflow-y: scroll;
 }
 html .page .progress {
   display: -webkit-box;
@@ -174,8 +183,6 @@ html .page .elseChoose .elseChooseList ul li a i {
   background: #2cb7ca;
   font-size: .36rem;
   color: #fff;
-  position: fixed;
-  bottom: 0;
 }
 .timeSelect{
 	color:#24C0D7 !important;

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

@@ -8,7 +8,7 @@
     <title>数据导出</title>
     <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/dataExport.css?v={{Msg "seo" "version"}}6">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}7">
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
@@ -140,9 +140,6 @@
         color: #444444;
     }
     .resetOne {
-        position: fixed;
-        left: 0;
-        bottom: 0;
         width: 100%;
         border-top: 1px solid #F4F4F9;
         display: none;
@@ -166,6 +163,7 @@
         数据导出
     </div>
     <div class="page" style="padding-top:60px">
+        <div class='main'>
         <div class="progress">
         	<div class="p-item">
         		<p class="p-item-icon" style="background: #2cb7ca;">
@@ -257,7 +255,7 @@
            </div> 
 
         <!-- elseChooseEnd -->
-
+    </div>
         <!-- btn -->
         <div class="confirm">
             <button class="saveData">确认</button>

src/web/staticres/wx_dataExport/css/dataExport.css

@@ -1,35 +1,44 @@
 html .page {
   background: #F5F4F9;
-  padding-bottom: .94rem;
-    font-size: .24rem;
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  font-size: .24rem;
+}
+html .page .main{
+  flex: 1;
+  overflow-y: scroll;
 }
 html .page .progress {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
   -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
   -ms-flex-pack: distribute;
-      justify-content: space-around;
+  justify-content: space-around;
   padding: .28rem 0;
   background: #fff;
   border-bottom: 1px solid #e0e0e0;
 }
 html .page .progress .p-item {
   -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  -ms-flex: 1;
+  flex: 1;
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
   -webkit-box-orient: vertical;
   -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
   -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
   position: relative;
 }
 html .page .progress .p-item .line {
@@ -70,8 +79,8 @@ html .page .chooseTime ul {
   display: flex;
   padding: 0 .32rem;
   -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
 }
 html .page .chooseTime ul li {
   width: 1.64rem;
@@ -98,18 +107,18 @@ html .page .chooseTime .dateMake {
   display: -ms-flexbox;
   display: flex;
   -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
   -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
   height: 1.08rem;
   line-height: 1.08rem;
   background: #fff;
   margin-top: .16rem;
   padding: 0 .3rem;
   color: #888888;
-	position:relative;
+  position:relative;
 }
 html .page .chooseTime .dateMake span {
   display: inline-block;
@@ -174,25 +183,23 @@ html .page .elseChoose .elseChooseList ul li a i {
   background: #2cb7ca;
   font-size: .36rem;
   color: #fff;
-  position: fixed;
-  bottom: 0;
 }
 .timeSelect{
-	color:#24C0D7 !important;
-/*    text-align:right !important;*/
-    border:1px solid #24C0D7 !important;
+  color:#24C0D7 !important;
+  /*    text-align:right !important;*/
+  border:1px solid #24C0D7 !important;
 }
 .easyalert{
-	position: fixed;
-	background-color: rgba(0,0,0,0.5);
-	top: 50%;
-	color: #fff;
-	z-index: 999;
-	border-radius: 6px;
-	padding: 0.4rem 0.5rem;
-    font-size: .28rem;
-/*	line-height: 22px;*/
-/*	max-width: 260px;*/
-	text-align: center;
-	display: none;
+  position: fixed;
+  background-color: rgba(0,0,0,0.5);
+  top: 50%;
+  color: #fff;
+  z-index: 999;
+  border-radius: 6px;
+  padding: 0.4rem 0.5rem;
+  font-size: .28rem;
+  /*	line-height: 22px;*/
+  /*	max-width: 260px;*/
+  text-align: center;
+  display: none;
 }

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

@@ -9,7 +9,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/dataExport.css?v={{Msg "seo" "version"}}8">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}9">
     <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>
@@ -92,9 +92,6 @@
 		color: #999;
 	}
     .resetOne {
-        position: fixed;
-        left: 0;
-        bottom: 0;
         width: 100%;
         border-top: 1px solid #F4F4F9;
         display: none;
@@ -114,6 +111,7 @@
 </style>
 <body>
     <div class="page">
+        <div class="main">
         <div class="progress">
         	<div class="p-item">
         		<p class="p-item-icon" style="background: #2cb7ca;">
@@ -202,8 +200,8 @@
                         </li>
                    </ul>
                </div>
-           </div> 
-
+           </div>
+        </div>
         <!-- elseChooseEnd -->
 
         <!-- btn -->

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

@@ -113,11 +113,8 @@
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}70"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
-        $(window).bind("pageshow", function(event){
-            if(event.originalEvent.persisted){
-                window.location.reload();
-            }
-        });
+        location.href=document.referrer;
+        alert("666666");
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
             var keyWord = localStorage.keyWord;