活动卡片新建窗口打开

src/Activity/components/ActivityCard.tsx

@@ -84,10 +84,14 @@ const ActivityCard: React.FC<IActivityCard> = props => {
       return
     }
     if (item?.YidongActivityUrl) {
-      window.open(item.YidongActivityUrl, '_blank')
+      window.open(item.YidongActivityUrl)
       return
     }
-    history.push(`/activity/detail/${(item as IActivityTypeListItem)?.ActivityId || (item as INewestItem)?.SourceId}`)
+    window.open(
+      `${window.location.origin}/activity/detail/${
+        (item as IActivityTypeListItem)?.ActivityId || (item as INewestItem)?.SourceId
+      }`
+    )
   }
   const handleOpenAudio = (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
     e.stopPropagation()

src/Activity/components/ActivitySpecialCard.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { useHistory } from 'react-router-dom'
 
 import { Tooltip } from 'antd'
 import { InfoCircleOutlined } from '@ant-design/icons'
@@ -44,10 +43,9 @@ const ActivitySpecialCard: React.FC<IActivitySpecialCard> = props => {
     btnGrous,
     onChangeSomething
   } = props
-  const history = useHistory()
 
   const handleToDetail = (ID: number) => {
-    history.push(`/activity/info/${ID}`)
+    window.open(`${window.location.origin}/activity/info/${ID}`)
   }
   const stateString = [
     { state: IStateStringType.Waitting, name: '未开始', className: 'waitting-div' },

src/Community/components/ResearchActivity.tsx

@@ -66,10 +66,10 @@ const ResearchActivity: React.FC = () => {
       return
     }
     if (item?.YidongActivityUrl) {
-      window.open(item.YidongActivityUrl, '_blank')
+      window.open(item.YidongActivityUrl)
       return
     }
-    history.push(`/activity/detail/${(item as IActivityTypeListItem).ActivityId}`)
+    window.open(`${window.location.origin}/activity/detail/${(item as IActivityTypeListItem).ActivityId}`)
   }
   // 筛选进行中/已结束
   const handleSelectState = (state: IStateStringType) => {