save3

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 + window.location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(window.location.pathname + window.location.search)}`)
       return
     }
   }

src/Activity/ActivityTypeDetail.tsx

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

src/Activity/components/ActivityBtn.component.tsx

@@ -386,7 +386,7 @@ const ActivityBtnComponent: React.FC<IActivityBtnComponent> = props => {
     e.stopPropagation()
     // 检查是否登录了，未登录进入登录页面
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${location.pathname + location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(location.pathname + location.search)}`)
       return
     }
 

src/Activity/components/ActivityCard.tsx

@@ -93,7 +93,7 @@ const ActivityCard: React.FC<IActivityCard> = props => {
     e.stopPropagation()
     // 检查是否登录了，未登录进入登录页面
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${location.pathname + location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(location.pathname + location.search)}`)
       return
     }
     onOpenVideoOrAudio && onOpenVideoOrAudio(item)

src/Column/ColumnIndex.tsx

@@ -232,7 +232,7 @@ const ColumnIndex: React.FC<IColumnIndexProps> = props => {
   const handleOnFollowColumn = () => {
     // 检查是否登录了，未登录进入登录页面
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${location.pathname + location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(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 + window.location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(window.location.pathname + window.location.search)}`)
       return
     }
     postColumnFollow(detail.SpecialColumnId, (detail as IColumnDetail)?.IsFollowAuthor ? 2 : 1)
@@ -185,7 +185,7 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
   // 查看更多
   const handleToShowMore = () => {
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(window.location.pathname + window.location.search)}`)
       return
     }
   }

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 + window.location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(window.location.pathname + window.location.search)}`)
       return
     }
     applyCollectionClick()

src/Login2p/Login2p.tsx

@@ -56,7 +56,7 @@ const Login2p: React.FC = () => {
       }
     } else if (login2p.isWechat && !wechatToken) {
       login2p.loginWechatLaunch(
-        `${process.env.REACT_APP_URL}login2p/wechat?next=${encodeURIComponent(next ? next : '/')}`
+        `${process.env.REACT_APP_URL}login2p/wechat?next=${next ? next : encodeURIComponent('/')}`
       )
     }
   }
@@ -154,7 +154,7 @@ const Login2p: React.FC = () => {
                 icon={<WechatOutlined style={{ color: '#60C84D' }} />}
                 onClick={() =>
                   login2p.loginWechatLaunch(
-                    `${process.env.REACT_APP_URL}login2p/wechat?next=${encodeURIComponent(next ? next : '/')}`
+                    `${process.env.REACT_APP_URL}login2p/wechat?next=${next ? next : encodeURIComponent('/')}`
                   )
                 }
                 shape="circle"

src/Material/components/Research.container.tsx

@@ -45,7 +45,7 @@ const ResearchContainer: React.FC<ResearchContainerProps> = props => {
   // 查看更多
   const handleToShowMore = () => {
     if (!login2p.jwt) {
-      history.push(`/login2p?next=${window.location.pathname + window.location.search}`)
+      history.push(`/login2p?next=${encodeURIComponent(window.location.pathname + window.location.search)}`)
       return
     }
   }

src/NewPageHeader.tsx

@@ -164,7 +164,7 @@ const NewPage: React.FC = props => {
                 onClick={() => setIsShowMenu(!isShowMenu)}
               />
             ) : (
-              <Link to={`/login2p?next=${location.pathname + location.search}`}>
+              <Link to={`/login2p?next=${encodeURIComponent(location.pathname + location.search)}`}>
                 <Button type="primary" className="mobile-login2p-btn">
                   登录
                 </Button>
@@ -351,7 +351,7 @@ const NewPage: React.FC = props => {
                 </div>
               </div>
             ) : (
-              <Link to={`/login2p?next=${location.pathname + location.search}`}>
+              <Link to={`/login2p?next=${encodeURIComponent(location.pathname + location.search)}`}>
                 <Button type="primary" className={styles['login2p-btn']}>
                   登录
                 </Button>

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 + window.location.search}`)
+          history.push(`/login2p?next=${encodeURIComponent(window.location.pathname + window.location.search)}`)
         }}
         onCancel={() => {
           setIsModalVisible(false)