Merge branch 'dev/v4.8.53.1_cyl' of qmx/jy into hotfix/v4.8.53.1

src/web/staticres/js/biddingSearch.js

@@ -432,9 +432,10 @@ function toPaydataExport(){
     // if(ipt.length != 0) {
     //   $('#zbSeatchT input[name="selectIds"]').attr('name', '')
     // }
-    $('#zbSeatchT').attr('target', "_parent")
-    $("#zbSeatchT").attr("action","/front/dataExport/superSearchExport").append(tmpInput);
-		$("#zbSeatchT").removeAttr("onsubmit");
+	var params = $("#zbSeatchT").serialize();
+	var $form = jsCreateFrom(params)
+    $form.attr('target', "_parent")
+    $form.attr("action","/front/dataExport/superSearchExport").append(tmpInput);
     if (goTemplateData.inIframe) {
       window.$BRACE.methods.open({
         route: {
@@ -443,6 +444,42 @@ function toPaydataExport(){
         }
       })
     }
-		$("#zbSeatchT").submit();
+	$form.submit();
 	}
 }
+
+// a=1111&b=2222&c=333
+function jsCreateFrom (formData) {
+	// 解析字符串为参数对象
+	var params = {};
+	formData.split('&').forEach(function(pair) {
+		var parts = pair.split('=');
+		var key = decodeURIComponent(parts[0]);
+		var value = decodeURIComponent(parts[1]);
+		params[key] = value;
+	});
+
+	// 创建一个隐藏的表单元素
+	var form = $('<form>').hide();
+
+	// 设置表单的属性和数值
+	form.attr('method', 'POST');
+	// form.attr('action', '目标URL');
+
+	// 添加参数和数值的输入元素
+	$.each(params, function(key, value) {
+		var input = $('<input>').attr({
+			type: 'hidden',
+			name: key,
+			value: value
+		});
+		form.append(input);
+	});
+
+	// 将表单添加到页面中
+	$('body').append(form);
+
+	// 提交表单
+	// form.submit();
+	return form
+}

src/web/templates/pc/supsearch.html

@@ -2819,27 +2819,28 @@ function checkTagDisabled () {
     if (getParam('resource') === 'BI') {
       aHref += aHref.indexOf('?') > -1 ? '&resource=BI' : '?resource=BI'
     }
-    if(loginflag){
-      try {
-        visitedPath.pathVisiting(
-          new VisitedPathItem(
-            '/article/content/*.html',
-            'id=' + thisId
-          )
-        )
-      } catch (error) {}
 
+    try {
+      visitedPath.pathVisiting(
+        new VisitedPathItem(
+          loginflag ? '/article/content/*.html' : '/nologin/content/*.html',
+          'id=' + thisId
+        )
+      )
+    } catch (error) {}
+    if(loginflag){
       checkVisited()
-      window.open("/article/content/"+thisId+aHref);
+      aHref += aHref.indexOf('?') > -1 ? '&aside=0' : '?aside=0'
+      var targetLink = '/article/content/' + thisId + aHref
+      // 在iframe里，往工作桌面跳转。不在iframe里，正常跳转
+      if(goTemplateData.inIframe){
+        var workspaceTargetLink = location.origin + targetLink
+        var wordspcePage = '/page_workDesktop/work-bench/page?link=' + encodeURIComponent(workspaceTargetLink)
+        window.open(wordspcePage)
+      } else {
+        window.open(targetLink)
+      }
     }else{//没有登录跳转新的详情
-      try {
-        visitedPath.pathVisiting(
-          new VisitedPathItem(
-            '/nologin/content/*.html',
-            'id=' + thisId
-          )
-        )
-      } catch (error) {}
       checkVisited('nologin')
       // 渠道合作页,未登录跳转需要弹出登录，重置到已登录后的详情页
       if(cooperateCode) {