From 7ac263ecb4457cf2e1e36124c7f584aa1eb3bceb Mon Sep 17 00:00:00 2001 From: Apple <> Date: Mon, 17 Oct 2022 11:32:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E6=A8=A1=E6=9D=BF)?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=9C=A8=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E4=B8=AD=E4=B8=8A=E4=BC=A0=E8=83=8C=E6=99=AF=E5=9B=BE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=8A=A5=E9=94=99=EF=BC=88=E5=81=B6?= =?UTF-8?q?=E7=8E=B0bug=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index 1c77cb40..c1e7f9f3 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -687,9 +687,11 @@ export default class edittemplate extends React.Component { } componentWillUnmount() { + console.log('组件销毁'); if (document.querySelector('canvas')) { document.querySelector('canvas').remove() } + Bus.removeAllListeners(); } //组件名 componentName(c) { From ff234a06eff78fde6a14f52181bc7a978a61ac0b Mon Sep 17 00:00:00 2001 From: Apple <> Date: Mon, 17 Oct 2022 11:51:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?style:=E8=B0=83=E6=95=B4=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/comm.css | 4 +++- .../edittemplate/couponCard/goodsPage/config/picture.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/assets/comm.css b/src/assets/comm.css index bbbeae09..1682c731 100644 --- a/src/assets/comm.css +++ b/src/assets/comm.css @@ -100,7 +100,9 @@ .pdtrl20 { padding: 20px 20px 14px; } - +.pdt15 { + padding-top: 15px; +} .mt5 { margin-top: 5px; } diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js index 15dd25a1..8aa52597 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js @@ -104,8 +104,8 @@ export default class edittemplate extends React.Component {  商品列表页设置> 图片设置 -
-
+
+ Date: Mon, 17 Oct 2022 14:03:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style:=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E9=A2=84=E8=A7=88=E5=8C=BA=E5=9F=9F=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E5=9B=BE=E6=A1=88=E6=A0=B7=E5=BC=8F=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/main.less b/src/pages/exchangepage/edittemplate/main.less index 01e1da0f..03d04fcd 100644 --- a/src/pages/exchangepage/edittemplate/main.less +++ b/src/pages/exchangepage/edittemplate/main.less @@ -603,8 +603,8 @@ width: 30px !important; height: 13px !important; position: absolute; - top: 20px; - right: 7px; + top: 30px; + right: 10px; border-radius: 7px; } } From 5bb0066e97b33034fd24874ec799fc809fed37ea Mon Sep 17 00:00:00 2001 From: Apple <> Date: Mon, 17 Oct 2022 14:22:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(=E6=A8=A1=E6=9D=BF=E4=B8=AD=E5=BF=83):?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BF=E4=B8=AD=E5=BF=83=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E3=80=90=E4=BD=BF=E7=94=A8=E3=80=91=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91=E5=99=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20style:=E6=B8=85=E9=99=A4console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../couponCard/couponDetailconfig.js | 1 - .../couponCard/couponViewConfig/bottomBar.js | 1 - .../goodsPage/config/backPicture.js | 2 -- .../couponCard/goodsPage/config/bottomBar.js | 2 -- .../couponCard/goodsPage/config/main.js | 1 - .../couponCard/goodsPage/config/picture.js | 1 - .../couponCard/goodsPage/config/searchBar.js | 2 -- .../couponCard/goodsPage/config/title.js | 2 -- .../edittemplate/couponCard/landPage.js | 1 - .../edittemplate/exchange/detailsPage.js | 1 - .../edittemplate/exchange/goodsPage.js | 1 - .../edittemplate/exchange/landingPage.js | 1 - .../edittemplate/goodstemplate.js | 1 - src/pages/exchangepage/edittemplate/main.js | 7 ------- src/pages/exchangepage/edittemplate/reduce.js | 1 - .../edittemplate/whiteList/whiteLand.js | 1 - .../edittemplate/whiteList/whitedetails.js | 1 - .../edittemplate/whiteList/whitegoods.js | 1 - src/pages/exchangepage/main/main.js | 6 +----- src/pages/exchangepage/template/main.js | 21 +++++++++++-------- src/pages/exchangepage/template/preview.js | 1 - src/pages/login/loginform.js | 1 - 22 files changed, 13 insertions(+), 44 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/couponCard/couponDetailconfig.js b/src/pages/exchangepage/edittemplate/couponCard/couponDetailconfig.js index 586fb0f0..43ee0802 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/couponDetailconfig.js +++ b/src/pages/exchangepage/edittemplate/couponCard/couponDetailconfig.js @@ -84,7 +84,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { reject(); diff --git a/src/pages/exchangepage/edittemplate/couponCard/couponViewConfig/bottomBar.js b/src/pages/exchangepage/edittemplate/couponCard/couponViewConfig/bottomBar.js index 4976e6c8..96c46dd6 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/couponViewConfig/bottomBar.js +++ b/src/pages/exchangepage/edittemplate/couponCard/couponViewConfig/bottomBar.js @@ -58,7 +58,6 @@ export default class bottomBar extends React.Component { } } render() { - console.log(53,this.state); let active=this.state.active; return (
    diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js index b3ca621f..a964aaa2 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/backPicture.js @@ -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 { diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js index 3a2a6b9b..47e6fbd9 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js @@ -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}) } diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js index 464d0d4b..45e5cd94 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/main.js @@ -125,7 +125,6 @@ export default class couponGoodConfig extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js index 8aa52597..5da56034 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js @@ -76,7 +76,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { reject(); diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/searchBar.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/searchBar.js index 957d200a..76815f95 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/searchBar.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/searchBar.js @@ -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 (
    diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/title.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/title.js index ed7062e3..5e073c37 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/title.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/title.js @@ -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 { diff --git a/src/pages/exchangepage/edittemplate/couponCard/landPage.js b/src/pages/exchangepage/edittemplate/couponCard/landPage.js index f00d4bf4..e9d23c3c 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/landPage.js +++ b/src/pages/exchangepage/edittemplate/couponCard/landPage.js @@ -122,7 +122,6 @@ export default class couponLandpage extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { diff --git a/src/pages/exchangepage/edittemplate/exchange/detailsPage.js b/src/pages/exchangepage/edittemplate/exchange/detailsPage.js index 43b0f991..096208e6 100644 --- a/src/pages/exchangepage/edittemplate/exchange/detailsPage.js +++ b/src/pages/exchangepage/edittemplate/exchange/detailsPage.js @@ -82,7 +82,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { reject(); diff --git a/src/pages/exchangepage/edittemplate/exchange/goodsPage.js b/src/pages/exchangepage/edittemplate/exchange/goodsPage.js index bfea8f0c..ed598ed6 100644 --- a/src/pages/exchangepage/edittemplate/exchange/goodsPage.js +++ b/src/pages/exchangepage/edittemplate/exchange/goodsPage.js @@ -120,7 +120,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { diff --git a/src/pages/exchangepage/edittemplate/exchange/landingPage.js b/src/pages/exchangepage/edittemplate/exchange/landingPage.js index b22683e7..dae6850d 100644 --- a/src/pages/exchangepage/edittemplate/exchange/landingPage.js +++ b/src/pages/exchangepage/edittemplate/exchange/landingPage.js @@ -173,7 +173,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { diff --git a/src/pages/exchangepage/edittemplate/goodstemplate.js b/src/pages/exchangepage/edittemplate/goodstemplate.js index b698e240..327942f4 100644 --- a/src/pages/exchangepage/edittemplate/goodstemplate.js +++ b/src/pages/exchangepage/edittemplate/goodstemplate.js @@ -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 }); diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index c1e7f9f3..958540c4 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -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 }) @@ -687,7 +682,6 @@ export default class edittemplate extends React.Component { } componentWillUnmount() { - console.log('组件销毁'); if (document.querySelector('canvas')) { document.querySelector('canvas').remove() } @@ -698,7 +692,6 @@ export default class edittemplate extends React.Component { this.setState({ componentOfconfig: c }); } render() { - console.log(761, this.state); return (
    diff --git a/src/pages/exchangepage/edittemplate/reduce.js b/src/pages/exchangepage/edittemplate/reduce.js index ca9d8a74..da940841 100644 --- a/src/pages/exchangepage/edittemplate/reduce.js +++ b/src/pages/exchangepage/edittemplate/reduce.js @@ -13,7 +13,6 @@ export default class edittemplate extends React.Component { this.props.opendesc(true) } render() { - console.log(16,this.props.detaildata); return (
    diff --git a/src/pages/exchangepage/edittemplate/whiteList/whiteLand.js b/src/pages/exchangepage/edittemplate/whiteList/whiteLand.js index f0f302bb..35e3a3f9 100644 --- a/src/pages/exchangepage/edittemplate/whiteList/whiteLand.js +++ b/src/pages/exchangepage/edittemplate/whiteList/whiteLand.js @@ -116,7 +116,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { reject(); diff --git a/src/pages/exchangepage/edittemplate/whiteList/whitedetails.js b/src/pages/exchangepage/edittemplate/whiteList/whitedetails.js index f91e6c50..a1592076 100644 --- a/src/pages/exchangepage/edittemplate/whiteList/whitedetails.js +++ b/src/pages/exchangepage/edittemplate/whiteList/whitedetails.js @@ -86,7 +86,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { diff --git a/src/pages/exchangepage/edittemplate/whiteList/whitegoods.js b/src/pages/exchangepage/edittemplate/whiteList/whitegoods.js index 2f1215d6..3741faf1 100644 --- a/src/pages/exchangepage/edittemplate/whiteList/whitegoods.js +++ b/src/pages/exchangepage/edittemplate/whiteList/whitegoods.js @@ -117,7 +117,6 @@ export default class edittemplate extends React.Component { count += 2; report(count); setTimeout(update, 500); - console.log("上传中") } else { diff --git a/src/pages/exchangepage/main/main.js b/src/pages/exchangepage/main/main.js index 4a67c4d3..20fbbcc8 100644 --- a/src/pages/exchangepage/main/main.js +++ b/src/pages/exchangepage/main/main.js @@ -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') { diff --git a/src/pages/exchangepage/template/main.js b/src/pages/exchangepage/template/main.js index 2d427cc8..cfec1ff6 100644 --- a/src/pages/exchangepage/template/main.js +++ b/src/pages/exchangepage/template/main.js @@ -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() { diff --git a/src/pages/exchangepage/template/preview.js b/src/pages/exchangepage/template/preview.js index d38aff5a..0a57ea4a 100644 --- a/src/pages/exchangepage/template/preview.js +++ b/src/pages/exchangepage/template/preview.js @@ -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); diff --git a/src/pages/login/loginform.js b/src/pages/login/loginform.js index 0ce5a4b8..35de9f4b 100644 --- a/src/pages/login/loginform.js +++ b/src/pages/login/loginform.js @@ -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)