Merge branch 'goback' into pre

src/App.js

@@ -63,7 +63,7 @@ class App extends Component {
       if (cookie.get('uid') && this.props.user.hasError) {
         this.getUser()
       }
-            if(location.pathname==='/passport'){
+      if (location.pathname === '/passport') {
         window.localStorage.setItem('binding_redirect', JSON.stringify(this.previousLocation))
       }
       const {pathname, state} = location
@@ -101,10 +101,15 @@ class App extends Component {
   setNavigationRecord = (location, action) => {
     const {pathname, search, hash} = location
     let isLastRecord = location.pathname === (this.records.length && this.records[this.records.length - 1].pathname)
+    let needHistoryMutation = location.pathname !== this.previousLocation.pathname
 
     switch (action) {
       case 'POP':
+        if (needHistoryMutation) {
           this.firstLoad ? this.records.push({pathname, search, hash}) : this.records.pop()
+        } else {
+          this.records[this.records.length - 1] = location
+        }
         break
       case 'REPLACE':
         this.records.length > 1 && (this.records[this.records.length - 1] = {pathname, search, hash})
@@ -159,7 +164,7 @@ class App extends Component {
 
       //针对2019双旦活动特殊处理，活动结束后删掉
       //treasure_code=3538333139312c31&origin=2&aa=bb&code=0211aiYB1VVOL60rmWWB1367YB11aiY7&state=STATE
-            if(getParam('treasure_code') == '3538333139312c31' && code == '0211aiYB1VVOL60rmWWB1367YB11aiY7'){
+      if (getParam('treasure_code') == '3538333139312c31' && code == '0211aiYB1VVOL60rmWWB1367YB11aiY7') {
         return
       }