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-10-17 15:31:54 +08:00
parent a5305cec9c 5bb0066e97
commit 36e5064568
24 changed files with 21 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/comm.css
View File

@ -100,7 +100,9 @@
.pdtrl20 {
padding: 20px 20px 14px;
}
.pdt15 {
padding-top: 15px;
}
.mt5 {
margin-top: 5px;
}

1
src/pages/exchangepage/edittemplate/couponCard/couponDetailconfig.js
View File

@ -84,7 +84,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {
reject();

1
src/pages/exchangepage/edittemplate/couponCard/couponViewConfig/bottomBar.js
View File

@ -58,7 +58,6 @@ export default class bottomBar extends React.Component {
}
}
render() {
console.log(53,this.state);
let active=this.state.active;
return (
<ul className='bottomBar-view' style={{ background:this.props.bottomBarConfig.background? `url('${this.props.bottomBarConfig.background}') center center /cover`:'#f9f9f9'}}>

2
src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js
View File

@ -48,7 +48,6 @@ export default class backPicture extends React.Component {
};
onUpload = (file, report) => {
let self = this;
console.log('上传头像', file);
return new Promise((resolve, reject) => {
let path = ""
let formdata = new FormData();
@ -78,7 +77,6 @@ export default class backPicture extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

2
src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js
View File

@ -40,7 +40,6 @@ export default class edittemplate extends React.Component {
}
}
changeConfig(attr,value){
console.log(36,attr,value);
this.setState({ [attr]: value })
Bus.emit('bottomBarConfig', {attr,value})
}
@ -83,7 +82,6 @@ export default class edittemplate extends React.Component {
let model = this.state.navlist;
model[index].iswitch = checked?1:0;
this.setState({ navlist: model })
console.log(86,model);
Bus.emit('bottomBarConfig', {attr:'navlist',value:model})
}

1
src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js
View File

@ -125,7 +125,6 @@ export default class couponGoodConfig extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

5
src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js
View File

@ -76,7 +76,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {
reject();
@ -104,8 +103,8 @@ export default class edittemplate extends React.Component {
<span className="setConfig-title">&emsp;商品列表页设置&gt; 图片设置</span>
</div>
</div>
<div style={{ width: "92%", "margin": "0 auto", "overflow": "auto", "maxHeight": "100%" }}>
<Form model={this.state} ref="form1">
<div style={{ width: "92%", "margin": "0 auto", "overflow": "auto", "maxHeight": "100%" }} className="pdt15">
<Form model={this.state}>
<FormItem labelname="添加图片:" labelwidth="100px">
<ImageUpload
className="zent-image-upload-demo"

2
src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/searchBar.js
View File

@ -28,7 +28,6 @@ export default class Searchbar extends React.Component {
}
//形状+颜色+框体颜色+背景颜色+文字颜色
changeConfig(attr,value){
console.log(36,attr,value);
this.setState({ [attr]: value })
Bus.emit('searchBarConfig', {attr,value})
}
@ -41,7 +40,6 @@ export default class Searchbar extends React.Component {
sessionStorage.setItem('editorConfig', JSON.stringify(oldobj));
}
render() {
console.log(83,this.state);
let { shape, textAlign, borderColor, placeholder,bgColor,fontColor } = this.state;
return (
<div className="assembly">

2
src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/title.js
View File

@ -27,7 +27,6 @@ export default class Title extends React.Component {
}
}
changeConfig(attr,value){
console.log(36,attr,value);
this.setState({ [attr]: value })
Bus.emit('titleBarConfig', {attr,value})
}
@ -78,7 +77,6 @@ export default class Title extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

1
src/pages/exchangepage/edittemplate/couponCard/landPage.js
View File

@ -122,7 +122,6 @@ export default class couponLandpage extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

1
src/pages/exchangepage/edittemplate/exchange/detailsPage.js
View File

@ -82,7 +82,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {
reject();

1
src/pages/exchangepage/edittemplate/exchange/goodsPage.js
View File

@ -120,7 +120,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

1
src/pages/exchangepage/edittemplate/exchange/landingPage.js
View File

@ -173,7 +173,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

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

@ -23,7 +23,6 @@ export default class edittemplate extends React.Component {
customComponent(e, name, icon, comName) {
//getBoundingClientRect().top ;获取div最顶边距离浏览器的位置
let offset_top = this.refs[name].getBoundingClientRect().top;
console.log(25, offset_top - 125);
this.setState({ clientY: (offset_top - 125), selectDom: name, icon: icon, comName });
if (name == 'searchBar') {
this.setState({ clientY: 0 });

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

@ -173,8 +173,6 @@ export default class edittemplate extends React.Component {
Bus.addListener('componentLib', (prop) => {
let couponEditorInfo = _.cloneDeep(JSON.parse(sessionStorage.getItem('editorConfig')))
let coupongoodsConfig = this.state.product_list
console.log('coupongoodsConfig',coupongoodsConfig);
console.log('prop.attr',prop.attr);
coupongoodsConfig[prop.attr].iswitch = prop.value
this.setState({ product_list: coupongoodsConfig })
if(prop.value==0){
@ -212,7 +210,6 @@ export default class edittemplate extends React.Component {
})
//底部栏
Bus.addListener('bottomBarConfig', (prop) => {
console.log(203,prop);
let bottomConfig = this.state.product_list
bottomConfig.bottomBar[prop.attr] = prop.value;
this.setState({ product_list: bottomConfig })
@ -379,7 +376,6 @@ export default class edittemplate extends React.Component {
formdata.exchange = _.omit(infoExchange,['land[sort]','land[title]','thumb'])//优惠券
formdata.access_conf = infoWhite
formdata.coupon = infoCoupon
console.log(387,formdata);
if (myInfoData) {
//编辑
putSystemTemplate(myInfoData.id, formdata).then((res) => {
@ -517,7 +513,6 @@ export default class edittemplate extends React.Component {
}
//获取落地页数据
getlandConfig(c) {
console.log(578);
let landConfig = this.state.model
landConfig[c.attr] = c.value;
this.setState({ model: landConfig })
@ -690,13 +685,13 @@ export default class edittemplate extends React.Component {
if (document.querySelector('canvas')) {
document.querySelector('canvas').remove()
}
Bus.removeAllListeners();
}
//组件名
componentName(c) {
this.setState({ componentOfconfig: c });
}
render() {
console.log(761, this.state);
return (
<div className='edittemplate'>
<div className='topHeader'>

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

@ -603,8 +603,8 @@
width: 30px !important;
height: 13px !important;
position: absolute;
top: 20px;
right: 7px;
top: 30px;
right: 10px;
border-radius: 7px;
}
}

1
src/pages/exchangepage/edittemplate/reduce.js
View File

@ -13,7 +13,6 @@ export default class edittemplate extends React.Component {
this.props.opendesc(true)
}
render() {
console.log(16,this.props.detaildata);
return (
<div className="editor-main goodstemplate details-reduce">
<img src={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png'} className="preBtn" />

1
src/pages/exchangepage/edittemplate/whiteList/whiteLand.js
View File

@ -116,7 +116,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {
reject();

1
src/pages/exchangepage/edittemplate/whiteList/whitedetails.js
View File

@ -86,7 +86,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

1
src/pages/exchangepage/edittemplate/whiteList/whitegoods.js
View File

@ -117,7 +117,6 @@ export default class edittemplate extends React.Component {
count += 2;
report(count);
setTimeout(update, 500);
console.log("上传中")
}
else {

6
src/pages/exchangepage/main/main.js
View File

@ -317,13 +317,9 @@ export default class acclist extends React.Component {
width={'260px'}
alignment={'left'}
onClearItem={(e) => {
console.log('清空')
this.setState({ key_word: '' })
}}
onChange={(e) => {
console.log(777777)
console.log(e)
this.setState({ key_word: e })
}}
wordSearch={(e) => {
@ -350,7 +346,7 @@ export default class acclist extends React.Component {
this.pageChange(e)
}}
checkChange={(selection) => {
console.log(selection)
}}
ComponentHandler={(com, rowData) => {
if (com == 'thumb') {

21
src/pages/exchangepage/template/main.js
View File

@ -154,7 +154,6 @@ export default class mytemplate extends React.Component {
if(e) data.type_id=e;
getSystemTemplate(data).then(res => {
handelResponse(res, (req) => {
console.log(req)
this.setState({ system_template: req.data })
if (req.data.length < 10) {
this.setState({ endreq: false });
@ -209,7 +208,6 @@ export default class mytemplate extends React.Component {
}
}
}
console.log(14,previewInfo);
this.setState({ preview_visible: true,previewData:previewInfo, showType: row.page,moudleData: row, showPage: 1, pageStep: 1, activeHeight: 667, setStyle: { width: '375px', height: '667px', transform: 'scale(0.75)' } });
}
onUse(row, type) {
@ -224,6 +222,12 @@ export default class mytemplate extends React.Component {
sessionStorage.setItem("pageInfo", JSON.stringify(row))
sessionStorage.setItem("isSort", 0)
sessionStorage.setItem('pageChange', 0);
sessionStorage.setItem('mouldType', 1);
if (type) {
window.location.href = "/#/edittemplate?type=" + type;
} else {
window.location.href = "/#/edittemplate?type=" + row.page;
}
}, () => {
})
}).catch(() => {
@ -231,13 +235,12 @@ export default class mytemplate extends React.Component {
}else {
sessionStorage.setItem("pageInfo", JSON.stringify(row))
sessionStorage.setItem('pageChange', 1);
}
sessionStorage.setItem('mouldType', 1);
if (type) {
window.location.href = "/#/edittemplate?type=" + type;
} else {
window.location.href = "/#/edittemplate?type=" + row.page;
sessionStorage.setItem('mouldType', 1);
if (type) {
window.location.href = "/#/edittemplate?type=" + type;
} else {
window.location.href = "/#/edittemplate?type=" + row.page;
}
}
}
toTop() {

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

@ -53,7 +53,6 @@ export default class preview extends React.Component {
render() {
let propsData = this.props.data;
let goodsConfig = propsData.product_list;
console.log(56,goodsConfig);
let naVisual = [];
if (goodsConfig&&goodsConfig.bottomBar) {
naVisual = goodsConfig.bottomBar.navlist.filter((item) => item.iswitch==1);

1
src/pages/login/loginform.js
View File

@ -83,7 +83,6 @@ const getAccountList = () => {
sessionStorage.setItem("showflag", true);
let menuList = response.menu;
if (response.menu && response.menu.length > 0) {
console.log(105,menuList);
sessionStorage.setItem(
"activeMenu",
JSON.stringify(response.menu)