HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0

This commit is contained in:
wangsongsole 2022-10-17 17:56:52 +08:00
parent 13d3fb908c aa9ed7c934
commit 06136d9de5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/exchangepage/edittemplate/detailstemplate.js
View File

@ -15,7 +15,7 @@ export default class edittemplate extends React.Component{
<div className="detailstemplate_Xcenter" > <div className="detailstemplate_Xcenter" >
<div className="detailstemplate" style={{paddingBottom:'80px',boxSizing:'border-box'}}> <div className="detailstemplate" style={{paddingBottom:'80px',boxSizing:'border-box'}}>
<img src={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png'} className="preBtn"/> <img src={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png'} className="preBtn"/>
<img className="topBanner" src={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/detailtop.png'}/> <img className="topBanner" src={this.props.topImgshow?this.props.topImgshow:'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/detailtop.png'}/>
<p className="splitLine"></p> <p className="splitLine"></p>
<img className="iptbg" src={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/detailipt.png'}/> <img className="iptbg" src={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/detailipt.png'}/>
<p className="splitLine"></p> <p className="splitLine"></p>

2
src/pages/exchangepage/template/preview.js
View File

@ -275,7 +275,7 @@ export default class preview extends React.Component {
backPrepage={(c) => this.showactivedetail(c)} backPrepage={(c) => this.showactivedetail(c)}
goodsdata={propsData.product_detail} goodsdata={propsData.product_detail}
/> />
) : (<DetailView detaildata={propsData.product_detail} templateType={this.props.pageType}/>) ) : (<DetailView detaildata={propsData.product_detail} templateType={this.props.pageType} topImgshow={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/goodsbigPic.png'}/>)
) : null} ) : null}
{this.props.step == 4 ? ( {this.props.step == 4 ? (
<Couponreduce templateType={this.props.pageType} detaildata={propsData.product_detail}/> <Couponreduce templateType={this.props.pageType} detaildata={propsData.product_detail}/>