diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js index 24b7059b..5e248755 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js @@ -10,7 +10,7 @@ export default class backPicture extends React.Component { constructor(props) { super(props) this.state = { - bgimg: '', + bgImg: '', bgColor: '#f2f3f4' } } @@ -18,9 +18,8 @@ export default class backPicture extends React.Component { componentWillMount(e) { let config = JSON.parse(sessionStorage.getItem('editorConfig')); if (config && config.coupon && config.coupon.product_list) { - let bgimg = config.coupon.product_list.backgroundImg.bgImg; - let {bgColor} = config.coupon.product_list.backgroundImg; - this.setState({ bgimg,bgColor }); + let {bgColor,bgImg} = config.coupon.product_list.backgroundImg; + this.setState({ bgImg,bgColor }); } } bgColorFn(color){ @@ -36,7 +35,7 @@ export default class backPicture extends React.Component { if (files.length > 0 && files[0].status == "success") { bgImage=files[0].src; } - this.setState({ bgimg: bgImage }) + this.setState({ bgImg: bgImage }) Bus.emit('bgImgConfig',{attr:'bgImg',value:bgImage}) }; @@ -119,7 +118,7 @@ export default class backPicture extends React.Component { tips="单张图片不超过 5M" onChange={(e) => { this.onUploadChange(e) }} onUpload={this.onUpload} - defaultFileList={this.state.bgimg ? [{ 'src': this.state.bgimg }] : null} + defaultFileList={this.state.bgImg ? [{ 'src': this.state.bgImg }] : null} onError={this.onUploadError} /> diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js index 215dddf8..b01dad97 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js @@ -11,7 +11,7 @@ export default class edittemplate extends React.Component { constructor(props) { super(props) this.state = { - iswitch:true, + iswitch:1, img:'', jumpType:'0',//0不跳转 1跳转 jumpUrl:'' diff --git a/src/pages/exchangepage/edittemplate/main.less b/src/pages/exchangepage/edittemplate/main.less index 99ec7b39..01e1da0f 100644 --- a/src/pages/exchangepage/edittemplate/main.less +++ b/src/pages/exchangepage/edittemplate/main.less @@ -555,9 +555,6 @@ .detailstemplate{ transform: scale(0.387); transform-origin: 0 0; - img{ - width: auto!important; - } .iptbg{ width: 100%!important; }