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

This commit is contained in:
zhangds 2022-09-19 12:05:09 +08:00
parent 42598e6854 f91182f41e
commit 3a8fdd7f44
4 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js
View File

@ -123,11 +123,11 @@ export default class Searchbar extends React.Component {
</FormItem> </FormItem>
<FormItem required={false} labelname="背景颜色:" labelwidth="80px"> <FormItem required={false} labelname="背景颜色:" labelwidth="80px">
<div className="colorItemfont dfleac"> <div className="colorItemfont dfleac">
<span style={{ border: '1px solid #f1f2f3' }} className={borderColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgColorFn('#fff') }}></span> <span style={{ border: '1px solid #f1f2f3' }} className={bgColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgColorFn('#fff') }}></span>
<span className={borderColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.bgColorFn('#04C160') }}></span> <span className={bgColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.bgColorFn('#04C160') }}></span>
<span className={borderColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.bgColorFn('#AE99D3') }}></span> <span className={bgColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.bgColorFn('#AE99D3') }}></span>
<span className={borderColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.bgColorFn('#FACD6A') }}></span> <span className={bgColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.bgColorFn('#FACD6A') }}></span>
<span className={borderColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.bgColorFn('#FE7962') }}></span> <span className={bgColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.bgColorFn('#FE7962') }}></span>
<div className="selfset"> <div className="selfset">
<ColorPicker className="setbgColor" color={bgColor} onChange={this.changebgColor} /> <ColorPicker className="setbgColor" color={bgColor} onChange={this.changebgColor} />
</div> </div>
@ -135,11 +135,11 @@ export default class Searchbar extends React.Component {
</FormItem> </FormItem>
<FormItem required={false} labelname="文字颜色:" labelwidth="80px"> <FormItem required={false} labelname="文字颜色:" labelwidth="80px">
<div className="colorItemfont dfleac"> <div className="colorItemfont dfleac">
<span style={{ border: '1px solid #f1f2f3' }} className={borderColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontColorFn('#fff') }}></span> <span style={{ border: '1px solid #f1f2f3' }} className={fontColor == '#fff' ? "cicle activecicle" : "cicle"} onClick={() => { this.fontColorFn('#fff') }}></span>
<span className={borderColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.fontColorFn('#04C160') }}></span> <span className={fontColor == '#04C160' ? "activecicle cicle cicle6" : "cicle cicle6"} onClick={() => { this.fontColorFn('#04C160') }}></span>
<span className={borderColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.fontColorFn('#AE99D3') }}></span> <span className={fontColor == '#AE99D3' ? "activecicle cicle cicle3" : "cicle cicle3"} onClick={() => { this.fontColorFn('#AE99D3') }}></span>
<span className={borderColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.fontColorFn('#FACD6A') }}></span> <span className={fontColor == '#FACD6A' ? "activecicle cicle cicle4" : "cicle cicle4"} onClick={() => { this.fontColorFn('#FACD6A') }}></span>
<span className={borderColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.fontColorFn('#FE7962') }}></span> <span className={fontColor == '#FE7962' ? "activecicle cicle cicle5" : "cicle cicle5"} onClick={() => { this.fontColorFn('#FE7962') }}></span>
<div className="selfset"> <div className="selfset">
<ColorPicker className="setbgColor" color={fontColor} onChange={this.changefontColor} /> <ColorPicker className="setbgColor" color={fontColor} onChange={this.changefontColor} />
</div> </div>

2
src/pages/exchangepage/couponTemplate/landingPage/config/main.js
View File

