Merge branch 'mfyx_2.1' into mfyx_3.0

src/Activity/Activity.service.ts

@@ -292,11 +292,11 @@ export const ActivityService = {
       method: 'get',
       params: params
     }),
-  getActivityTypeDetail: (ActivityId: number): INewResponse<IActivityTypeDetailRes> =>
+  getActivityTypeDetail: (ActivityId: number, InviteShareCode?: string): INewResponse<IActivityTypeDetailRes> =>
     NewAxiosInstanceFunc({
       url: `/activity/detail`,
       method: 'get',
-      params: { ActivityId }
+      params: { ActivityId, InviteShareCode }
     }),
   getActivitySpecialList: (params: IActivityTypeParams): INewResponse<IActivitySpecialListRes> =>
     NewAxiosInstanceFunc({

src/Activity/ActivitySpecialInfo.tsx

@@ -83,7 +83,7 @@ const ActivitySpecialInfo: React.FC<IActivitySpecialInfo> = props => {
   // 登录报名
   const handleToShowMore = () => {
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname}`)
+      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
       return
     }
   }

src/Activity/ActivityTypeDetail.tsx

@@ -30,7 +30,8 @@ const ActivityTypeDetail: React.FC<IActivityTypeDetail> = props => {
   const history = useHistory()
 
   useEffect(() => {
-    activityID && run(activityID)
+    const code = sessionStorage.getItem('invite_code') || login2p.inviteCode
+    activityID && run(activityID, code || undefined)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [activityID])
 
@@ -54,7 +55,7 @@ const ActivityTypeDetail: React.FC<IActivityTypeDetail> = props => {
   const handleToVideoPage = () => {
     if (!data?.Detail.VideoDetail) return
     const url = `${window.location.origin}/activity/video/${data?.Detail.VideoDetail.Id}`
-    window.open(url, '_blank')
+    window.open(url)
   }
   // 易董活动跳转地址
   const handleToOtherPage = () => {
@@ -68,14 +69,14 @@ const ActivityTypeDetail: React.FC<IActivityTypeDetail> = props => {
   const handleArticleLink = () => {
     if (data?.Detail?.ArticleList.length === 1) {
       const url = `${window.location.origin}/material/info/${data?.Detail?.ArticleList[0]?.ArticleId}`
-      window.open(url, '_blank')
+      window.open(url)
     } else {
       setVisibleLink(true)
     }
   }
   const handleClickLink = (item: IArticleListItem) => {
     const url = `${window.location.origin}/material/info/${item.ArticleId}`
-    window.open(url, '_blank')
+    window.open(url)
   }
   // 关闭多篇报告的打开
   const handleToClose = () => {
@@ -84,7 +85,11 @@ const ActivityTypeDetail: React.FC<IActivityTypeDetail> = props => {
 
   const handleToIndepthPage = (item: IListndustrialItem) => {
     if (!item.IsJump) return
-    history.push(`/indepth/info/${item.ChartPermissionId}/${item.IndustrialManagementId}`)
+    history.push(
+      `/indepth/info/${item.ChartPermissionId}/${item.IndustrialManagementId}${
+        login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''
+      }`
+    )
   }
   const formatLinkText = (url: string) => {
     return url.indexOf('http') >= 0 ? (
@@ -98,7 +103,7 @@ const ActivityTypeDetail: React.FC<IActivityTypeDetail> = props => {
   // 登录报名
   const handleToShowMore = () => {
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname}`)
+      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
       return
     }
   }

src/Activity/components/ActivityBtn.component.tsx

@@ -234,7 +234,7 @@ const ActivityBtnComponent: React.FC<IActivityBtnComponent> = props => {
   const { run: getYidongUrl } = useRequest(ActivityService.getYidongActivityDetail, {
     manual: true,
     onSuccess: res => {
-      res.data.Data?.YidongActivityUrl && window.open(res.data.Data?.YidongActivityUrl, '_blank')
+      res.data.Data?.YidongActivityUrl && window.open(res.data.Data?.YidongActivityUrl)
     }
   })
   // 提交申请权限
@@ -386,7 +386,7 @@ const ActivityBtnComponent: React.FC<IActivityBtnComponent> = props => {
     e.stopPropagation()
     // 检查是否登录了，未登录进入登录页面
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${location.pathname}`)
+      history.push(`/login2p?next=${location.pathname + location.search}`)
       return
     }
 
@@ -413,7 +413,7 @@ const ActivityBtnComponent: React.FC<IActivityBtnComponent> = props => {
     } = {
       // 查看详情
       [IActivityBtnType.Detail]: () => {
-        item?.YidongActivityUrl && window.open((item as IActivityTypeListItem)?.YidongActivityUrl, '_blank')
+        item?.YidongActivityUrl && window.open((item as IActivityTypeListItem)?.YidongActivityUrl)
       },
       // 预约纪要
       [IActivityBtnType.Appointment]: () =>

src/Activity/components/ActivityCard.tsx

@@ -60,7 +60,7 @@ const ActivityCard: React.FC<IActivityCard> = props => {
   const { run: getYidongUrl } = useRequest(ActivityService.getYidongActivityDetail, {
     manual: true,
     onSuccess: res => {
-      res.data.Data?.YidongActivityUrl && window.open(res.data.Data?.YidongActivityUrl, '_blank')
+      res.data.Data?.YidongActivityUrl && window.open(res.data.Data?.YidongActivityUrl)
     }
   })
   const handleToDetail = (item: IActivityTypeListItem | IActivitySpecialListItem | INewestItem | IMyActivityItem) => {
@@ -93,7 +93,7 @@ const ActivityCard: React.FC<IActivityCard> = props => {
     e.stopPropagation()
     // 检查是否登录了，未登录进入登录页面
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${location.pathname}`)
+      history.push(`/login2p?next=${location.pathname + location.search}`)
       return
     }
     onOpenVideoOrAudio && onOpenVideoOrAudio(item)

src/Activity/components/ActivityReplay.tsx

