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

@@ -13,15 +13,11 @@
             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;
+                height: 800px;
             }
         }
 
@@ -35,6 +31,7 @@
         height: 45px;
         background: $bg_000;
         padding: 0 10px;
+
         .placard-sharetxt {
             width: 100%;
             height: 100%;
@@ -87,6 +84,7 @@
             }
         }
     }
+
     .hide {
         display: none;
     }