Merge branch 'master' of gitlab.com:asacreative/redemption-point/new-frontend-customer-redemption-point

This commit is contained in:
2019-01-06 15:43:50 +07:00
12 changed files with 122 additions and 195 deletions

View File

@@ -25,7 +25,13 @@ export default class ModalVouchersComponent extends React.Component {
componentDidMount() {}
render() {
const {data, isVisible = false, onOk = () => {}, onCancel = () => {}, title='Modal'} = this.props;
const {data = {}, isVisible = false, onOk = () => {}, onCancel = () => {}, title='Modal'} = this.props;
let image = ''
if(data.images.logo.includes('http')){
image = data.images.logo;
}else{
image = this.http.appendImagePath(data.images.logo);
}
return (
<Modal
@@ -53,7 +59,7 @@ export default class ModalVouchersComponent extends React.Component {
// background: data.background_color || '#aaa',
flex: 0.3
}}>
<img className={'imageModal'} src={this.http.appendImagePath(data.images.logo)} />
<img className={'imageModal'} src={image} />
<p className={'titleModal'}>{data.name} }</p>
</div>
<div style={{