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

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

@@ -186,15 +186,15 @@
 				})
 			})
 			//
+			if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+				var keyWordArr = JSON.parse(localStorage.keyWord);
+				for(var i in keyWordArr){
+					keys.push(keyWordArr[i].keyWord);
+				}
+			}
 			function tab(t){
 				$.post("/jyapp/front/dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
 					console.log(r.res)
-					if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
-						var keyWordArr = JSON.parse(localStorage.keyWord);
-						for(var i in keyWordArr){
-							keys.push(keyWordArr[i].keyWord);
-						}
-					}
 					if(r.res.data){
 						var res = r.res.data;
 						var aHtml = bz;
@@ -209,6 +209,7 @@
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -232,8 +233,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>';
+											break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -262,12 +263,19 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										console.log(res[i]["detail"])
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++
+										}
+										if(keys.length===b){
 											a++;
+											b = 0;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
 													+'<td>'+res[i]["detail"]+'</td>'
@@ -289,9 +297,8 @@
 													+'<td>'+res[i]["projectscope"]+'</td>'
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
-													+'</tr>';
+													+'</tr>';	
 										}
-										break
 									}
 								}
 							}
@@ -305,6 +312,7 @@
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -320,8 +328,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
+										    break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -342,10 +350,17 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++;
+										}
+										if(keys.length===b){
+											b = 0;
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -362,7 +377,6 @@
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
 										}
-										break
 									}
 								}
 							}

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

@@ -89,6 +89,12 @@
     <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.addEventListener('pageshow', function(e) {
+            // 通过persisted属性判断是否存在 BF Cache
+            if (e.persisted) {
+                location.reload();
+            }
+        });
         var keyWordArr = [];
         var keyWordsArr = [];
         var appendedArr = [];

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

@@ -89,6 +89,12 @@
     <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.addEventListener('pageshow', function(e) {
+            // 通过persisted属性判断是否存在 BF Cache
+            if (e.persisted) {
+                location.reload();
+            }
+        });
         var keyWordArr = [];
         var keyWordsArr = [];
         var excludeArr = [];

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

@@ -118,6 +118,8 @@
             $(window).bind("pageshow", function(event){
                 if(event.originalEvent.persisted){
                     IOSsession();
+                    $(".appended").prop("disabled", true)
+                    $(".exclued").prop("disabled", true)
                 }
             });
             if(!isinitpage) {

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

@@ -175,14 +175,15 @@
 				$(".buttons-tab .tab-link").eq((parseInt({{.T.dataType}})-parseInt(1))).addClass("active").siblings().removeClass("active");
 			})
 			//
+			if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+				var keyWordArr = JSON.parse(localStorage.keyWord);
+				for(var i in keyWordArr){
+					keys.push(keyWordArr[i].keyWord);
+				}
+			}
 			function tab(t){
 				$.post("/front/wx_dataExport/getPreview",{dataType:t,_id:{{.T.id}}},function(r){
-					if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
-						var keyWordArr = JSON.parse(localStorage.keyWord);
-						for(var i in keyWordArr){
-							keys.push(keyWordArr[i].keyWord);
-						}
-					}
+					console.log(r.res)
 					if(r.res.data){
 						var res = r.res.data;
 						var aHtml = bz;
@@ -192,11 +193,13 @@
 							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");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -220,8 +223,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>';
+											break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -250,11 +253,18 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++
+										}
+										if(keys.length===b){
 											a++;
+											b = 0;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
 													+'<td>'+res[i]["detail"]+'</td>'
@@ -276,9 +286,8 @@
 													+'<td>'+res[i]["projectscope"]+'</td>'
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
-													+'</tr>';
+													+'</tr>';	
 										}
-										break
 									}
 								}
 							}
@@ -292,6 +301,7 @@
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
 										if(index !== -1){
+											console.log(res[i]["title"])
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -307,8 +317,8 @@
 													+'<td>'+res[i]["currency"]+'</td>'
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
+										    break
 										}
-										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -329,10 +339,17 @@
 							}
 							for(var i in res){
 								if(localStorage.keyWord!==""&&localStorage.keyWord!==undefined){
+									var b = 0;
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										if(index === -1){
+										if(index !== -1){
+											break
+										}else{
+											b++;
+										}
+										if(keys.length===b){
+											b = 0;
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
 													+'<td>'+res[i]["title"]+'</td>'
@@ -349,7 +366,6 @@
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
 										}
-										break
 									}
 								}
 							}