xuzhiheng 5 سال پیش
والد
کامیت
4cdf3ff359

+ 2 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -61,6 +61,7 @@
     附加词
 </div>
 <div class="keyWord" style="padding-top: 50px">
+    <section class="content">
     <p class="title">示例:开发(附加词)</p>
 <!-- 添加附加词 -->
 <div class="enter addkeyWord">
@@ -82,6 +83,7 @@
     <div class="problem">
     疑问解答 <i class="iconfont icon-wenhao"></i>
     </div>
+        </section>
     <div class="addKeyWord">
         <i class="iconfont icon-tianjia"></i>
     </div>

+ 2 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html

@@ -53,6 +53,7 @@
         附加词
     </div>
     <div class="keyWord" style="padding-top: 50px;">
+        <section class="content">
         <p class="title">示例:开发(附加词)</p>
     <!-- 添加附加词 -->
     <div class="enter addkeyWord">
@@ -66,6 +67,7 @@
         <div class="problem">
         疑问解答 <i class="iconfont icon-wenhao"></i>
         </div>
+            </section>
 
         <!-- 疑难问题弹窗 -->
         <div class="problemPop">

+ 2 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -65,6 +65,7 @@
 	采购单位
 </div>
 <div class="keyWord" style="padding-top:70px">
+	<section class="content">
 	<div class="enter addkeyWord">
 		<input type="text" class="enterOne" placeholder="采购单位名称" />
 		<div class="btn">
@@ -81,6 +82,7 @@
 		</ul>
 
 	</div>
+		</section>
 </div>
 <div class="addKeyWord">
 	<i class="iconfont icon-tianjia"></i>

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

@@ -9,7 +9,7 @@
     <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"}}3">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}4">
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js"></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"}}" />
@@ -60,6 +60,7 @@
         采购单位
     </div>
     <div class="keyWord" style="padding-top: 70px;">
+        <section class="content">
         <div class="enter addkeyWord">
         <input type="text" class="enterOne" placeholder="采购单位名称" />
         <div class="btn">
@@ -75,10 +76,9 @@
 
         </ul>
 
-        <div class="addKeyWord">
-        <i class="iconfont icon-tianjia"></i>
-        </div>
         </div>
+
+        </section>
         </div>
         <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>

+ 2 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -61,6 +61,7 @@
     排除词
 </div>
 <div class="keyWord" style="padding-top: 50px">
+    <section class="content">
     <p class="title">示例:运维(排除词)</p>
 <!-- 添加附加词 -->
 <div class="enter addkeyWord">
@@ -82,6 +83,7 @@
     <div class="problem">
     疑问解答 <i class="iconfont icon-wenhao"></i>
     </div>
+    </section>
     <div class="addKeyWord">
         <i class="iconfont icon-tianjia"></i>
     </div>

+ 2 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html

@@ -53,6 +53,7 @@
         排除词
     </div>
     <div class="keyWord" style="padding-top: 50px;">
+        <section class="content">
         <p class="title">示例:运维(排除词)</p>
     <!-- 添加附加词 -->
     <div class="enter addkeyWord">
@@ -74,6 +75,7 @@
         <div class="problem">
         疑问解答 <i class="iconfont icon-wenhao"></i>
         </div>
+            </section>
 
         <!-- 疑难问题弹窗 -->
         <div class="problemPop">

+ 8 - 10
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html

@@ -9,7 +9,7 @@
     <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"}}4">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}5">
     <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>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
@@ -54,8 +54,12 @@
         }
     </style>
     <body>
-
+    <div class="app-layout-header">
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+        中标单位
+    </div>
     <div class="keyWord" style="padding-top: 70px;">
+        <section class="content">
         <div class="enter addkeyWord">
         <input type="text" class="enterOne" placeholder="中标单位名称" />
         <div class="btn">
@@ -63,22 +67,16 @@
         <button class="close">取消</button>
     </div>
     </div>
-    <div class="app-layout-header">
-        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-        中标单位
-    </div>
+
     <!-- 添加附加词显示列表 -->
     <div class="showKeyWord">
         <ul>
 
         </ul>
 
-        <div class="addKeyWord">
-        <i class="iconfont icon-tianjia"></i>
-        </div>
 
         </div>
-
+            </section>
         </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>

+ 4 - 3
src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -62,9 +62,10 @@
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}38"></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();
+	window.addEventListener('pageshow', function(e) {
+		// 通过persisted属性判断是否存在 BF Cache
+		if (e.persisted) {
+			location.reload();
 		}
 	});
 	var buyerArr = [];

+ 8 - 0
src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -124,6 +124,14 @@
                 isinitpage = true;
             }
         });
+        window.addEventListener('pageshow', function(e) {
+            // 通过persisted属性判断是否存在 BF Cache
+            if (e.persisted) {
+                if (sessionStorage.IOSsession!==""&&sessionStorage.IOSsession!==undefined){
+                    location.reload();
+                }
+            }
+        });
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
             var keyWord = localStorage.keyWord;

+ 2 - 0
src/web/templates/weixin/dataExport/dataExport_keyWordInput.html

@@ -162,6 +162,7 @@
                         keyWordArr.push(keys[i]);
                         localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
                         window.history.back();
+
                         return
                     }
                 }
@@ -179,6 +180,7 @@
             }
             keyWordArr.push(Obj);
             localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+            sessionStorage.IOSsession = "ios";
             window.history.back();
         });
 

+ 5 - 3
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -58,11 +58,13 @@
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></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();
+		window.addEventListener('pageshow', function(e) {
+			// 通过persisted属性判断是否存在 BF Cache
+			if (e.persisted) {
+				location.reload();
 			}
 		});
+
 		var winnerArr = [];
 		if(localStorage.winner !== "" && localStorage.winner !== undefined){
 			var winner = localStorage.winner.split(",");