@ -284,7 +284,7 @@ export default class edittemplate extends React.Component {
/> />
</FormItem> </FormItem>
{ {
this.props.couponType==4&&this.state.model.middle_image? <FormItem labelname="输入框1:" labelwidth="100px"> this.props.couponType==4? <FormItem labelname="输入框1:" labelwidth="100px">
<ImageUpload <ImageUpload
className="zent-image-upload-demo" className="zent-image-upload-demo"
maxSize={5 * 1024 * 1024} maxSize={5 * 1024 * 1024}

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

@ -590,7 +590,6 @@ export default class edittemplate extends React.Component {
landConfig.bg_color = c landConfig.bg_color = c
this.setState({ model: landConfig }) this.setState({ model: landConfig })
} }
//
getlandftcolor(c) { getlandftcolor(c) {
let landConfig = this.state.model let landConfig = this.state.model
landConfig.font_color = c landConfig.font_color = c
@ -656,27 +655,26 @@ export default class edittemplate extends React.Component {
this.setState({ product_list: goodsConfig }) this.setState({ product_list: goodsConfig })
} }
onmodelChange(e) { onmodelChange(e) {
this.setState({ showType: e.target.value, activeNavStatus: 1 })
let editorData = _.cloneDeep(JSON.parse(sessionStorage.getItem('editorConfig'))) let editorData = _.cloneDeep(JSON.parse(sessionStorage.getItem('editorConfig')))
if (e.target.value == 1) { let holdData;
let whiteData = editorData.whiteList switch(e.target.value){
let { land, product_list, product_detail } = whiteData; case 1:
this.setState({ model: land, product_list, product_detail }) holdData= editorData.whiteList;
if (this.state.mouldType == 0) { break;
let whiteLand = whiteData.land case 3:
whiteLand.title = this.state.model.title holdData= editorData.exchangeList
this.setState({ model: whiteLand }) break;
} default:
} else if (e.target.value == 3) { let {activeNavStatus,showType,model}=this.state;
let exchangeData = editorData.exchangeList if(activeNavStatus==1&&[4,8].includes(showType)){//落地页
let { land, product_list, product_detail } = exchangeData; editorData.coupon.land=model;
this.setState({ model: land, product_list, product_detail }) }
} else{//优惠券+优惠券白名单 sessionStorage.setItem('editorConfig',JSON.stringify(editorData));
let couponData = editorData.coupon holdData= editorData.coupon
let { land, product_list, product_detail } = couponData; break;
console.log(222,this.state.model);
this.setState({ model: land, product_list, product_detail })
} }
let { land, product_list, product_detail } = holdData;
this.setState({ showType: e.target.value, activeNavStatus: 1,model: land, product_list, product_detail })
} }
onPreview() { onPreview() {
this.setState({ previewData: this.state }) this.setState({ previewData: this.state })

23
src/pages/order/list/list.js
View File

@ -148,18 +148,18 @@ const Column = [
type: "slot" type: "slot"
}, },
{ {
title: "折扣", title: "减扣价（元）",
name: "discount", name: "discount_amount",
prop: "discount_amount",
type: "normal", type: "normal",
prop: "discount",
width: "80px" width: "80px"
}, },
{ {
title: "结算", title: "结算价（元）",
name: "total", name: "pay_amount",
prop: "total", prop: "pay_amount",
width: "auto", type: "normal",
type: "80px" width: "80px"
}, },
{ {
title: "key", title: "key",
@ -198,11 +198,7 @@ export default class orderlist extends React.Component {
{ id: 111, name: "立减金-待领取" }, { id: 111, name: "立减金-待领取" },
{ id: 222, name: "立减金-已领取" }, { id: 222, name: "立减金-已领取" },
{ id: 5, name: "立减金-已过期" }, { id: 5, name: "立减金-已过期" },
{ id: 6, name: "优惠券-待支付" }, { id: 6, name: "优惠券-待支付" }
{ id: 7, name: "优惠券-已支付" },
{ id: 8, name: "优惠券-已完成" },
{ id: 9, name: "优惠券-已取消" },
{ id: 10, name: "优惠券-充值失败" }
] ]
} }
], ],
@ -583,6 +579,7 @@ export default class orderlist extends React.Component {
}) })
.catch((err) => {}) .catch((err) => {})
} }
optiononChange(e) { optiononChange(e) {
let placeholder let placeholder
let searchOption = Number(e ? e.key : 0) let searchOption = Number(e ? e.key : 0)