From f539a05a6ceaddcdcf52d878136ecc9ac5fb488b Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Thu, 25 Nov 2021 15:22:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=90=A5=E9=94=80?= =?UTF-8?q?=E7=B3=BB=E7=BB=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/subnav/main.js | 17 ++++++++++------- src/pages/exchangecode/add/add.less | 5 +++++ src/pages/exchangepage/mytemplate/main.js | 18 +++++++----------- src/pages/plan/key/list.js | 9 ++++++--- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js index c79b1919..88c1a044 100644 --- a/src/components/subnav/main.js +++ b/src/components/subnav/main.js @@ -40,9 +40,10 @@ export default class topNav extends React.Component{ //返回 backFn(items){ this.setState({'pathname2':items[0].path}); - sessionStorage.setItem('showflag',true) - sessionStorage.setItem('pathname2',items[0].path) - window.history.go(-1) + sessionStorage.setItem('showflag',true) + sessionStorage.setItem('pathname2',items[0].path) + window.history.go(-1) + } breakFn(item){ sessionStorage.setItem('pathname2',item) @@ -60,9 +61,11 @@ export default class topNav extends React.Component{ let breakflag=pathnamestr.includes('add')||pathnamestr.includes('key-list'); let sedcbreakflag=pathnamestr.includes('plan-create'); let planbreakflag = pathnamestr.includes('mytempMould') - let editbreakflag = pathnamestr.includes('edittemplate') - - + let editbreakflag = pathnamestr.includes('edittemplate') + let breakchange = pathnamestr.includes('exchangecode-add') + if(breakchange){ + breaknav=JSON.parse(sessionStorage.getItem('breakchangenav')) + } return(
@@ -117,7 +120,7 @@ export default class topNav extends React.Component{
{key2!=0?>:null} - {item2.name} + {item2.name}
) diff --git a/src/pages/exchangecode/add/add.less b/src/pages/exchangecode/add/add.less index 2ca1dab9..6253f13c 100644 --- a/src/pages/exchangecode/add/add.less +++ b/src/pages/exchangecode/add/add.less @@ -15,4 +15,9 @@ text-align: center; line-height: 36px; background-color: rgb(249, 250, 252); + } + #addkey .zent-radio-button--disabled[data-zv="9.11.0"].zent-radio-button--checked{ + color: #8a96aa; + background: #dfe8fc!important; + border: 1px solid #8a96aa!important; } \ No newline at end of file diff --git a/src/pages/exchangepage/mytemplate/main.js b/src/pages/exchangepage/mytemplate/main.js index 1ac6742b..db852adb 100644 --- a/src/pages/exchangepage/mytemplate/main.js +++ b/src/pages/exchangepage/mytemplate/main.js @@ -64,6 +64,7 @@ export default class acclist extends React.Component{ this.state={ distdata:[], total:0, + combinedValue:[], page:1, limit:10, tabList:[{title:"我的模板列表"}], @@ -120,6 +121,10 @@ componentWillMount(){ page:this.state.page, limit:this.state.limit } + if(this.state.combinedValue&&this.state.combinedValue[0]){ + data.begin_time=this.state.combinedValue[0]; + data.end_time=this.state.combinedValue[1]; + } this.getTableList(data); } pageChange(e){ @@ -165,20 +170,11 @@ delFn(e,row){ }); } render(){ - const date = {this.onChangeCombinedDate(e)}} - /> + const { current, pageSize } = this.state; return(
- +

< Button type = "primary" diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js index b8a8020a..b2c43fa3 100644 --- a/src/pages/plan/key/list.js +++ b/src/pages/plan/key/list.js @@ -257,14 +257,17 @@ onEditRow(status,row){ let activerou=[{pagetitle:'编辑',items:[ { "path": "/home/exchangecode-list", - "name": "key列表管理" - }, + "name": row.plan_title+"key列表管理" + },{ + "path": "/home/exchangecode-lists", + "name": "key-批次ID:"+row.id + }, { "path": "/home/exchangecode-add", "name": "编辑key" } ]}] - sessionStorage.setItem('breaknav',JSON.stringify(activerou)); + sessionStorage.setItem('breakchangenav',JSON.stringify(activerou)); sessionStorage.setItem("keybatch_id",row.id) } From 81200868baea697292fdd01bd7a60aa9617b491e Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Thu, 25 Nov 2021 15:30:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E5=9B=9E?= =?UTF-8?q?=E6=98=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangecode/edit/edit.js | 40 ++++++++++++++++------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/pages/exchangecode/edit/edit.js b/src/pages/exchangecode/edit/edit.js index b0b5a9d1..1105ce0a 100644 --- a/src/pages/exchangecode/edit/edit.js +++ b/src/pages/exchangecode/edit/edit.js @@ -35,7 +35,8 @@ export default class exchangedit extends React.Component{ describe:'', date_time:"", range:"" - }, + }, + isload:false, tempdata:[], cur_product:null, productOption:[], @@ -66,6 +67,7 @@ export default class exchangedit extends React.Component{ } this.setState({codeInfo:codeInfo}) + this.setState({isload:true}); console.log("当前的商品信息66") @@ -401,29 +403,31 @@ export default class exchangedit extends React.Component{ width:'auto', }, ]; - return(

- - { - let model = this.state.codeInfo; - model.code_name = e; - this.setState({codeInfo:model}) - }} - - onClearItem={(e)=>{ - let model = this.state.codeInfo; - model.code_name = ""; - this.setState({codeInfo:model}) - }} - - - value={this.state.codeInfo.code_name} placeholder={"请输入兑换码名称"} labelWidth={'0px'} maxLength={10} height={'36px'} width={'520px'} alignment={'left'}/> - + { + this.state.isload? + { + let model = this.state.codeInfo; + model.code_name = e; + this.setState({codeInfo:model}) + }} + + onClearItem={(e)=>{ + let model = this.state.codeInfo; + model.code_name = ""; + this.setState({codeInfo:model}) + }} + + + value={this.state.codeInfo.code_name} placeholder={"请输入兑换码名称"} labelWidth={'0px'} maxLength={10} height={'36px'} width={'520px'} alignment={'left'}/> + :null + } + { let model= this.state.codeInfo;