Merge branch 'dev4.6.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.4

src/jfw/modules/app/src/web/templates/followent/set.html

@@ -21,6 +21,7 @@ if(sessionStorage){
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/mobiscroll.min.js"></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/visited.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/js.html"}}
 <script type="text/javascript">
 	var data = {{.T.data}};
@@ -174,30 +175,26 @@ if(sessionStorage){
 	})
 
 function isVisited(sid){
-	var a_visited = {{.T.a_visited}};
-	if (a_visited!=null){
-		for(var i=0;i<a_visited.length;i++){
-			if(a_visited[i] == sid){
-				return true;
-			}
-		}
-	}
-	return false;
+  var a_visited = {{.T.a_visited}};
+  var visited = visitedPath.pathVisited(
+    new VisitedPathItem(
+      '/article/content/*.html',
+      'id=' + sid
+    )
+  )
+	return visited;
 }
 function beforeRedirect(obj,sid,link,isOld){
-	if($(obj).hasClass("visited")){
-		newredirect("",link,sid);
-		return;
-	}
-	var _id = {{.T._id}}
-	$(obj).addClass("visited");
-	if(typeof(sid) != "undefined" && sid != null && sid != "" && typeof(_id) != "undefined" && _id != null && _id != ""){
-		$.post("/jyapp/followent/notice/visited",{id:_id,sid:sid},function(r){
-			newredirect("",link,sid);
-		});
-	}else{
-		newredirect("",link,sid);
-	}
+  $(obj).addClass("visited");
+  try {
+    visitedPath.pathVisiting(
+      new VisitedPathItem(
+        '/article/content/*.html',
+        'id=' + sid
+      )
+    )
+  } catch (error) {}
+  newredirect("",link,sid);
 }
 </script>
 <style>

src/jfw/modules/followent/src/web/templates/weixin/set.html

@@ -47,6 +47,7 @@ if(sessionStorage){
 <script src="/jylab/followent/mobiscroll/mobiscroll.min.js"></script>
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="/jylab/followent/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script src="/common-module/collection/js/visited.js?v={{Msg "seo" "version"}}"></script>
 <script src="/jylab/followent/js/jy.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript">
 	var data = {{.T.data}};
@@ -207,30 +208,26 @@ if(sessionStorage){
 	})
 	
 function isVisited(sid){
-	var a_visited = {{.T.a_visited}};
-  if (a_visited!=null){
-  	for(var i=0;i<a_visited.length;i++){
-  		if(a_visited[i] == sid){
-  			return true;
-  		}
-  	}
-  }
-	return false;
+  var a_visited = {{.T.a_visited}};
+  var visited = visitedPath.pathVisited(
+    new VisitedPathItem(
+      '/article/content/*.html',
+      'id=' + sid
+    )
+  )
+	return visited;
 }
 function beforeRedirect(obj,sid,link,isOld){
-	if($(obj).hasClass("visited")){
-		newredirect("",link,sid);
-		return;
-	}
-	var _id = {{.T._id}}
-	$(obj).addClass("visited");
-	if(typeof(sid) != "undefined" && sid != null && sid != "" && typeof(_id) != "undefined" && _id != null && _id != ""){
-		$.post("/jylab/followent/notice/visited",{id:_id,sid:sid},function(r){
-			newredirect("",link,sid);
-		});
-	}else{
-		newredirect("",link,sid);
-	}
+  $(obj).addClass("visited");
+  try {
+    visitedPath.pathVisiting(
+      new VisitedPathItem(
+        '/article/content/*.html',
+        'id=' + sid
+      )
+    )
+  } catch (error) {}
+  newredirect("",link,sid);
 }
 </script>
 </head>

src/web/staticres/js/pur-busniess-index-pc.js

@@ -177,6 +177,7 @@ var vm = new Vue({
       const data = this.newWordsList
       if (!data) return
       data.splice(this.delIndex, 1)
+      this.subData = data
       this.$emit('updateKey', data)
       this.dialog.delKey = false
     },