@@ -16,6 +16,7 @@ import {
 import AudioFix from './AudioFix'
 import { INewestItem } from 'Newest/Newest.service'
 import { IMyActivityItem } from 'Personal/Personal.service'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from '../css/ActivityReplay.module.scss'
 
 export interface IActivityReplay {
@@ -26,6 +27,7 @@ export interface IActivityReplay {
 const ActivityReplay: React.FC<IActivityReplay> = ({ replayItem, resetReplay }) => {
   // const { actType, filterItem } = props
   const history = useHistory()
+  const login2p = useLogin2p()
   const [audioVisible, setAudioVisible] = useState<boolean>(false)
   const [audioItem, setAudioItem] = useState<IAudioDetail>()
   useEffect(() => {
@@ -39,7 +41,7 @@ const ActivityReplay: React.FC<IActivityReplay> = ({ replayItem, resetReplay })
     formatResult: response => response.data?.Data?.List
   })
   const handleToReplayList = () => {
-    history.push('/activity/playback/0')
+    history.push(`/activity/playback/0${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
   }
   const handleCloseAudio = () => {
     setAudioVisible(false)
@@ -68,7 +70,7 @@ const ActivityReplay: React.FC<IActivityReplay> = ({ replayItem, resetReplay })
     }
     if (!item.VideoDetail) return
     const url = `${window.location.origin}/activity/video/${item.VideoDetail.Id}`
-    window.open(url, '_blank')
+    window.open(url)
   }
   return (
     <Spin spinning={activityReplayListLoading}>

src/Collections/MeetCream.tsx

@@ -9,6 +9,7 @@ import ValidateEmpty from 'components/ValidateEmpty'
 import NoPermission, { INewPermissionType, ITryType } from 'Material/components/NoPermission'
 import { CollectionsService, IMorningMeetingDetailRes, IMorningMeetingList } from './Collections.service'
 import { IMeetingreviewchaptItem } from 'Newest/Newest.service'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from './css/ResearchSummary.module.scss'
 
 enum IMenuKey {
@@ -24,6 +25,7 @@ type IMeetCreamProps = {
 const MeetCream: React.FC<IMeetCreamProps> = props => {
   const { meetID } = props
   const history = useHistory()
+  const login2p = useLogin2p()
 
   const [meetKey, setMeetKey] = useState<IMenuKey>(IMenuKey.ThisWeek)
   const [dataDetail, setDataDetail] = useState<IMorningMeetingDetailRes>()
@@ -58,14 +60,14 @@ const MeetCream: React.FC<IMeetCreamProps> = props => {
 
   // 会议选择
   const handleClickArticle = (item: IMorningMeetingList) => {
-    history.push(`/meeting/${item.Id}`)
+    history.push(`/meeting/${item.Id}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
   }
   const handleToIndepth = (item: IMeetingreviewchaptItem) => {
     const url = `${window.location.origin}/indepth/info/${item.ChartPermissionId}/${item.IndustryId}`
-    window.open(url, '_blank')
+    window.open(url)
   }
   const handleToLinkPage = (item: IMeetingreviewchaptItem) => {
-    item.ReportLink && window.open(item.ReportLink, '_blank')
+    item.ReportLink && window.open(item.ReportLink)
   }
   return (
     <div className={styles['researchsummary-page']}>

src/Collections/RecentInfo.tsx

@@ -108,18 +108,18 @@ const RecentInfo: React.FC<IRecentInfoProps> = props => {
   }
   // 跳转其他页面
   const handleToOther = (url?: string) => {
-    url && window.open(url, '_blank')
+    url && window.open(url)
   }
   // 跳转报告详情
   const handleToArticle = (ID?: number) => {
     const url = `${window.location.origin}/material/info/${ID}`
-    ID && window.open(url, '_blank')
+    ID && window.open(url)
   }
   // 跳转产业详情
   const handleToIndepth = (ChartPermissionId: number, list: ISympleIndustry[]) => {
     if (list.length === 1) {
       const url = `${window.location.origin}/indepth/info/${ChartPermissionId}/${list[0].IndustrialManagementId}`
-      window.open(url, '_blank')
+      window.open(url)
     }
     // todo 如有多个需打开弹框
   }

src/Collections/ResearchSummary.tsx

@@ -13,6 +13,7 @@ import { WebEditError } from 'components/Empty'
 import AudioControler from 'Activity/components/AudioControler'
 import { IAudioDetail } from 'Activity/Activity.service'
 import useTimeCount from 'Material/hooks/useTimeCount'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from './css/ResearchSummary.module.scss'
 
 enum IMenuKey {
@@ -34,6 +35,7 @@ const MenuList = [
 const ResearchSummary: React.FC<IResearchSummaryProps> = props => {
   const { menuID, ArticleID } = props
   const history = useHistory()
+  const login2p = useLogin2p()
 
   const [menuKey, setMenuKey] = useState<IMenuKey>(IMenuKey.ThisWeek)
   const [articleKey, setArticleKey] = useState<number>()
@@ -97,16 +99,18 @@ const ResearchSummary: React.FC<IResearchSummaryProps> = props => {
   const handleChangeSecondMenu = (key: string | number) => {
     setMenuKey(key as IMenuKey)
     setAudioDetail(undefined)
-    history.push(`/summary/${key}`)
+    history.push(`/summary/${key}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
   }
   // 文章选择
   const handleClickArticle = (item: IWeeklyList) => {
     setAudioDetail(undefined)
-    history.push(`/summary/${menuKey}/${item.ArticleId}`)
+    history.push(
+      `/summary/${menuKey}/${item.ArticleId}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`
+    )
   }
   const handleToArticle = (ID?: string) => {
     const url = `${window.location.origin}/material/info/${ID}`
-    ID && window.open(url, '_blank')
+    ID && window.open(url)
   }
   return (
     <div className={styles['researchsummary-page']}>

src/Column/ColumnIndex.tsx

@@ -215,10 +215,10 @@ const ColumnIndex: React.FC<IColumnIndexProps> = props => {
   const handleSetActColumn = (item: IColumnAuthorList) => {
     if (item.Id === actColumnAuthorID) {
       setActColumnAuthorID(undefined)
-      history.push(`/column`)
+      history.push(`/column${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
     } else {
       setActColumnAuthorID(item.Id)
-      history.push(`/column/view/${item.Id}`)
+      history.push(`/column/view/${item.Id}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
     }
   }
   const handleChangeCollection = (id: number) => {
@@ -234,7 +234,7 @@ const ColumnIndex: React.FC<IColumnIndexProps> = props => {
   const handleOnFollowColumn = () => {
     // 检查是否登录了，未登录进入登录页面
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${location.pathname}`)
+      history.push(`/login2p?next=${location.pathname + location.search}`)
       return
     }
     postColumnFollow(props.columnId, columnInfo?.IsFollow ? 2 : 1)

src/Column/components/ColumnContent.tsx

@@ -82,7 +82,7 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
   const handleOnFollowColumn = () => {
     // 检查是否登录了，未登录进入登录页面
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname}`)
+      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
       return
     }
     postColumnFollow(detail.SpecialColumnId, (detail as IColumnDetail)?.IsFollowAuthor ? 2 : 1)
@@ -109,20 +109,24 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
   }
   // 查看全文
   const handleToDetail = () => {
-    window.open(`/column/detail/${detail.Id}`, '_blank')
+    window.open(`/column/detail/${detail.Id}`)
   }
   // 跳转到专栏详情页
   const handleToColumnIndex = () => {
     if (type === 'preview') return
-    history.push(`/column/view/${(detail as IColumnDetail)?.SpecialColumnId}`)
+    history.push(
+      `/column/view/${(detail as IColumnDetail)?.SpecialColumnId}${
+        login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''
+      }`
+    )
   }
   // 预览文件
   const handlePreviewFile = (file: IDocsList) => {
     if (file.DocSuffix === 'pdf') {
-      window.open(file.DocUrl, '_blank')
+      window.open(file.DocUrl)
       return
     }
-    window.open('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(file.DocUrl), ' blank')
+    window.open('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(file.DocUrl))
   }
 
   const computeFileSvgShow = (name: string, type: 'suffix' | 'svg') => {
@@ -181,7 +185,7 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
   // 查看更多
   const handleToShowMore = () => {
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname}`)
+      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
       return
     }
   }

src/Column/components/ColumnInfoEdit.tsx

@@ -56,7 +56,6 @@ const ColumnInfoEdit: React.FC<IColumnInfoEditProps> = props => {
     setAddLabelValue('')
   }
   const handleChangeSometthing = (key: string, e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
-    console.log(e.target.value.replace(/\s/g, ''))
     const newInfo = { ...editInfo, [key]: e.target.value.replace(/\s/g, '') }
     setEditInfo(newInfo as IColumnInfo)
   }

src/Community/AuthorInfo.tsx

@@ -8,6 +8,7 @@ import { default as PeopleSvg } from 'assets/people.svg'
 import { CommunityService, IListIndustrialList } from './Community.service'
 import SmallComponent from 'Indepth/components/Small.component'
 import ArticleCard from 'Indepth/components/ArticleCard'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from './css/AuthorInfo.module.scss'
 
 type IAuthorInfoProps = {
@@ -17,6 +18,7 @@ type IAuthorInfoProps = {
 const AuthorInfo: React.FC<IAuthorInfoProps> = props => {
   const { authorID } = props
   const history = useHistory()
+  const login2p = useLogin2p()
 
   const [actAuthorID, setActAuthorID] = useState<number>() // 选中的作者ID
   const [actSmTab, setActSmTab] = useState<number>(2)
@@ -72,7 +74,7 @@ const AuthorInfo: React.FC<IAuthorInfoProps> = props => {
   // 作者的点击
   const handleSelectAuthor = (ID: number) => {
     setActAuthorID(ID)
-    history.push(`/community/author/${ID}`)
+    history.push(`/community/author/${ID}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
     window.scrollTo(0, 0)
   }
 
@@ -81,7 +83,9 @@ const AuthorInfo: React.FC<IAuthorInfoProps> = props => {
     getKOLList(9999, 1, key)
   }
   const handleToOther = (item: IListIndustrialList) => {
-    history.push(`/community/theme/${item.IndustrialManagementId}`)
+    history.push(
+      `/community/theme/${item.IndustrialManagementId}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`
+    )
   }
 
   return (

src/Community/ThemeInfo.tsx

@@ -8,6 +8,7 @@ import { IndepthService } from 'Indepth/Indepth.service'
 import { CommunityService } from './Community.service'
 import SmallComponent from 'Indepth/components/Small.component'
 import ArticleCard from 'Indepth/components/ArticleCard'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from './css/ThemeInfo.module.scss'
 
 type IThemeInfoProps = {
@@ -17,6 +18,7 @@ type IThemeInfoProps = {
 const ThemeInfo: React.FC<IThemeInfoProps> = props => {
   const { themeID } = props
   const history = useHistory()
+  const login2p = useLogin2p()
 
   const [actThemeID, setActThemeID] = useState<number>() // 选中的主题ID
   const [actSmTab, setActSmTab] = useState<number>(2)
@@ -70,7 +72,7 @@ const ThemeInfo: React.FC<IThemeInfoProps> = props => {
   // 主题的点击
   const handleSelectIndustrialManagementId = (ID: number) => {
     setActThemeID(ID)
-    history.push(`/community/theme/${ID}`)
+    history.push(`/community/theme/${ID}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
     window.scrollTo(0, 0)
   }
 

src/Community/components/ResearchActivity.tsx

@@ -38,7 +38,7 @@ const ResearchActivity: React.FC = () => {
   const { run: getYidongUrl } = useRequest(ActivityService.getYidongActivityDetail, {
     manual: true,
     onSuccess: res => {
-      res.data.Data?.YidongActivityUrl && window.open(res.data.Data?.YidongActivityUrl, '_blank')
+      res.data.Data?.YidongActivityUrl && window.open(res.data.Data?.YidongActivityUrl)
     }
   })
   useEffect(() => {

src/Indepth/IndepthVideo.tsx

@@ -79,11 +79,11 @@ const IndepthVideo: React.FC<IIndepthVideoProps> = props => {
     const url = urlFn[item.Resource]
 
     if (!url) return
-    window.open(url, '_blank')
+    window.open(url)
   }
   const handleToLinkPage = (item: ITimelineItem) => {
     const url = `${window.location.origin}/material/info/${item.LinkArticleId}`
-    !!item.LinkArticleId && window.open(url, '_blank')
+    !!item.LinkArticleId && window.open(url)
   }
   // 关闭音频
   const handleCloseAudio = () => {

src/Indepth/components/ArticleCard.tsx

@@ -16,6 +16,7 @@ import { ColumnService } from 'Column/Column.service'
 import { IHomeArticleListItem, MaterialService } from 'Material/Material.service'
 import { IMyCollectionItem } from 'Personal/Personal.service'
 import classNames from 'classnames'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from '../css/ArticleCard.module.scss'
 
 interface IArticleCardProps {
@@ -48,6 +49,7 @@ const ArticleCard: React.FC<IArticleCardProps> = props => {
     onCollect
   } = props
   const history = useHistory()
+  const login2p = useLogin2p()
 
   // 收藏/取消收藏（报告）
   const { run: applyCollect } = useRequest(MaterialService.postActicleCollect, {
@@ -68,10 +70,12 @@ const ArticleCard: React.FC<IArticleCardProps> = props => {
 
   const handleToOther = (ID: number, ChartPermissionId: number) => {
     if (jumpType === 'industry') {
-      history.push(`/indepth/info/${ChartPermissionId}/${ID}`)
+      history.push(
+        `/indepth/info/${ChartPermissionId}/${ID}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`
+      )
     }
     if (jumpType === 'theme') {
-      history.push(`/community/theme/${ID}`)
+      history.push(`/community/theme/${ID}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
     }
   }
   const iRankClass = classNames(
@@ -92,16 +96,24 @@ const ArticleCard: React.FC<IArticleCardProps> = props => {
     e.stopPropagation()
     if ((articleItem as ICommunityArticleList)?.IsSpecial) {
       // 进入专栏详情页
-      history.push(`/column/view/${(articleItem as ICommunityArticleList).SpecialColumnId}`)
+      history.push(
+        `/column/view/${(articleItem as ICommunityArticleList).SpecialColumnId}${
+          login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''
+        }`
+      )
       return
     }
     // 主题作者详情页
-    history.push(`/community/author/${(articleItem as ICommunityArticleList).DepartmentId}`)
+    history.push(
+      `/community/author/${(articleItem as ICommunityArticleList).DepartmentId}${
+        login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''
+      }`
+    )
   }
   const handleClickBlock = () => {
     // 笔记/观点详情页
     if ((articleItem as ICommunityArticleList).IsSpecial) {
-      window.open(`${window.location.origin}/column/detail/${articleItem.ArticleId}`, '_blank')
+      window.open(`${window.location.origin}/column/detail/${articleItem.ArticleId}`)
       return
     }
     // Resource 1报告 2产品内测
@@ -114,7 +126,7 @@ const ArticleCard: React.FC<IArticleCardProps> = props => {
     }
     const url = urlResource[(articleItem as IIndepthArticleItem)?.Resource || 1]
     if (!url) return
-    window.open(url, '_blank')
+    window.open(url)
   }
   // 如果是列表显示，隐藏img标签
   const handleHideImg = (html: string) => {

src/Indepth/components/IndustryCard.tsx

@@ -63,7 +63,7 @@ const IndustryCard: React.FC<IIndustryCardProps> = props => {
       return
     }
     const url = `${window.location.origin}/indepth/video/${industryItem.ChartPermissionId}/${industryItem.IndustrialManagementId}/${industryItem?.IndustryVideo?.Id}`
-    window.open(url, '_blank')
+    window.open(url)
   }
 
   const iRankClass = classNames(

src/Indepth/components/Small.component.tsx

@@ -53,7 +53,7 @@ const SmallComponent: React.FC<ISmallComponentProps> = props => {
   // 打开精选看板
   const handleOpencollections = () => {
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname}`)
+      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
       return
     }
     applyCollectionClick()

src/Login2p/Login2p.service.ts

@@ -14,12 +14,15 @@ export interface IPrivateEquityUser {
   PermissionName: string[]
   PermissionStatus: string
   StartDate: string
+  UserCardEndDate: string // 3.0版 畅读卡到期时间
+  UserCardType: number // 3.0版 畅读卡类型
   UserId: number
   UserName: string
   HasPermission: number
   IsAuthor: boolean // 是否开通了专栏
   SpecialColumnId: number // 专栏ID
   IsImproveInformation: boolean // 专栏信息是否需要完善  为false的时候进行编辑
+  InviteShareCode: string // 邀请码
 }
 export interface ILoginWechartRes {
   CompanyName: string
@@ -38,11 +41,16 @@ export const Login2pService = {
       method: 'post',
       data: { AreaNum, Mobile }
     }),
-  postLogin2p: (Mobile: string, VCode: string, Token?: string): INewResponse<IPrivateEquityUser> =>
+  postLogin2p: (
+    Mobile: string,
+    VCode: string,
+    Token?: string,
+    InviteShareCode?: string
+  ): INewResponse<IPrivateEquityUser> =>
     NewAxiosInstanceFunc({
       url: '/user/login',
       method: 'post',
-      data: { Mobile, VCode, Token }
+      data: { Mobile, VCode, Token, InviteShareCode }
     }),
   getUserDetail: (token: string | undefined): INewResponse<IPrivateEquityUser> =>
     NewAxiosInstanceFunc({

src/Login2p/Login2p.tsx

@@ -48,7 +48,7 @@ const Login2p: React.FC = () => {
   const checkLogin = () => {
     if (login2p.jwt) {
       if (!login2p.isWechat) {
-        history.push('/')
+        history.push(`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
         message.info('您已登录').then(r => undefined)
       } else {
         //如果是微信小程序则直接退出

src/Login2p/Login2pContext.tsx

@@ -5,6 +5,7 @@ import useRequest from '@ahooksjs/use-request/es'
 import { message } from 'antd'
 
 import { Login2pService, IPrivateEquityUser } from './Login2p.service'
+import { getQueryString } from 'utils/getQueryString'
 import { checkWechat } from 'utils/wxConfig'
 import NewAxiosInstanceFunc from 'Service/NewAxiosInstance'
 
@@ -13,6 +14,7 @@ const Login2pContexts = React.createContext<
       jwt: string | undefined
       userInfo: IPrivateEquityUser | undefined
       isWechat: boolean
+      inviteCode: string | undefined
       // login: (phone_number: number, password: string, next: string, unionID?: string) => Promise<void>
       logout: () => void
       loginWechatLaunch: (redirectURI: string) => void
@@ -32,18 +34,22 @@ const Login2pProvider: React.FC<ContextProviderProps> = ({ children }: ContextPr
   const sm_token = localStorage.getItem('smtoken')
   // token初始值
   const [jwt, setJwt] = useState<string | undefined>(sm_token !== null ? sm_token : undefined)
+  const inviteCode = getQueryString('invite_code') || sessionStorage.getItem('invite_code') || undefined
   const [userInfo, setUserInfo] = useState<IPrivateEquityUser>()
   const isWechat = checkWechat()
   const loginEnd = (access_token: string, next: string) => {
     localStorage.setItem('smtoken', access_token)
     setJwt(access_token)
+    if (inviteCode) {
+      sessionStorage.setItem('invite_code', inviteCode)
+    }
     history.push(next)
   }
 
   const logout = (): void => {
     localStorage.removeItem('smtoken')
     setJwt(undefined)
-    history.push('/')
+    history.push(`/${inviteCode ? '?invite_code=' + inviteCode : ''}`)
     // 解决localstorage读取不到的过度方案
     history.go(0)
   }
@@ -75,7 +81,7 @@ const Login2pProvider: React.FC<ContextProviderProps> = ({ children }: ContextPr
       .catch(error => message.error('微信登录错误'))
 
   const login2pByCode = async (phone_number: string, code: string, next: string, token?: string) =>
-    await Login2pService.postLogin2p(phone_number, code, token)
+    await Login2pService.postLogin2p(phone_number, code, token, sessionStorage.getItem('invite_code') || inviteCode)
       .then(data => {
         if (data.data.Data?.Authorization) {
           setUserInfo(data.data.Data)
@@ -101,6 +107,11 @@ const Login2pProvider: React.FC<ContextProviderProps> = ({ children }: ContextPr
         }, 2000)
         return
       }
+      // 如果有邀请码
+      if (!!data.InviteShareCode) {
+        sessionStorage.setItem('invite_code', data.InviteShareCode)
+        history.replace(`${window.location.pathname}?invite_code=${data.InviteShareCode}`)
+      }
 
       setUserInfo(data)
     },
@@ -113,6 +124,7 @@ const Login2pProvider: React.FC<ContextProviderProps> = ({ children }: ContextPr
         jwt: jwt,
         userInfo: userInfo,
         isWechat: isWechat,
+        inviteCode,
         // login,
         logout,
         loginWechatLaunch: loginWechatLaunch,

src/Material/Material.service.ts

@@ -211,11 +211,11 @@ export const MaterialService = {
       method: 'get',
       params: { ...params }
     }),
-  getArcticleDetail: (ArticleId: number): INewResponse<IArcticleInfo> =>
+  getArcticleDetail: (ArticleId: number, InviteShareCode?: string): INewResponse<IArcticleInfo> =>
     NewAxiosInstanceFunc({
       url: `/article/detail`,
       method: 'get',
-      params: { ArticleId }
+      params: { ArticleId, InviteShareCode }
     }),
   getArcticleHotList: (ArticleId: number): INewResponse<{ List: IArcticleHotListItem[] }> =>
     NewAxiosInstanceFunc({

src/Material/MaterialInfo.tsx

@@ -77,7 +77,8 @@ const MaterialInfo: React.FC<IMaterialInfoProps> = props => {
   })
 
   useEffect(() => {
-    getArcticleDetail(props.articleID)
+    const code = sessionStorage.getItem('invite_code') || login2p.inviteCode
+    getArcticleDetail(props.articleID, code || undefined)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 

src/Material/ProductIntroduction.tsx

@@ -5,10 +5,13 @@ import { Link } from 'react-router-dom'
 import { Breadcrumb, Spin } from 'antd'
 
 import { MaterialService } from './Material.service'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from './css/Quotation.module.scss'
 
 /**产品介绍 */
 const ProductIntroduction: React.FC = () => {
+  const login2p = useLogin2p()
+
   // 拉取数据
   const { data, loading } = useRequest(MaterialService.getResearchIntroduce, {
     formatResult: response => response.data.Data
@@ -21,7 +24,7 @@ const ProductIntroduction: React.FC = () => {
           <Breadcrumb
             style={{ margin: '12px 0' }}
             items={[
-              { title: <Link to="/">首页</Link> },
+              { title: <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>首页</Link> },
               {
                 title: '买方研选'
               },

src/Material/Quotation.tsx

@@ -5,10 +5,13 @@ import { Link } from 'react-router-dom'
 import { Breadcrumb, Spin } from 'antd'
 
 import { MaterialService } from './Material.service'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from './css/Quotation.module.scss'
 
 /**报价单 */
 const Quotation: React.FC = () => {
+  const login2p = useLogin2p()
+
   // 拉取数据
   const { data, loading } = useRequest(MaterialService.getResearchQuotation, {
     formatResult: response => response.data.Data
@@ -21,7 +24,7 @@ const Quotation: React.FC = () => {
           <Breadcrumb
             style={{ margin: '12px 0' }}
             items={[
-              { title: <Link to="/">首页</Link> },
+              { title: <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>首页</Link> },
               {
                 title: '买方研选'
               },

src/Material/components/ArticleCard.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { Link } from 'react-router-dom'
 
 import { EyeOutlined } from '@ant-design/icons'
 
@@ -23,83 +22,84 @@ const ArticleCard: React.FC<IArticleCard> = props => {
   const formatLabel = (str: string): string => {
     return str ? `<img src=${item.LabelKeywordImgLink} alt="标签" class="mfyx-label-img" />` : ''
   }
+  const handleToDetail = () => {
+    window.open(`/material/info/${(item as IBillBoardItem)?.ArticleId || (item as INewestItem).SourceId}`)
+  }
+
   if (!item) return null
   return (
-    <Link
-      to={`/material/info/${(item as IBillBoardItem)?.ArticleId || (item as INewestItem).SourceId}`}
-      target={'_blank'}
-    >
-      <div className={styles['item-article']}>
+    <div className={styles['item-article']} onClick={handleToDetail}>
+      <div className="item-article-title">
         <div
-          className="item-article-title"
+          className="item-article-title-content"
           dangerouslySetInnerHTML={{
             __html: item?.IsResearch
               ? `${formatLabel(item.LabelKeywordImgLink)}<span>${title || item?.Title}</span>`
               : title || item?.Title
           }}
         />
-        {(item as IBillBoardItem)?.BodyHighlight?.length > 0 ? (
-          <>
-            <div className="item-article-annotation line-eight">
-              <div
-                dangerouslySetInnerHTML={{
-                  __html: (item as IBillBoardItem)?.BodyHighlight.join('')
-                }}
-              />
+      </div>
+      {(item as IBillBoardItem)?.BodyHighlight?.length > 0 ? (
+        <>
+          <div className="item-article-annotation line-eight">
+            <div
+              dangerouslySetInnerHTML={{
+                __html: (item as IBillBoardItem)?.BodyHighlight.join('')
+              }}
+            />
+          </div>
+          <div className="item-time-right item-article-flex">
+            <div className="item-article-pv">
+              <EyeOutlined size={14} className="pv-icon" />
+              <span>{item.Pv || 0}</span>
             </div>
-            <div className="item-time-right item-article-flex">
-              <div className="item-article-pv">
-                <EyeOutlined size={14} className="pv-icon" />
-                <span>{item.Pv || 0}</span>
-              </div>
-              <div className="item-article-publistdate">{item?.PublishDate}</div>
+            <div className="item-article-publistdate">{item?.PublishDate}</div>
+          </div>
+        </>
+      ) : (
+        <>
+          {(item as IBillBoardItem)?.Cover ? (
+            <div
+              className={`item-article-img-wrapper ${item?.Abstract?.length > 20 ? 'max-two-line' : 'max-one-line'}`}
+            >
+              <img src={(item as IBillBoardItem)?.Cover} alt="图像" className="item-article-cover" />
             </div>
-          </>
-        ) : (
-          <>
-            {(item as IBillBoardItem)?.Cover ? (
-              <div
-                className={`item-article-img-wrapper ${item?.Abstract?.length > 20 ? 'max-two-line' : 'max-one-line'}`}
-              >
-                <img src={(item as IBillBoardItem)?.Cover} alt="图像" className="item-article-cover" />
-              </div>
-            ) : (
-              <>
-                {item?.Annotation ? (
-                  <div className={`item-article-annotation ${item?.Abstract?.length > 20 ? 'line-five' : 'line-six'}`}>
-                    <div>核心观点：</div>
-                    <div dangerouslySetInnerHTML={{ __html: item?.Annotation }} />
-                  </div>
-                ) : (
-                  <div
-                    className={`item-article-img-wrapper ${
-                      item?.Abstract?.length > 20 ? 'max-two-line' : 'max-one-line'
-                    }`}
-                  >
-                    <img src={item?.BodyImg} alt="图像" className="item-article-cover" />
-                  </div>
-                )}
-              </>
-            )}
-            {item?.Abstract && (
-              <div
-                className="item-article-abstract"
-                dangerouslySetInnerHTML={{
-                  __html: '<span>摘要：</span>' + formatAbstractHtml(item?.Abstract)
-                }}
-              />
-            )}
-            <div className="item-article-flex">
-              <div className="item-article-pv">
-                <EyeOutlined size={14} className="pv-icon" />
-                <span>{item.Pv || 0}</span>
-              </div>
-              <div className="item-article-publistdate">{item?.PublishDate}</div>
+          ) : (
+            <>
+              {item?.Annotation ? (
+                <div className={`item-article-annotation ${item?.Abstract?.length > 20 ? 'line-five' : 'line-six'}`}>
+                  <div>核心观点：</div>
+                  <div dangerouslySetInnerHTML={{ __html: item?.Annotation }} />
+                </div>
+              ) : (
+                <div
+                  className={`item-article-img-wrapper ${
+                    item?.Abstract?.length > 20 ? 'max-two-line' : 'max-one-line'
+                  }`}
+                >
+                  <img src={item?.BodyImg} alt="图像" className="item-article-cover" />
+                </div>
+              )}
+            </>
+          )}
+          {item?.Abstract && (
+            <div
+              className="item-article-abstract"
+              dangerouslySetInnerHTML={{
+                __html: '<span>摘要：</span>' + formatAbstractHtml(item?.Abstract)
+              }}
+            />
+          )}
+          <div className="item-article-flex">
+            <div className="item-article-pv">
+              <EyeOutlined size={14} className="pv-icon" />
+              <span>{item.Pv || 0}</span>
             </div>
-          </>
-        )}
-      </div>
-    </Link>
+            <div className="item-article-publistdate">{item?.PublishDate}</div>
+          </div>
+        </>
+      )}
+    </div>
   )
 }
 

src/Material/components/IndustrialSourceCard.tsx

@@ -19,7 +19,7 @@ const IndustrialSourceCard: React.FC<IIndustrialSourceCardProps> = props => {
     }
     const url = urlType[item.Source]
     if (!url) return
-    window.open(url, '_blank')
+    window.open(url)
   }
   if (!item) return null
   return (

src/Material/components/MeetingCard.tsx

@@ -5,6 +5,7 @@ import useRequest from '@ahooksjs/use-request/es'
 import { Button, Modal } from 'antd'
 
 import { IMeetingreviewchaptItem, NewestService } from 'Newest/Newest.service'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from '../css/ItemComponent.module.scss'
 export interface IMeetingCard {
   item: IMeetingreviewchaptItem
@@ -15,6 +16,7 @@ const MeetingCard: React.FC<IMeetingCard> = props => {
   const { item, title } = props
   const [visibleMore, setVisibleMore] = useState(false)
   const history = useHistory()
+  const login2p = useLogin2p()
 
   const { run: applyClickRecord } = useRequest(NewestService.postMorningMeetingRecord, {
     manual: true
@@ -29,8 +31,13 @@ const MeetingCard: React.FC<IMeetingCard> = props => {
     setVisibleMore(false)
   }
   const handleToOther = (item: IMeetingreviewchaptItem, type: 'meeting' | 'indepth') => {
-    type === 'indepth' && history.push(`/indepth/info/${item.ChartPermissionId}/${item.IndustryId}`)
-    type === 'meeting' && history.push(`/meeting`)
+    type === 'indepth' &&
+      history.push(
+        `/indepth/info/${item.ChartPermissionId}/${item.IndustryId}${
+          login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''
+        }`
+      )
+    type === 'meeting' && history.push(`/meeting${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
   }
   const modalTitle = <div className="com-fz18 com-fw-bold g-ta-ct">【{item.IndustryName}】晨会精华</div>
   const modalFooter = (
@@ -44,17 +51,19 @@ const MeetingCard: React.FC<IMeetingCard> = props => {
     </div>
   )
   const handleToLinkPage = (item: IMeetingreviewchaptItem) => {
-    item.ReportLink && window.open(item.ReportLink, '_blank')
+    item.ReportLink && window.open(item.ReportLink)
   }
   if (!item) return null
   return (
     <div className={styles['item-article']} onClick={handleClickMeeting}>
-      <div
-        className="item-article-title"
-        dangerouslySetInnerHTML={{
-          __html: title || `【${item.IndustryName}】晨会精华`
-        }}
-      />
+      <div className="item-article-title">
+        <div
+          className="item-article-title-content"
+          dangerouslySetInnerHTML={{
+            __html: title || `【${item.IndustryName}】晨会精华`
+          }}
+        />
+      </div>
       <div className={`item-article-annotation line-seven`}>
         <div dangerouslySetInnerHTML={{ __html: item.Content }} />
       </div>

src/Material/components/NoPermission.tsx

@@ -11,6 +11,7 @@ import { useMedia } from 'Context/Media/MediaContext'
 import ApplyPermission from './ApplyPermission'
 import NButton from 'components/NButton/NButton'
 import { MaterialService } from 'Material/Material.service'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from '../css/NoPermission.module.scss'
 
 export enum INewPermissionType {
@@ -72,6 +73,7 @@ const NoPermission: React.FC<INoPermissionProps> = props => {
   const [visibleApply, setVisibleApply] = useState(false)
   const history = useHistory()
   const media = useMedia()
+  const login2p = useLogin2p()
   const [isHideBack, setIsHideBack] = useState<boolean>(false) // 识别报告详情页+活动详情页，隐藏返回按钮
 
   useEffect(() => {
@@ -192,16 +194,17 @@ const NoPermission: React.FC<INoPermissionProps> = props => {
     setVisibleApply(false)
   }
   const handleToBack = () => {
-    if (tryType === 'Article') {
-      history.push('/')
-      return
-    }
-    // 新打开的页面的返回
-    if (history.action === 'POP') {
-      history.push('/activity')
-      return
-    }
-    history.goBack()
+    // if (tryType === 'Article') {
+    //   history.push(`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
+    //   return
+    // }
+    // // 新打开的页面的返回
+    // if (history.action === 'POP') {
+    //   history.push(`/activity${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
+    //   return
+    // }
+    history.push(`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
+    // history.goBack()
   }
 
   return (

src/Material/components/ProductInteriorCard.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { Link } from 'react-router-dom'
 
 import { EyeOutlined } from '@ant-design/icons'
 
@@ -12,28 +11,31 @@ export interface IProductInteriorCardProps {
 /**产品内测组件 */
 const ProductInteriorCard: React.FC<IProductInteriorCardProps> = props => {
   const { item, title } = props
+  const handleToDetail = () => {
+    window.open(`/internal/article/${item.ProductInteriorId}`)
+  }
   if (!item) return null
   return (
-    <Link to={`/internal/article/${item.ProductInteriorId}`} target={'_blank'}>
-      <div className={styles['item-article']}>
+    <div className={styles['item-article']} onClick={handleToDetail}>
+      <div className="item-article-title">
         <div
-          className="item-article-title"
+          className="item-article-title-content"
           dangerouslySetInnerHTML={{
             __html: title || item.Title
           }}
         />
-        <div className={`item-article-annotation line-seven`}>
-          <div dangerouslySetInnerHTML={{ __html: item.Body }} />
-        </div>
-        <div className="item-time-right item-article-flex">
-          <div className="item-article-pv">
-            <EyeOutlined size={14} className="pv-icon" />
-            <span>{item.Pv || 0}</span>
-          </div>
-          <div className="item-article-publistdate">{item.PublishTime}</div>
+      </div>
+      <div className={`item-article-annotation line-seven`}>
+        <div dangerouslySetInnerHTML={{ __html: item.Body }} />
+      </div>
+      <div className="item-time-right item-article-flex">
+        <div className="item-article-pv">
+          <EyeOutlined size={14} className="pv-icon" />
+          <span>{item.Pv || 0}</span>
         </div>
+        <div className="item-article-publistdate">{item.PublishTime}</div>
       </div>
-    </Link>
+    </div>
   )
 }
 

src/Material/components/ReportSelectionCard.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { Link } from 'react-router-dom'
 
 import { EyeOutlined } from '@ant-design/icons'
 
@@ -12,29 +11,31 @@ export interface IReportSelectionCardProps {
 /**重点公司展示样式卡片组件 */
 const ReportSelectionCard: React.FC<IReportSelectionCardProps> = props => {
   const { item, title } = props
-
+  const handleToDetail = () => {
+    window.open(`/recent/${item.ArticleId}`)
+  }
   if (!item) return null
   return (
-    <Link to={`/recent/${item.ArticleId}`} target={'_blank'}>
-      <div className={styles['item-article']}>
+    <div className={styles['item-article']} onClick={handleToDetail}>
+      <div className="item-article-title">
         <div
-          className="item-article-title"
+          className="item-article-title-content"
           dangerouslySetInnerHTML={{
             __html: title || item.Title
           }}
         />
-        <div className={`item-article-annotation line-seven`}>
-          <div dangerouslySetInnerHTML={{ __html: item.MarketStrategy }} />
-        </div>
-        <div className="item-time-right item-article-flex">
-          <div className="item-article-pv">
-            <EyeOutlined size={14} className="pv-icon" />
-            <span>{item.Pv || 0}</span>
-          </div>
-          <div className="item-article-publistdate">{item.PublishDate}</div>
+      </div>
+      <div className={`item-article-annotation line-seven`}>
+        <div dangerouslySetInnerHTML={{ __html: item.MarketStrategy }} />
+      </div>
+      <div className="item-time-right item-article-flex">
+        <div className="item-article-pv">
+          <EyeOutlined size={14} className="pv-icon" />
+          <span>{item.Pv || 0}</span>
         </div>
+        <div className="item-article-publistdate">{item.PublishDate}</div>
       </div>
-    </Link>
+    </div>
   )
 }
 

src/Material/components/Research.container.tsx

@@ -45,17 +45,21 @@ const ResearchContainer: React.FC<ResearchContainerProps> = props => {
   // 查看更多
   const handleToShowMore = () => {
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname}`)
+      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
       return
     }
   }
 
+  const handleOpenToPage = (path: string) => {
+    window.open(path)
+  }
+
   return info ? (
     <div className={styles['research-container']}>
       <div className="reserch-breadcrumb">
         <Breadcrumb style={{ margin: '12px 0' }}>
           <Breadcrumb.Item>
-            <Link to="/">首页</Link>
+            <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>首页</Link>
           </Breadcrumb.Item>
           <Breadcrumb.Item>买方研选</Breadcrumb.Item>
         </Breadcrumb>
@@ -179,9 +183,12 @@ const ResearchContainer: React.FC<ResearchContainerProps> = props => {
                     <Timeline.Item key={item.ArticleId} color="grey">
                       <p className="hotlist-time">{dayjs(item.PublishDate).format('YYYY-MM-DD')}</p>
                       <p>
-                        <Link to={`/material/info/${item.ArticleId}`} target="_blank" className="hotlist-link">
+                        <span
+                          onClick={handleOpenToPage.bind(this, `/material/info/${item.ArticleId}`)}
+                          className="hotlist-link"
+                        >
                           {item.Title}
-                        </Link>
+                        </span>
                       </p>
                     </Timeline.Item>
                   )

src/Material/components/SearchArticleCard.tsx

@@ -11,30 +11,33 @@ export interface ISearchArticleCard {
 /**搜索时的报告卡片组件 */
 const SearchArticleCard: React.FC<ISearchArticleCard> = props => {
   const { item } = props
+  const handleToDetail = () => {
+    window.open(`/material/info/${item.ArticleId}`)
+  }
   if (!item) return null
   return (
-    <Link to={`/material/info/${item.ArticleId}`} target={'_blank'}>
-      <div className={styles['item-article']}>
+    <div className={styles['item-article']} onClick={handleToDetail}>
+      <div className="item-article-title">
         <div
-          className="item-article-title"
+          className="item-article-title-content"
           dangerouslySetInnerHTML={{
             __html: item?.IsResearch
               ? `<span class="mfyx-label-normal mfyx-label-article no-wrap">买方研选</span><span>${item?.Title}</span>`
               : item.Title
           }}
         />
-        <div className="item-article-annotation line-seven">
-          <div dangerouslySetInnerHTML={{ __html: item.Body.join('') }} />
-        </div>
-        <div className="item-time-right item-article-flex">
-          <div className="item-article-pv">
-            <EyeOutlined size={14} className="pv-icon" />
-            <span>{item.Pv || 0}</span>
-          </div>
-          <div className="item-article-publistdate">{item?.PublishDate}</div>
+      </div>
+      <div className="item-article-annotation line-seven">
+        <div dangerouslySetInnerHTML={{ __html: item.Body.join('') }} />
+      </div>
+      <div className="item-time-right item-article-flex">
+        <div className="item-article-pv">
+          <EyeOutlined size={14} className="pv-icon" />
+          <span>{item.Pv || 0}</span>
         </div>
+        <div className="item-article-publistdate">{item?.PublishDate}</div>
       </div>
-    </Link>
+    </div>
   )
 }
 

src/Material/components/SummaryCard.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { Link } from 'react-router-dom'
 
 import { EyeOutlined } from '@ant-design/icons'
 
@@ -14,28 +13,31 @@ export interface ISummaryCardProps {
 /**本周/上周汇总卡片组件 */
 const SummaryCard: React.FC<ISummaryCardProps> = props => {
   const { item, itemType, title } = props
+  const handleToDetail = () => {
+    window.open(`/summary/${itemType === IItemType.Researchsummary ? 2 : 3}/${item.ArticleId}`)
+  }
   if (!item) return null
   return (
-    <Link to={`/summary/${itemType === IItemType.Researchsummary ? 2 : 3}/${item.ArticleId}`} target={'_blank'}>
-      <div className={styles['item-article']}>
+    <div className={styles['item-article']} onClick={handleToDetail}>
+      <div className="item-article-title">
         <div
-          className="item-article-title"
+          className="item-article-title-content"
           dangerouslySetInnerHTML={{
             __html: title || item.Title
           }}
         />
-        <div className={`item-article-annotation line-seven`}>
-          <div dangerouslySetInnerHTML={{ __html: item.Abstract }} />
-        </div>
-        <div className="item-time-right item-article-flex">
-          <div className="item-article-pv">
-            <EyeOutlined size={14} className="pv-icon" />
-            <span>{item.Pv || 0}</span>
-          </div>
-          <div className="item-article-publistdate">{item.PublishDate}</div>
+      </div>
+      <div className={`item-article-annotation line-seven`}>
+        <div dangerouslySetInnerHTML={{ __html: item.Abstract }} />
+      </div>
+      <div className="item-time-right item-article-flex">
+        <div className="item-article-pv">
+          <EyeOutlined size={14} className="pv-icon" />
+          <span>{item.Pv || 0}</span>
         </div>
+        <div className="item-article-publistdate">{item.PublishDate}</div>
       </div>
-    </Link>
+    </div>
   )
 }
 

src/Material/components/VideoAudioCard.tsx

@@ -184,7 +184,7 @@ const VideoAudioCard: React.FC<IVideoAudioCard> = props => {
 
     const url = urlType[item.Type]().url
     if (!url) return
-    window.open(url, '_blank')
+    window.open(url)
   }
   // 判断是音频还是视频(返回true是音频)
   const isAudioOrVideo = (item: IRoadshowistItem) => {

src/Material/components/YanxuanSpecialCard.tsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import { Link } from 'react-router-dom'
 import dayjs from 'dayjs'
 
 import { EyeOutlined } from '@ant-design/icons'
@@ -13,12 +12,15 @@ export interface IYanxuanSpecialCardProps {
 /**专栏笔记/观点组件 */
 const YanxuanSpecialCard: React.FC<IYanxuanSpecialCardProps> = props => {
   const { item, title } = props
+  const handleToDetail = () => {
+    window.open(`/column/detail/${item.Id}`)
+  }
   if (!item) return null
   return (
-    <Link to={`/column/detail/${item.Id}`} target={'_blank'}>
-      <div className={styles['item-article']}>
+    <div className={styles['item-article']} onClick={handleToDetail}>
+      <div className="item-article-title">
         <div
-          className="item-article-title"
+          className="item-article-title-content"
           dangerouslySetInnerHTML={{
             __html: `<img src=${
               item.LabelKeywordImgLink || 'https://hzstatic.hzinsights.com/cygx_web/config/zhuanlan.png'
@@ -27,39 +29,39 @@ const YanxuanSpecialCard: React.FC<IYanxuanSpecialCardProps> = props => {
             }</span>`
           }}
         />
-        {item?.BodyHighlight?.length > 0 ? (
-          <>
-            <div className="item-article-annotation line-seven">
-              <div
-                dangerouslySetInnerHTML={{
-                  __html: item?.BodyHighlight.join('')
-                }}
-              />
-            </div>
-            <div className="item-time-right item-article-flex">
-              <div className="item-article-pv">
-                <EyeOutlined size={14} className="pv-icon" />
-                <span>{item.Pv || 0}</span>
-              </div>
-              <div className="item-article-publistdate">{dayjs(item.PublishTime || '').format('YYYY-MM-DD')}</div>
-            </div>
-          </>
-        ) : (
-          <>
-            <div className={`item-article-annotation line-seven`}>
-              <div dangerouslySetInnerHTML={{ __html: item.Annotation }} />
+      </div>
+      {item?.BodyHighlight?.length > 0 ? (
+        <>
+          <div className="item-article-annotation line-seven">
+            <div
+              dangerouslySetInnerHTML={{
+                __html: item?.BodyHighlight.join('')
+              }}
+            />
+          </div>
+          <div className="item-time-right item-article-flex">
+            <div className="item-article-pv">
+              <EyeOutlined size={14} className="pv-icon" />
+              <span>{item.Pv || 0}</span>
             </div>
-            <div className="item-time-right item-article-flex">
-              <div className="item-article-pv">
-                <EyeOutlined size={14} className="pv-icon" />
-                <span>{item.Pv || 0}</span>
-              </div>
-              <div className="item-article-publistdate">{dayjs(item.PublishTime || '').format('YYYY-MM-DD')}</div>
+            <div className="item-article-publistdate">{dayjs(item.PublishTime || '').format('YYYY-MM-DD')}</div>
+          </div>
+        </>
+      ) : (
+        <>
+          <div className={`item-article-annotation line-seven`}>
+            <div dangerouslySetInnerHTML={{ __html: item.Annotation }} />
+          </div>
+          <div className="item-time-right item-article-flex">
+            <div className="item-article-pv">
+              <EyeOutlined size={14} className="pv-icon" />
+              <span>{item.Pv || 0}</span>
             </div>
-          </>
-        )}
-      </div>
-    </Link>
+            <div className="item-article-publistdate">{dayjs(item.PublishTime || '').format('YYYY-MM-DD')}</div>
+          </div>
+        </>
+      )}
+    </div>
   )
 }
 

src/Material/css/ItemComponent.module.scss

@@ -29,14 +29,16 @@
       font-size: 16px;
       line-height: 24px;
       color: #333333;
-      padding-top: 16px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 2; // 超出多少行
-      -webkit-box-orient: vertical;
-      word-break: break-all;
+      padding-top: 16px;      
       border-bottom: 1px solid #ebebeb;
+      .item-article-title-content{
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2; // 超出多少行
+        -webkit-box-orient: vertical;
+        word-break: break-all;
+      }
     }
     .item-article-annotation {
       flex: auto;

src/NewIndex.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react'
 import { Route, useHistory, useLocation, useParams } from 'react-router-dom'
-import useRequest from '@ahooksjs/use-request'
 
 import { Layout, Spin } from 'antd'
 

src/NewPageHeader.tsx

@@ -42,7 +42,7 @@ const NewPage: React.FC = props => {
   const [isShowMobileMenu, setIsShowMobileMenu] = useState<boolean>(false) // 识别报告详情页+活动详情页，适配移动菜单
 
   const handleToMy = () => {
-    history.push('/my')
+    history.push(`/my${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
   }
   // const headMenu = [
   //   { key: 'newest', path: '/', label: '最新' },
@@ -110,7 +110,7 @@ const NewPage: React.FC = props => {
   /** 搜索框的事件 */
   const handleToDoSearch = (value: string) => {
     setSearchWord(value)
-    history.push(`/search/${value}`)
+    history.push(`/search/${value}${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`)
   }
   const handleMobileLogout = () => {
     localStorage.removeItem('token')
@@ -163,7 +163,7 @@ const NewPage: React.FC = props => {
                 onClick={() => setIsShowMenu(!isShowMenu)}
               />
             ) : (
-              <Link to={`/login2p?next=${location.pathname}`}>
+              <Link to={`/login2p?next=${location.pathname + location.search}`}>
                 <Button type="primary" className="mobile-login2p-btn">
                   登录
                 </Button>
@@ -226,7 +226,7 @@ const NewPage: React.FC = props => {
               ) : null}
               {/* (
               <div className="mobile-header-item" onClick={login2p.logout}>
-                <Link to={`/login2p?next=${location.pathname}`}>
+                <Link to={`/login2p?next=${location.pathname+ location.search}`}>
                   <Button type="primary" className="mobile-login2p-btn">
                     登录
                   </Button>
@@ -239,7 +239,10 @@ const NewPage: React.FC = props => {
       ) : (
         <Row wrap={false} justify="space-around" align="middle">
           <Col className={styles['reset-padding']}>
-            <Link to="/" className={styles['logo-wrapper']}>
+            <Link
+              to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}
+              className={styles['logo-wrapper']}
+            >
               <img
                 src="https://hzstatic.hzinsights.com/cygx_web/ico/logo_inedx.png"
                 className={styles.headerLogo}
@@ -269,6 +272,7 @@ const NewPage: React.FC = props => {
             <HeadSearch
               onSearch={handleToDoSearch}
               defaultKeyword={searchWord}
+              placeholder="搜索"
               className={styles['search-header-max']}
             />
           </Col>
@@ -346,7 +350,7 @@ const NewPage: React.FC = props => {
                 </div>
               </div>
             ) : (
-              <Link to={`/login2p?next=${location.pathname}`}>
+              <Link to={`/login2p?next=${location.pathname + location.search}`}>
                 <Button type="primary" className={styles['login2p-btn']}>
                   登录
                 </Button>

src/Newest/components/CustomSwiper.tsx

@@ -35,7 +35,7 @@ const CustormSwiper: React.FC<ICustormSwiperProps> = props => {
   // }
   const handleToSomePage = (item: IHomeBannerList) => {
     // applyRecord(item.BannerId)
-    item.Path && window.open(item.Path, '_blank')
+    item.Path && window.open(item.Path)
   }
   return (
     <>

src/Newest/components/NewestLibrary.tsx

@@ -139,12 +139,12 @@ const NewestLibrary: React.FC = props => {
     // 视频播放
     if (item.Source === IItemType.Activityvideo) {
       const url = `${window.location.origin}/activity/video/${(item as INewestList).SourceId}`
-      window.open(url, '_blank')
+      window.open(url)
       return
     }
     if (item.Source === IItemType.Roadshow) {
       const url = `${window.location.origin}/indepth/video/${item.Roadshow.ChartPermissionId}/${item.Roadshow.IndustrialManagementId}/${item.Roadshow?.Id}`
-      window.open(url, '_blank')
+      window.open(url)
       return
     }
 
@@ -234,11 +234,19 @@ const NewestLibrary: React.FC = props => {
       setEditInfoVisible(true)
       return
     }
-    history.push(`/column/view/${login2p.userInfo?.SpecialColumnId}`)
+    history.push(
+      `/column/view/${login2p.userInfo?.SpecialColumnId}${
+        login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''
+      }`
+    )
   }
   const handleSaveEditEnd = () => {
     handleCloseEdit()
-    history.push(`/column/view/${login2p.userInfo?.SpecialColumnId}`)
+    history.push(
+      `/column/view/${login2p.userInfo?.SpecialColumnId}${
+        login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''
+      }`
+    )
   }
   const handleCloseEdit = () => {
     setEditInfoVisible(false)
@@ -278,21 +286,25 @@ const NewestLibrary: React.FC = props => {
         </div>
       )} */}
       {tagData && tagData?.List1?.length > 0 && (
-        <div className={styles['newestindex-label-wrapper']}>
-          {tagData?.List1?.map((item: string, index: number) => (
-            <div className={handleIncludeIds(item)} key={index} onClick={handleClickTag.bind(this, item, 'activity')}>
-              {item}
-            </div>
-          ))}
+        <div className="m-r-md g-inline-block">
+          <div className={styles['newestindex-label-wrapper']}>
+            {tagData?.List1?.map((item: string, index: number) => (
+              <div className={handleIncludeIds(item)} key={index} onClick={handleClickTag.bind(this, item, 'activity')}>
+                {item}
+              </div>
+            ))}
+          </div>
         </div>
       )}
       {tagData && tagData?.List2?.length > 0 && (
-        <div className={styles['newestindex-label-wrapper']}>
-          {tagData?.List2?.map((item: string, index: number) => (
-            <div className={handleIncludeIds(item)} key={index} onClick={handleClickTag.bind(this, item, 'activity')}>
-              {item}
-            </div>
-          ))}
+        <div className="g-inline-block">
+          <div className={styles['newestindex-label-wrapper']}>
+            {tagData?.List2?.map((item: string, index: number) => (
+              <div className={handleIncludeIds(item)} key={index} onClick={handleClickTag.bind(this, item, 'activity')}>
+                {item}
+              </div>
+            ))}
+          </div>
         </div>
       )}
       {tagData && tagData?.List3?.length > 0 && (
@@ -308,7 +320,7 @@ const NewestLibrary: React.FC = props => {
           ))}
         </div>
       )}
-      <div className="m-t-sm">
+      <div>
         <MasonryContainer
           loadMore={handleLoadMoreData}
           hasMore={hasMore}

src/Newest/css/NewestIndex.module.scss

@@ -107,19 +107,22 @@
   }
 }
 .newestindex-label-wrapper {
+  background: #ffffff;
+  border-radius: 47px;
+  padding: 10px;
+  margin-bottom: 20px;
   display: flex;
   flex-wrap: wrap;
   :global {
     .newestindex-label-item {
       padding: 6px 20px;
-      background: #ffffff;
+      background: #F6F6F6;
       border-radius: 100px;
-      margin: 0 20px 10px 0;
-      line-height: 22px;
+      margin: 0 10px;
+      cursor: pointer;
       &:hover {
         background: #faa12f;
         color: #ffffff;
-        cursor: pointer;
       }
     }
     .act-newestindex-label {

src/Personal/PersonalIndex.tsx

@@ -133,7 +133,7 @@ const PersonalIndex: React.FC = () => {
     setActMenu(key as number)
   }
   const handleToOther = (type: 'about') => {
-    if (type === 'about') window.open(`${window.location.origin}/about`, '_blank')
+    if (type === 'about') window.open(`${window.location.origin}/about`)
   }
   const handleToApplyPower = () => {
     if (!login2p.jwt) return

src/Personal/ProductInterior.tsx

@@ -10,6 +10,7 @@ import NoPermission, { INewPermissionType, ITryType } from 'Material/components/
 import { WebEditError } from 'components/Empty'
 import { PersonalService } from './Personal.service'
 import { setWxShare } from 'utils/wxConfig'
+import { useLogin2p } from 'Login2p/Login2pContext'
 import styles from './css/ProductInterior.module.scss'
 
 type IProductInteriorProps = {
@@ -21,6 +22,7 @@ type IProductInteriorProps = {
  */
 const ProductInterior: React.FC<IProductInteriorProps> = props => {
   const { ProductInteriorId } = props
+  const login2p = useLogin2p()
 
   useEffect(() => {
     ProductInteriorId && getDetail(ProductInteriorId)
@@ -72,7 +74,10 @@ const ProductInterior: React.FC<IProductInteriorProps> = props => {
                   <div className={styles['productinterior-page']}>
                     <Breadcrumb>
                       <Breadcrumb.Item>
-                        <Link to="/" className="com-fz16">
+                        <Link
+                          to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}
+                          className="com-fz16"
+                        >
                           首页
                         </Link>
                       </Breadcrumb.Item>

src/Personal/components/Activity.component.tsx

@@ -67,7 +67,7 @@ const ActivityComponent: React.FC = () => {
     }
     if (!item.VideoDetail) return
     const url = `${window.location.origin}/activity/video/${item.VideoDetail.Id}`
-    window.open(url, '_blank')
+    window.open(url)
   }
 
   const handleGetMore = () => {

src/Personal/components/Comment.component.tsx

@@ -55,7 +55,7 @@ const CommentComponent: React.FC = () => {
         break
     }
     if (!url) return
-    window.open(url, '_blank')
+    window.open(url)
   }
 
   return (

src/Personal/components/ProductInterior.component.tsx

@@ -35,7 +35,7 @@ const ProductInteriorComponent: React.FC = () => {
 
   const handleToSomePage = (item: IProductInteriorItem) => {
     const url = `${window.location.origin}/internal/article/${item.ProductInteriorId}`
-    window.open(url, '_blank')
+    window.open(url)
   }
   return (
     <Spin spinning={loading}>

src/Personal/components/Question.component.tsx

@@ -51,7 +51,7 @@ const QuestionComponent: React.FC = () => {
       url = `${window.location.origin}/material/info/${item.ReportOrActivityId}`
     }
 
-    window.open(url, '_blank')
+    window.open(url)
   }
   return (
     <Spin spinning={listLoading}>

src/Search/components/HeadSearch.tsx

@@ -113,7 +113,7 @@ const HeadSearch: React.FC<IHeadSearchProps> = props => {
         maskClosable={false}
         closable={false}
         onOk={() => {
-          history.push(`/login2p?next=${window.location.pathname}`)
+          history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
         }}
         onCancel={() => {
           setIsModalVisible(false)

src/Vmp.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react'
-import { BrowserRouter as Router, Route, Switch, Link, useLocation } from 'react-router-dom'
+import { BrowserRouter as Router, Route, Switch, Link, useLocation, useHistory } from 'react-router-dom'
+
 // eslint-disable-next-line
 import 'swiper/swiper-bundle.css'
 
@@ -10,6 +11,7 @@ import 'swiper/swiper-bundle.css'
 
 import { useLogin2p } from 'Login2p/Login2pContext'
 import { VmpNotfound } from 'components/Empty'
+import { getQueryString } from 'utils/getQueryString'
 import './styles/CommonGlobal.module.scss'
 
 const Login2p = React.lazy(() => import('./Login2p/Login2p'))
@@ -18,8 +20,18 @@ const NewIndex = React.lazy(() => import('./NewIndex'))
 
 const Vmp: React.FC = () => {
   const login2p = useLogin2p()
+  const history = useHistory()
 
   useEffect(() => {
+    // 如果url上有邀请码，记录
+    const inviteCode = getQueryString('invite_code')
+    if (inviteCode) {
+      sessionStorage.setItem('invite_code', inviteCode)
+    }
+    // 如果有邀请码，带上邀请码
+    if (sessionStorage.getItem('invite_code')) {
+      history.push(`${window.location.pathname}?invite_code=${sessionStorage.getItem('invite_code')}`)
+    }
     if (login2p.jwt) {
       login2p.getUserDetail()
     }

src/components/Empty.tsx

@@ -6,16 +6,19 @@ import EditingImg from 'assets/editing.png'
 import LoginImg from 'assets/login.png'
 import EmptyImg from 'assets/empty.png'
 
+import { useLogin2p } from 'Login2p/Login2pContext'
 import 'styles/CommonGlobal.module.scss'
 
 export const VmpNotfound: React.FC = () => {
+  const login2p = useLogin2p()
+
   return (
     <Result
       status="404"
       title="404"
       subTitle="抱歉，您访问的页面不存在~"
       extra={
-        <Link to="/">
+        <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>
           <Button type="primary" className="big-long-btn">
             返回首页
           </Button>
@@ -27,13 +30,15 @@ export const VmpNotfound: React.FC = () => {
 }
 
 export const VmpNoAuthority: React.FC = () => {
+  const login2p = useLogin2p()
+
   return (
     <Result
       status="403"
       title="401"
       subTitle="抱歉，您当前还没有获得该页面的访问权限哦~"
       extra={
-        <Link to="/">
+        <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>
           <Button type="primary" className="big-long-btn">
             返回首页
           </Button>
@@ -45,13 +50,15 @@ export const VmpNoAuthority: React.FC = () => {
 }
 
 export const VmpSeverError: React.FC = () => {
+  const login2p = useLogin2p()
+
   return (
     <Result
       status="500"
       title="500"
       subTitle="当前网络不稳定，请稍后再试~"
       extra={
-        <Link to="/">
+        <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>
           <Button type="primary" className="big-long-btn">
             返回首页
           </Button>
@@ -63,12 +70,14 @@ export const VmpSeverError: React.FC = () => {
 }
 
 export const VmpNotPublish: React.FC = () => {
+  const login2p = useLogin2p()
+
   return (
     <Result
       status="warning"
       title="该报告/图表暂未发布"
       extra={
-        <Link to="/">
+        <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>
           <Button type="primary" className="big-long-btn">
             回到主页
           </Button>
@@ -81,6 +90,7 @@ export const VmpNotPublish: React.FC = () => {
 
 export const VmpNoAuthentication: React.FC = () => {
   const { pathname } = useLocation()
+
   return (
     <Result
       status="403"
@@ -116,12 +126,14 @@ export const WebNoAuthentication: React.FC = () => {
   )
 }
 export const WebEditError: React.FC = () => {
+  const login2p = useLogin2p()
+
   return (
     <Result
       icon={<img src={EditingImg} alt="编辑中" style={{ maxWidth: '507px' }} />}
       subTitle="正在努力编辑中，请耐心等待..."
       extra={
-        <Link to="/">
+        <Link to={`/${login2p.inviteCode ? '?invite_code=' + login2p.inviteCode : ''}`}>
           <Button type="primary" ghost className="big-long-btn">
             返回首页
           </Button>
@@ -134,6 +146,7 @@ export const WebEditError: React.FC = () => {
 interface IWebNotPublishProps {
   title?: string // 文案
 }
+
 export const WebNotPublish: React.FC<IWebNotPublishProps> = props => {
   return (
     <Result