微信登录redirect_url

src/App.js

@@ -23,12 +23,25 @@ import './assets/font/iconfont.css';
 
 class App extends Component {
 
-    previousLocation = this.props.location
+    previousLocation = {
+        ...{
+            state: {
+                from:
+                    {
+                        pathname: this.props.location.pathname,
+                        search: this.props.location.search,
+                        hash: this.props.location.hash
+                    }
+            }
+        },
+        ...this.props.location
+    }
 
     componentDidMount() {
         //平台信息
         cookie.set('plat', '5', {domain: '.julyedu.com'})
 
+        console.log(this.props.location);
 
         this.props.startFetchUser()
         http.get(`${API.home}/m/user_info`).then(res => {

src/components/passport/index.js

@@ -23,9 +23,10 @@ class Passport extends Component {
 
     constructor(props) {
         super(props);
-        const {location: {state: {from}}} = props
+        const {location} = props
+        const {pathname, search, hash} = location
+        const {from} = location.state || {from: {pathname: pathname, search: search, hash: hash}}
         this.redirectURL = window.location.origin + from.pathname + from.search + from.hash
-        // console.log(props.location);
         this.state = {
             loginWays: [
                 {