|
@@ -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) {
|