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 https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0

This commit is contained in:
zhangds 2022-11-07 15:25:32 +08:00
parent a0d33c3275 362edb14be
commit 2a7c152a8b
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/exchangecode/exchangecodeAdd/index.jsx
View File

@ -292,6 +292,7 @@ export default class exchangeAdd extends React.Component {
delete item1.total_stock delete item1.total_stock
delete item1.use_stock delete item1.use_stock
delete item1.stock delete item1.stock
delete item1.goods_id
} }
/* 编辑 */ /* 编辑 */
@ -310,6 +311,7 @@ export default class exchangeAdd extends React.Component {
if (item1?.goods_id) { if (item1?.goods_id) {
obj.id = item1?.goods_id obj.id = item1?.goods_id
} }
obj.product_id = item1?.goods_id obj.product_id = item1?.goods_id
obj.code_batch_id = item1?.code_batch_id obj.code_batch_id = item1?.code_batch_id
obj.product_type_text = "立减金" obj.product_type_text = "立减金"

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

@ -94,7 +94,7 @@ export default class edittemplate extends React.Component {
} }
{ {
goodsConfig.list == 2 ? <button className="exchageBtn" style={{ color: goodsConfig.font_color, background: goodsConfig.button_color }}> goodsConfig.list == 2 ? <button className="exchageBtn" style={{ color: goodsConfig.font_color, background: goodsConfig.button_color }}>
{goodsConfig.search ? '立即购买' : '立即兑换'} {goodsConfig.search ? '购买' : '立即兑换'}
</button> : null </button> : null
} }
{ {

4
src/pages/exchangepage/edittemplate/main.js
View File

@ -756,7 +756,7 @@ export default class edittemplate extends React.Component {
id='top' id='top'
/> />
<div className='hascode'> <div className='hascode'>
<img src={this.state.showType == 8 ? this.state.model.white_image ? this.state.model.white_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png' : this.state.model.middle_image ? this.state.model.middle_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png'} id='top' /> <img src={this.state.showType == 8 ? this.state.model.white_image ? this.state.model.white_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20221107/2c407b6b702ed2217e22f8df8a7c87e6.png' : this.state.model.middle_image ? this.state.model.middle_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20221107/2c407b6b702ed2217e22f8df8a7c87e6.png'} id='top' />
<div className='dflexajc thumbipt'> <div className='dflexajc thumbipt'>
<div style={{color:this.state.model.font_color}}>请输入{[1, 8].includes(this.state.showType)?'手机号':'兑换码'}</div> <div style={{color:this.state.model.font_color}}>请输入{[1, 8].includes(this.state.showType)?'手机号':'兑换码'}</div>
<div className='ipt-code' style={{color:this.state.model.font_color}}>请输入验证码</div> <div className='ipt-code' style={{color:this.state.model.font_color}}>请输入验证码</div>
@ -875,7 +875,7 @@ export default class edittemplate extends React.Component {
<img <img
crossOrigin='anonymous' crossOrigin='anonymous'
id='center-img' id='center-img'
src={this.state.showType == 8 ? this.state.model.white_image ? this.state.model.white_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png' : this.state.model.middle_image ? this.state.model.middle_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png'} src={this.state.showType == 8 ? this.state.model.white_image ? this.state.model.white_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20221107/2c407b6b702ed2217e22f8df8a7c87e6.png' : this.state.model.middle_image ? this.state.model.middle_image : 'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20221107/2c407b6b702ed2217e22f8df8a7c87e6.png'}
/> />
<div className='dflexajc ipt-user'> <div className='dflexajc ipt-user'>
<div style={{color:this.state.model.font_color}}>请输入{[1, 8].includes(this.state.showType)?'手机号':'兑换码'}</div> <div style={{color:this.state.model.font_color}}>请输入{[1, 8].includes(this.state.showType)?'手机号':'兑换码'}</div>

2
src/pages/exchangepage/edittemplate/main.less
View File

@ -459,7 +459,7 @@
width: 83px !important; width: 83px !important;
height: 43px; height: 43px;
position: absolute; position: absolute;
right: 20px; right: 28px;
top: 80px; top: 80px;
border-radius: 22px; border-radius: 22px;
} }

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

@ -19,7 +19,7 @@ export default class preview extends React.Component {
top_image: top_image:
"https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/59ba305520d3229e7fc53d5229bfec0c.png", "https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/59ba305520d3229e7fc53d5229bfec0c.png",
middle_image: middle_image:
"https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220105/5dd765e3b46042f7ecd8c576e6fa9568.png", "https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20221107/2c407b6b702ed2217e22f8df8a7c87e6.png",
}; };
} }
showactiveIcon(c) { showactiveIcon(c) {
@ -230,7 +230,7 @@ export default class preview extends React.Component {
background: propsData.product_list.button_color, background: propsData.product_list.button_color,
}} }}
> >
{goodsConfig.search ? '立即购买' : '立即兑换'} {goodsConfig.search ? '购买' : '立即兑换'}
</button> </button>
) : null} ) : null}
{propsData.product_list.describe.type == 1 ? ( {propsData.product_list.describe.type == 1 ? (