Merge branch 'release' into dev4.5.4

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_viewPage.html

@@ -360,7 +360,12 @@
 			htmlObj.on("click", function(event){
 				var h = $(this).find("a.bt").attr("s");
 				var eid = $(this).find("a.bt").attr("eid");
-				beforeJump(eid,h);
+				var keywordsDOMArr = $(event.currentTarget).find('.keyword')
+				var keywordsArr = []
+				keywordsDOMArr.each(function(item) {
+					keywordsArr.push($(this).text())
+				})
+				beforeJump(eid,h, 'VIPkey_' + unique(keywordsArr).join('_'));
 			});
 			$('#list').append(htmlObj);
 		}
@@ -379,18 +384,32 @@
 		function tablejump(eid,h){
 			beforeJump(eid,h);
 		}
-		function beforeJump(eid,h){
-			if(sessionStorage){
-				sessionStorage.resultpreviewScrollTop = scrollTop;
-				sessionStorage.resultpreviewPageNumCache = pageNum;
-				sessionStorage.resultpreviewListCache = listCache;
-				sessionStorage.resultpreviewNoMoreCache = noMore;
-				sessionStorage.resultpreviewHasNextData = hasNextPage;
-				sessionStorage.resultpreviewSds = sds;
-				sessionStorage.resultpreviewKeys = keys;
+	function beforeJump(eid,h,sds){
+		if(sessionStorage){
+			sessionStorage.resultpreviewScrollTop = scrollTop;
+			sessionStorage.resultpreviewPageNumCache = pageNum;
+			sessionStorage.resultpreviewListCache = listCache;
+			sessionStorage.resultpreviewNoMoreCache = noMore;
+			sessionStorage.resultpreviewHasNextData = hasNextPage;
+			sessionStorage.resultpreviewSds = sds;
+			sessionStorage.resultpreviewKeys = keys;
+		}
+		newredirect(zbadd,h,eid,sds);
+	}
+	// 数组去重
+	function unique (arr) {
+		if (!Array.isArray(arr)) {
+			console.log('type error!')
+			return
+		}
+		var array = [];
+		for (var i = 0; i < arr.length; i++) {
+			if (array.indexOf(arr[i]) === -1) {
+				array.push(arr[i])
 			}
-			newredirect(zbadd,h,eid,sds);
 		}
+		return array
+	}
 </script>
 <style type="text/css">
 	.restime span.buyerclass{

src/web/templates/weixin/vipsubscribe/vip_viewPage.html

@@ -360,7 +360,12 @@
 			htmlObj.on("click", function(event){
 				var h = $(this).find("a.bt").attr("s");
 				var eid = $(this).find("a.bt").attr("eid");
-				beforeJump(eid,h);
+				var keywordsDOMArr = $(event.currentTarget).find('.keyword')
+				var keywordsArr = []
+				keywordsDOMArr.each(function(item) {
+					keywordsArr.push($(this).text())
+				})
+				beforeJump(eid,h, 'VIPkey_' + unique(keywordsArr).join('_'));
 			});
 			$('#list').append(htmlObj);
 		}
@@ -379,18 +384,32 @@
 		function tablejump(eid,h){
 			beforeJump(eid,h);
 		}
-		function beforeJump(eid,h){
-			if(sessionStorage){
-				sessionStorage.resultpreviewScrollTop = scrollTop;
-				sessionStorage.resultpreviewPageNumCache = pageNum;
-				sessionStorage.resultpreviewListCache = listCache;
-				sessionStorage.resultpreviewNoMoreCache = noMore;
-				sessionStorage.resultpreviewHasNextData = hasNextPage;
-				sessionStorage.resultpreviewSds = sds;
-				sessionStorage.resultpreviewKeys = keys;
+	function beforeJump(eid,h,sds){
+		if(sessionStorage){
+			sessionStorage.resultpreviewScrollTop = scrollTop;
+			sessionStorage.resultpreviewPageNumCache = pageNum;
+			sessionStorage.resultpreviewListCache = listCache;
+			sessionStorage.resultpreviewNoMoreCache = noMore;
+			sessionStorage.resultpreviewHasNextData = hasNextPage;
+			sessionStorage.resultpreviewSds = sds;
+			sessionStorage.resultpreviewKeys = keys;
+		}
+		newredirect(zbadd,h,eid,sds);
+	}
+	// 数组去重
+	function unique (arr) {
+		if (!Array.isArray(arr)) {
+			console.log('type error!')
+			return
+		}
+		var array = [];
+		for (var i = 0; i < arr.length; i++) {
+			if (array.indexOf(arr[i]) === -1) {
+				array.push(arr[i])
 			}
-			newredirect(zbadd,h,eid,sds);
 		}
+		return array
+	}
 </script>
 <style type="text/css">
 	.restime span.buyerclass{