From 5318ba921023ba7f9ca8cbd66b1e9143302f2da0 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Thu, 13 Oct 2022 10:26:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E3=80=90=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=90=A5=E9=94=80=E6=A8=A1=E6=9D=BF=E3=80=91=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=90=8C=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=97=B6=E4=BC=A0=E5=80=BC=E4=B8=8E=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index d2bdbb12..f62eed00 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -350,7 +350,10 @@ export default class edittemplate extends React.Component { //系统模板 this.setState({ activeNavStatus: 1 }) if (this.state.showType != 3) { - this.onmodelChange({ target: { value: 3 } }) + Notify.clear(); + Notify.error('请切换至兑换码保存') + self.setState({ loading_visible: false }) + return } } this.canvasImg.style.display = 'block' From 55b65d77e8457cb76d7edc5bb616652705a9ae70 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Thu, 13 Oct 2022 10:55:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?style:=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=93=8D=E4=BD=9C=E6=A0=8F=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/order/list/list.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index ad276a0f..26dafb0e 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -125,6 +125,13 @@ const Column = [ type: "slot", width: "80px" }, + { + title: "操作", + prop: "opearo", + name: "opearo", + type: "slot", + width: "140px" + }, { title: "平台批次号", name: "channel_activity_id", @@ -180,13 +187,6 @@ const Column = [ prop: "key", width: "140px", type: "normal" - }, - { - title: "操作", - prop: "opearo", - name: "opearo", - type: "slot", - width: "140px" } ] From 1e5f5ea9bb0309aa91359e3b17207b1ccce47e40 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Thu, 13 Oct 2022 11:24:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=96=B0=E5=A2=9E=E5=BE=85=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E7=8A=B6=E6=80=81=E5=8F=AF=E4=BB=A5=E4=BD=9C=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/order/list/list.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index 26dafb0e..806563e0 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -879,16 +879,14 @@ export default class orderlist extends React.Component { 详情 {rowData.status == 1 || - (rowData.status == 0 && rowData.type == 1) ? ( + (rowData.status == 0 && rowData.type == 1) || + rowData.status == 6 ? ( this.deleteFn(e, rowData)}> 作废 ) : null} - { - // rowData.status==3? this.againinvestFn(e,rowData)}>再次充值:null - } {rowData.status == 1 ? ( Date: Thu, 13 Oct 2022 14:06:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E7=BC=96=E8=BE=91=E5=99=A8=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E6=A0=8F=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edittemplate/couponCard/goodsPage/config/bottomBar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js index a48e34d9..b0c6ef51 100644 --- a/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js +++ b/src/pages/exchangepage/edittemplate/couponCard/goodsPage/config/bottomBar.js @@ -206,13 +206,13 @@ export default class edittemplate extends React.Component { let model2 = this.state.navlist; model2[index].text = e; this.setState({ navlist: model2 }) - Bus.emit('titleBarConfig', {attr:'navlist',value:model2}) + Bus.emit('bottomBarConfig', {attr:'navlist',value:model2}) }} onClearItem={(e) => { let model2 = this.state.navlist; model2[index].text = ''; this.setState({ navlist: model2 }) - Bus.emit('titleBarConfig', {attr:'navlist',value:model2}) + Bus.emit('bottomBarConfig', {attr:'navlist',value:model2}) }} value={this.state.navlist[index].text} placeholder={item.category} labelWidth={'0px'} maxLength={5} height={'36px'} width={'300px'} alignment={'left'} /> From faf2f5bb7f2ce2bf218d5b7a88bb41befd6cf431 Mon Sep 17 00:00:00 2001 From: Apple <> Date: Thu, 13 Oct 2022 14:25:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A8=A1=E6=9D=BF=E5=90=8E=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=BC=96=E8=BE=91=E6=A8=A1=E6=9D=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/template/main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/exchangepage/template/main.js b/src/pages/exchangepage/template/main.js index 4ef89652..2d427cc8 100644 --- a/src/pages/exchangepage/template/main.js +++ b/src/pages/exchangepage/template/main.js @@ -221,6 +221,7 @@ export default class mytemplate extends React.Component { copyThemecustom(row.id).then(res => { handelResponse(res, (req) => { row.id = req.id; + sessionStorage.setItem("pageInfo", JSON.stringify(row)) sessionStorage.setItem("isSort", 0) sessionStorage.setItem('pageChange', 0); }, () => { @@ -228,9 +229,10 @@ export default class mytemplate extends React.Component { }).catch(() => { }); }else { + sessionStorage.setItem("pageInfo", JSON.stringify(row)) sessionStorage.setItem('pageChange', 1); } - sessionStorage.setItem("pageInfo", JSON.stringify(row)) + sessionStorage.setItem('mouldType', 1); if (type) { window.location.href = "/#/edittemplate?type=" + type;