Commit bf2fb437 by zhanghaozhe

社区跳转

parent d8684b52
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
"intelligent-recommend.js": "/mrstaticjs/intelligent-recommend.0ed0b741.chunk.js", "intelligent-recommend.js": "/mrstaticjs/intelligent-recommend.0ed0b741.chunk.js",
"intelligent-recommend.js.map": "/mrstaticjs/intelligent-recommend.0ed0b741.chunk.js.map", "intelligent-recommend.js.map": "/mrstaticjs/intelligent-recommend.0ed0b741.chunk.js.map",
"main.css": "/mrstaticcss/main.595f7d30.chunk.css", "main.css": "/mrstaticcss/main.595f7d30.chunk.css",
"main.js": "/mrstaticjs/main.93cca24f.chunk.js", "main.js": "/mrstaticjs/main.0a36fcd0.chunk.js",
"main.js.map": "/mrstaticjs/main.93cca24f.chunk.js.map", "main.js.map": "/mrstaticjs/main.0a36fcd0.chunk.js.map",
"ml.css": "/mrstaticcss/ml.2a883c76.chunk.css", "ml.css": "/mrstaticcss/ml.2a883c76.chunk.css",
"ml.js": "/mrstaticjs/ml.3c0af0d9.chunk.js", "ml.js": "/mrstaticjs/ml.3c0af0d9.chunk.js",
"ml.js.map": "/mrstaticjs/ml.3c0af0d9.chunk.js.map", "ml.js.map": "/mrstaticjs/ml.3c0af0d9.chunk.js.map",
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
"mrstaticmedia/iconfont.css": "/mrstaticmedia/iconfont.d9c813a4.svg", "mrstaticmedia/iconfont.css": "/mrstaticmedia/iconfont.d9c813a4.svg",
"mrstaticmedia/kanjia_cg_icon.png": "/mrstaticmedia/kanjia_cg_icon.81a489ac.png", "mrstaticmedia/kanjia_cg_icon.png": "/mrstaticmedia/kanjia_cg_icon.81a489ac.png",
"mrstaticmedia/video.scss": "/mrstaticmedia/progress-share-bg.80011994.png", "mrstaticmedia/video.scss": "/mrstaticmedia/progress-share-bg.80011994.png",
"precache-manifest.0342d99a4c9677a5aad76bf16c3de1c3.js": "/precache-manifest.0342d99a4c9677a5aad76bf16c3de1c3.js", "precache-manifest.1644aa68605faa82d819adf74552e960.js": "/precache-manifest.1644aa68605faa82d819adf74552e960.js",
"service-worker.js": "/service-worker.js" "service-worker.js": "/service-worker.js"
}, },
"entrypoints": [ "entrypoints": [
...@@ -282,6 +282,6 @@ ...@@ -282,6 +282,6 @@
"mrstaticcss/51.d1dc4ff0.chunk.css", "mrstaticcss/51.d1dc4ff0.chunk.css",
"mrstaticjs/51.579d8fca.chunk.js", "mrstaticjs/51.579d8fca.chunk.js",
"mrstaticcss/main.595f7d30.chunk.css", "mrstaticcss/main.595f7d30.chunk.css",
"mrstaticjs/main.93cca24f.chunk.js" "mrstaticjs/main.0a36fcd0.chunk.js"
] ]
} }
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
self.__precacheManifest = (self.__precacheManifest || []).concat([ self.__precacheManifest = (self.__precacheManifest || []).concat([
{ {
"revision": "32be48fdb5f0f4c74d6fc93bc7f23a91", "revision": "fd2d5df345de8f46b304f7dfebcf1e08",
"url": "/index.html" "url": "/index.html"
}, },
{ {
...@@ -180,7 +180,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([ ...@@ -180,7 +180,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/mrstaticcss/intelligent-recommend.1b4cd0a8.chunk.css" "url": "/mrstaticcss/intelligent-recommend.1b4cd0a8.chunk.css"
}, },
{ {
"revision": "762107ee6820a093012c", "revision": "a8573f226a9c2658bd1f",
"url": "/mrstaticcss/main.595f7d30.chunk.css" "url": "/mrstaticcss/main.595f7d30.chunk.css"
}, },
{ {
...@@ -476,8 +476,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([ ...@@ -476,8 +476,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/mrstaticjs/intelligent-recommend.0ed0b741.chunk.js" "url": "/mrstaticjs/intelligent-recommend.0ed0b741.chunk.js"
}, },
{ {
"revision": "762107ee6820a093012c", "revision": "a8573f226a9c2658bd1f",
"url": "/mrstaticjs/main.93cca24f.chunk.js" "url": "/mrstaticjs/main.0a36fcd0.chunk.js"
}, },
{ {
"revision": "f9caa22381e7eee6c3a5", "revision": "f9caa22381e7eee6c3a5",
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts( importScripts(
"/precache-manifest.0342d99a4c9677a5aad76bf16c3de1c3.js" "/precache-manifest.1644aa68605faa82d819adf74552e960.js"
); );
self.addEventListener('message', (event) => { self.addEventListener('message', (event) => {
......
...@@ -124,8 +124,9 @@ class App extends Component { ...@@ -124,8 +124,9 @@ class App extends Component {
user, user,
noTraceValidation: { isShowCaptcha, isFetching: isNoTraceFetching }, noTraceValidation: { isShowCaptcha, isFetching: isNoTraceFetching },
} = this.props } = this.props
if (!user.hasError && getParam("redirect")) { const redirect = new URLSearchParams(window.location.search).get("redirect")
window.location.href = decodeURIComponent(getParam("redirect")) if (!user.hasError) {
window.location.href = decodeURIComponent(redirect)
} }
if ( if (
......
...@@ -11,7 +11,6 @@ import BindingTel from "./bindingTel" ...@@ -11,7 +11,6 @@ import BindingTel from "./bindingTel"
import ForgotPasswordEmail from "./forgotPasswordEmail" import ForgotPasswordEmail from "./forgotPasswordEmail"
import { connect } from "react-redux" import { connect } from "react-redux"
import { compose } from "redux" import { compose } from "redux"
import { getParam } from "src/utils"
import StudentRoot from "./studentRoot" import StudentRoot from "./studentRoot"
import account from "./icons/account.png" import account from "./icons/account.png"
...@@ -100,7 +99,9 @@ class Passport extends Component { ...@@ -100,7 +99,9 @@ class Passport extends Component {
routeWhenUserLoggedIn = () => { routeWhenUserLoggedIn = () => {
let { hasError } = this.props.user let { hasError } = this.props.user
if (!hasError && !this.blackList.has(this.props.location.pathname)) { if (!hasError && !this.blackList.has(this.props.location.pathname)) {
const redirectURI = getParam("redirect") const redirectURI = new URLSearchParams(window.location.search).get(
"redirect"
)
redirectURI redirectURI
? (window.location.href = decodeURIComponent(redirectURI)) ? (window.location.href = decodeURIComponent(redirectURI))
: this.props.history.go(-this.count) : this.props.history.go(-this.count)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment