Merge branch 'international-phone-number' into pre

# Conflicts:
#	src/App.js
#	src/components/passport/index.js

src/App.js

@@ -37,6 +37,10 @@ class App extends Component {
         ...this.props.location
     }
 
+    records = []
+
+    firstLoad = true
+
     componentDidMount() {
         // 友盟统计
         const script = document.createElement('script');
@@ -44,7 +48,7 @@ class App extends Component {
         script.language = 'JavaScript';
         document.body.appendChild(script);
 
-        this.setNavigationRecord(this.props.location)
+        this.setNavigationRecord(this.props.location, this.props.history.action)
 
 
         //平台信息
@@ -57,9 +61,10 @@ class App extends Component {
         this.utm()
         const routeMatchRule = /binding-tel|forgot|set-password/
         const {history} = this.props
-        history.listen((location) => {
+        history.listen((location, action) => {
             this.utm()
-            this.setNavigationRecord(location)
+            this.firstLoad = false
+            this.setNavigationRecord(location, action)
             if (cookie.get('uid') && this.props.user.hasError) {
                 this.getUser()
             }
@@ -71,6 +76,7 @@ class App extends Component {
                 location.state = {from: this.previousLocation};
             } else {
                 this.removeShareCodeCookie()
+                location.state = {...location.state, ...{from: this.previousLocation}};
             }
         })
 
@@ -81,17 +87,23 @@ class App extends Component {
         cookie.remove('share_code', {path: '/', domain: '.julyedu.com'})
     }
 
-    setNavigationRecord = (location) => {
-        let {location: _location} = this.props
-        let {state: _state = {}} = _location
-        let {state = {}} = location
-        location.state = {
-            ...state, ...{
-                record: _state.record ?
-                    [..._state.record, {pathname: location.pathname, search: location.search, hash: location.hash}] :
-                    [{pathname: location.pathname, search: '', hash: ''}]
-            }
+    setNavigationRecord = (location, action) => {
+        const {pathname, search, hash} = location
+        let isLastRecord = location.pathname === this.records.length && this.records[this.records.length - 1].pathname
+        switch (action) {
+            case 'POP':
+                this.firstLoad ? this.records.push({pathname, search, hash}) : this.records.pop()
+                break
+            case 'REPLACE':
+                this.records[this.records.length - 1] = {pathname, search, hash}
+                break
+            default:
+                !isLastRecord && this.records.push({pathname, search, hash})
         }
+
+        location.state && location.state.records
+            ? (location.state.records = this.records)
+            : (location.state = {records: this.records})
     }
 
 
@@ -157,15 +169,33 @@ class App extends Component {
     }
 
     componentDidUpdate() {
-        const {location} = this.props
-        this.previousLocation = location.pathname.startsWith('/passport') ?
-            this.previousLocation.pathname === '/' ? location : this.previousLocation : location
+
+        this.setPreviousLocation()
 
         if (!this.props.user.hasError && getParam('redirect')) {
             window.location.href = getParam('redirect')
         }
     }
 
+    setPreviousLocation = () => {
+        const {location, history: {action}} = this.props
+
+        if (location.pathname.startsWith('/passport')) {
+            let index = this.records.findIndex(item => item.pathname.startsWith('/passport'))
+            this.previousLocation = index > 0
+                ? this.records[index - 1]
+                : this.records.length
+                    ? this.records[this.records.length - 1]
+                    : null
+        } else {
+             if (action === 'POP' || action === 'REPLACE') {
+                 let index = this.records.findIndex(item => item.pathname.startsWith('/passport'))
+                 this.previousLocation = index > 0 ? this.records[index - 1] : this.records[this.records.length - 1]
+             } else {
+                 this.previousLocation = location
+             }
+        }
+    }
 
     transformUser = res => {
         let payload

src/common/HeaderBar/index.js

@@ -13,7 +13,7 @@ class HeaderBar extends Component {
         if(browser.isWeixin && getParam('code') && getParam('state')){
             window.history.go(-2)
         }
-        if(state.record && state.record.length > 1){
+        if(state.records && state.records.length > 1){
             window.history.go(-1);
         }else{
             window.location.href = window.location.origin