Skip to content

M
mr-julyedu
Commit c963d3b1 by zhanghaozhe
Options

bug 77 80

parent 14fe0514
Showing with 86 additions and 77 deletions
src/App.js
...@@ -46,9 +46,14 @@ class App extends Component { ...@@ -46,9 +46,14 @@ class App extends Component {
this.props.setCurrentUser(this.transformUser(res)) this.props.setCurrentUser(this.transformUser(res))
}) })
const routeMatchRule = /binding-tel|forgot/
const {history} = this.props const {history} = this.props
history.listen(location => { 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}; location.state = {from: this.previousLocation};
} }
}) })
......
src/components/passport/setPassword/index.js
...@@ -16,6 +16,11 @@ import { connect } from "react-redux"; ...@@ -16,6 +16,11 @@ import { connect } from "react-redux";
class SetPassword extends Component { class SetPassword extends Component {
componentDidMount() {
console.log(this.props.location);
}
render() { render() {
let {values, errors, location} = this.props let {values, errors, location} = this.props
let {from} = location.state || {from: {pathname: '/'}} let {from} = location.state || {from: {pathname: '/'}}
......
src/components/sharePoster/index.scss
.share-poster { .share-poster {
.total-container { .total-container {
width: 100%; width: 100%;
background-color: $bg_000; background-color: $bg_000;
height: 420px; height: 420px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
.placard-img-container { .placard-img-container {
width: 100%; width: 100%;
height: 840px; height: 840px;
background: $bg_000; background: $bg_000;
padding-top: 20px; padding-top: 20px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
zoom: 0.5; text-align: center;
zoom: 0.5;
img { img {
position: absolute; height: 800px;
top: 50%; }
left: 50%; }
margin-left: -225px;
margin-top: -400px;
text-align: center;
}
}
.placard-code { .placard-code {
opacity: 0; opacity: 0;
}
} }
}
.placard-desc { .placard-desc {
width: 100%; width: 100%;
height: 45px; height: 45px;
background: $bg_000; background: $bg_000;
padding: 0 10px; padding: 0 10px;
.placard-sharetxt {
width: 100%; .placard-sharetxt {
height: 100%; width: 100%;
line-height: 20px; height: 100%;
display: inline-block; line-height: 20px;
font-size: 14px; display: inline-block;
color: $white; font-size: 14px;
color: $white;
.placard-price { .placard-price {
font-size: 14px; font-size: 14px;
color: $active; color: $active;
} }
}
} }
}
.placard-swiper { .placard-swiper {
width: 100%; width: 100%;
background-color: $white; background-color: $white;
.placard-list { .placard-list {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
li { li {
width: 64px; width: 64px;
height: 64px; height: 64px;
border-radius: 5px; border-radius: 5px;
line-height: 90px; line-height: 90px;
margin: 20px 15px; margin: 20px 15px;
img { img {
display: inline-block; display: inline-block;
width: 64px; width: 64px;
height: 64px; height: 64px;
border-radius: 5px; border-radius: 5px;
} }
} }
li.active { li.active {
width: 64px; width: 64px;
height: 64px; height: 64px;
background: url('./image/choose_pic.png') no-repeat center; background: url('./image/choose_pic.png') no-repeat center;
z-index: 1002; z-index: 1002;
background-size: 64px; background-size: 64px;
img { img {
opacity: 0.1; opacity: 0.1;
}
}
} }
}
} }
}
.hide { .hide {
display: none; display: none;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment