bug 77 80

src/App.js

@@ -46,9 +46,14 @@ class App extends Component {
             this.props.setCurrentUser(this.transformUser(res))
         })
 
+        const routeMatchRule = /binding-tel|forgot/
         const {history} = this.props
         history.listen(location => {
-            if (location.pathname.startsWith('/passport')) {
+            const {pathname} = location
+            if (pathname.startsWith('/passport')) {
+                if(routeMatchRule.test(pathname)){
+                    return
+                }
                 location.state = {from: this.previousLocation};
             }
         })

src/components/passport/setPassword/index.js

@@ -16,6 +16,11 @@ import { connect } from "react-redux";
 
 class SetPassword extends Component {
 
+    componentDidMount() {
+        console.log(this.props.location);
+    }
+
+
     render() {
         let {values, errors, location} = this.props
         let {from} = location.state || {from: {pathname: '/'}}

src/components/sharePoster/index.scss

 .share-poster {
-  .total-container {
-    width: 100%;
-    background-color: $bg_000;
-    height: 420px;
-    overflow: hidden;
-    position: relative;
+    .total-container {
+        width: 100%;
+        background-color: $bg_000;
+        height: 420px;
+        overflow: hidden;
+        position: relative;
 
-    .placard-img-container {
-      width: 100%;
-      height: 840px;
-      background: $bg_000;
-      padding-top: 20px;
-      overflow: hidden;
-      position: relative;
-      zoom: 0.5;
+        .placard-img-container {
+            width: 100%;
+            height: 840px;
+            background: $bg_000;
+            padding-top: 20px;
+            overflow: hidden;
+            position: relative;
+            text-align: center;
+            zoom: 0.5;
 
-      img {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        margin-left: -225px;
-        margin-top: -400px;
-        text-align: center;
-      }
-    }
+            img {
+                height: 800px;
+            }
+        }
 
-    .placard-code {
-      opacity: 0;
+        .placard-code {
+            opacity: 0;
+        }
     }
-  }
 
-  .placard-desc {
-    width: 100%;
-    height: 45px;
-    background: $bg_000;
-    padding: 0 10px;
-    .placard-sharetxt {
-      width: 100%;
-      height: 100%;
-      line-height: 20px;
-      display: inline-block;
-      font-size: 14px;
-      color: $white;
+    .placard-desc {
+        width: 100%;
+        height: 45px;
+        background: $bg_000;
+        padding: 0 10px;
+
+        .placard-sharetxt {
+            width: 100%;
+            height: 100%;
+            line-height: 20px;
+            display: inline-block;
+            font-size: 14px;
+            color: $white;
 
-      .placard-price {
-        font-size: 14px;
-        color: $active;
-      }
+            .placard-price {
+                font-size: 14px;
+                color: $active;
+            }
+        }
     }
-  }
 
-  .placard-swiper {
-    width: 100%;
-    background-color: $white;
+    .placard-swiper {
+        width: 100%;
+        background-color: $white;
 
-    .placard-list {
-      display: flex;
-      justify-content: center;
-      align-items: center;
+        .placard-list {
+            display: flex;
+            justify-content: center;
+            align-items: center;
 
-      li {
-        width: 64px;
-        height: 64px;
-        border-radius: 5px;
-        line-height: 90px;
-        margin: 20px 15px;
+            li {
+                width: 64px;
+                height: 64px;
+                border-radius: 5px;
+                line-height: 90px;
+                margin: 20px 15px;
 
-        img {
-          display: inline-block;
-          width: 64px;
-          height: 64px;
-          border-radius: 5px;
-        }
-      }
+                img {
+                    display: inline-block;
+                    width: 64px;
+                    height: 64px;
+                    border-radius: 5px;
+                }
+            }
 
-      li.active {
-        width: 64px;
-        height: 64px;
-        background: url('./image/choose_pic.png') no-repeat center;
-        z-index: 1002;
-        background-size: 64px;
+            li.active {
+                width: 64px;
+                height: 64px;
+                background: url('./image/choose_pic.png') no-repeat center;
+                z-index: 1002;
+                background-size: 64px;
 
-        img {
-          opacity: 0.1;
+                img {
+                    opacity: 0.1;
+                }
+            }
         }
-      }
     }
-  }
-  .hide {
-    display: none;
-  }
+
+    .hide {
+        display: none;
+    }
 }
\ No newline at end of file