From b36bd95504344c65319edcfe100ab499a074e23d Mon Sep 17 00:00:00 2001 From: zhangds Date: Fri, 30 Sep 2022 14:44:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=88=97=E8=A1=A8table=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/coupon/commodity/index.jsx | 87 +++++++++++++--------------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/src/pages/coupon/commodity/index.jsx b/src/pages/coupon/commodity/index.jsx index f9c7210d..8d77fc1c 100644 --- a/src/pages/coupon/commodity/index.jsx +++ b/src/pages/coupon/commodity/index.jsx @@ -16,89 +16,84 @@ import "./style.less"; const tableColumn = [ { title: "商品编号", - name: "id", - prop: "id", + name: "product_id", + prop: "product_id", + className: "name", type: "normal", width: "auto", }, { title: "商品名称", - name: "product_name", prop: "product_name", + name: "product_name", + width: "200px", type: "normal", - width: "auto", }, { - title: "官方价", + title: "立减金平台批次号", + width: "200px", + prop: "channel_activity_id", + name: "channel_activity_id", + type: "normal", + }, + { + title: "上游平台", + width: "auto", + prop: "upstream", + name: "upstream", + type: "normal", + }, + { + title: "商品权重", + width: "auto", + prop: "weight", + name: "weight", + type: "normal", + }, + { + title: "有效时间段", + width: "500px", + prop: "effectDate", + name: "effectDate", + type: "normal", + }, + { + title: "官方价格", name: "official_price", prop: "official_price", type: "normal", width: "auto", }, { - title: "合同单价", + title: "合同价", name: "contract_price", + type: "normal", prop: "contract_price", - type: "normal", - width: "auto", - }, - { - title: "库存数量", - name: "quantity", - prop: "quantity", - type: "normal", - width: "auto", - }, - { - title: "批次号", - name: "channel_activity_id", - prop: "channel_activity_id", - type: "normal", - width: "auto", - }, - { - title: "总预算", - name: "all_budget", - prop: "all_budget", - type: "normal", - width: "auto", - }, - { - title: "有效时间段", - name: "effectDate", - prop: "effectDate", - type: "normal", width: "auto", }, { title: "创建时间", name: "create_time", - prop: "create_time", type: "normal", - width: "auto", + prop: "create_time", + width: "250px", }, { title: "类型", name: "product_type_text", + type: "normal", prop: "product_type_text", - type: "normal", - width: "auto", - }, - { - title: "上游平台", - name: "upstream", - prop: "upstream", - type: "normal", width: "auto", }, { title: "操作", - name: "opearo", prop: "opearo", + name: "opearo", type: "slot", width: "200px", }, ]; + const UseCouponCommodity = () => { const [state, setState] = useSetState({ tabList: [{ title: "商品范围列表", index: 0 }], From d259d8537e9951964d5a4b2bc22cf467c0d44d7e Mon Sep 17 00:00:00 2001 From: Apple <> Date: Fri, 30 Sep 2022 14:45:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style(=E8=90=BD=E5=9C=B0=E9=A1=B5=E7=BC=96?= =?UTF-8?q?=E8=BE=91)=EF=BC=9A=E8=B0=83=E6=95=B4=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=BC=A9=E6=94=BE=E6=A0=B7=E5=BC=8F=E6=AF=94?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.less | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/main.less b/src/pages/exchangepage/edittemplate/main.less index de05641e..474cea3f 100644 --- a/src/pages/exchangepage/edittemplate/main.less +++ b/src/pages/exchangepage/edittemplate/main.less @@ -552,7 +552,7 @@ } .detailstemplatescale{ .detailstemplate{ - transform: scale(0.31); + transform: scale(0.387); transform-origin: 0 0; img{ width: auto!important; @@ -563,8 +563,8 @@ } } .thumbheader { - width: 115px; - height: 158px; + width: 145px; + height: 200px; background: #F4F6F9; overflow: hidden; margin-top: 5px; @@ -578,16 +578,12 @@ .goodsList-item { .goodstemplate { - transform: scale(0.31); + transform: scale(0.387); transform-origin: 0 0; } .editor-main { top: 0; - - // img { - // width: auto !important; - // } } } From e6800826fd7f54bd3f10155149ab4a6eaa07e1d9 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Fri, 30 Sep 2022 15:01:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E6=A8=A1=E6=9D=BF)?= =?UTF-8?q?=EF=BC=9A=E4=BC=98=E6=83=A0=E5=88=B8=E5=9C=A8=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=96=B0=E5=A2=9E=E5=9B=BE=E7=89=87?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E7=9A=84?= =?UTF-8?q?=E9=99=90=E5=88=B612=E4=B8=AA=E5=AD=97=E7=AC=A6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA50=E4=B8=AA=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edittemplate/couponCard/goodsPage/config/picture.js | 2 +- src/pages/exchangepage/edittemplate/main.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js index 3e08eafe..215dddf8 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/picture.js @@ -131,7 +131,7 @@ export default class edittemplate extends React.Component { onClearItem={(e) => { this.setState({ jumpUrl: '' }) }} - value={this.state.jumpUrl} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'} /> + value={this.state.jumpUrl} placeholder={"请输入"} labelWidth={'0px'} maxLength={50} height={'36px'} width={'300px'} alignment={'left'} /> :null } diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index c9bfb3ef..f3a8e16e 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -167,6 +167,8 @@ 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){