From 9ce82c2e26a74b15bc62c26c49dfa589c6618693 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Fri, 27 May 2022 11:44:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=92=8C=E7=AB=8B=E5=87=8F=E9=87=91type=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangecode/add/add.js | 18 +++++++----------- src/pages/exchangecode/edit/edit.js | 16 ++++++---------- src/pages/plan/add/step2.js | 24 +++++++++++------------- src/pages/plan/key/edit.js | 18 +++++++----------- 4 files changed, 31 insertions(+), 45 deletions(-) diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js index 007dfd35..39ff8e86 100644 --- a/src/pages/exchangecode/add/add.js +++ b/src/pages/exchangecode/add/add.js @@ -410,7 +410,7 @@ export default class acclist extends React.Component { /* 处理商品 */ if (this.state.addIsType === 'addProduct') { data = JSON.parse(sessionStorage.getItem('productData')).filter( - (item) => item.type !== 'knockGold' + (item) => item.type !== 2 ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -420,7 +420,7 @@ export default class acclist extends React.Component { if (index > -1) { item.checked = this.state.tempdata[index].checked } - item.type = 'addProduct' + item.type = 1 item.only = item.product_id item.upstream = '直连天下' return item @@ -440,7 +440,7 @@ export default class acclist extends React.Component { } else { /* 处理立减金 */ data = JSON.parse(sessionStorage.getItem('knockGoldData')).filter( - (item) => item.type !== 'addProduct' + (item) => item.type !== 1 ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -457,7 +457,7 @@ export default class acclist extends React.Component { product_name: item.batch_goods_name, //名字 channel_activity_id: item.channel_activity_id, //批次号 only: item.channel_activity_id, //批次号 - type: 'knockGold', //类型 + type: 2, //类型 upstream: item.channel === '1' ? '支付宝' : '微信', //上游 effectDate: item.time_limit.effect_time.start_time + @@ -556,7 +556,7 @@ export default class acclist extends React.Component { obj.describe_url = item.describe_url obj.detail_url = item.detail_url obj.map_product_name = item.map_product_name - if (item.type === 'knockGold') { + if (item.type === 2) { obj.channel_activity_id = item.channel_activity_id //批次号 obj.effectDate = item.effectDate //有效时间 } @@ -997,7 +997,7 @@ export default class acclist extends React.Component { console.log('keyProductClick 13==>', row) if (this.state.direct_reseller_id > 0) { /* 区分立减金 */ - if (row.type === 'knockGold') { + if (row.type === 2) { const temp = JSON.parse(sessionStorage.getItem('knockGoldData')) const editData = temp.filter( (item) => item.channel_activity_id === row.only @@ -1606,11 +1606,7 @@ export default class acclist extends React.Component { }} ComponentHandler={(com, rowData, rowIndex) => { if (com == 'type') { - return ( - <> - {rowData.type === 'knockGold' ? '立减金' : '商品'} - - ) + return <>{rowData.type === 2 ? '立减金' : '商品'} } if (com == 'edit') { return ( diff --git a/src/pages/exchangecode/edit/edit.js b/src/pages/exchangecode/edit/edit.js index 6a41db5c..805babfc 100644 --- a/src/pages/exchangecode/edit/edit.js +++ b/src/pages/exchangecode/edit/edit.js @@ -586,7 +586,7 @@ export default class exchangedit extends React.Component { /* 处理商品 */ if (this.state.addIsType === 'addProduct') { data = JSON.parse(sessionStorage.getItem('productData')).filter( - (item) => item.type !== 'knockGold' + (item) => item.type !== 2 ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -596,7 +596,7 @@ export default class exchangedit extends React.Component { if (index > -1) { item.checked = this.state.tempdata[index].checked } - item.type = 'addProduct' + item.type = 1 item.only = item.product_id item.upstream = '直连天下' return item @@ -616,7 +616,7 @@ export default class exchangedit extends React.Component { } else { /* 处理立减金 */ data = JSON.parse(sessionStorage.getItem('knockGoldData')).filter( - (item) => item.type !== 'addProduct' + (item) => item.type !== 1 ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -633,7 +633,7 @@ export default class exchangedit extends React.Component { product_name: item.batch_goods_name, //名字 channel_activity_id: item.channel_activity_id, //批次号 only: item.channel_activity_id, //批次号 - type: 'knockGold', //类型 + type: 2, //类型 upstream: item.channel === '1' ? '支付宝' : '微信', //上游 effectDate: item.time_limit.effect_time.start_time + @@ -873,7 +873,7 @@ export default class exchangedit extends React.Component { (data) => { sessionStorage.setItem('productsList', JSON.stringify(data)) /* 区分立减金 */ - if (rowData.type === 'knockGold') { + if (rowData.type === 2) { const temp = JSON.parse(sessionStorage.getItem('knockGoldData')) const editData = temp.filter( (item) => item.channel_activity_id === rowData.only @@ -1186,11 +1186,7 @@ export default class exchangedit extends React.Component { }} ComponentHandler={(com, rowData) => { if (com == 'type') { - return ( - <> - {rowData.type === 'knockGold' ? '立减金' : '商品'} - - ) + return <>{rowData.type === 2 ? '立减金' : '商品'} } if (com == 'edit') { return ( diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js index 032541f1..a53fb14b 100644 --- a/src/pages/plan/add/step2.js +++ b/src/pages/plan/add/step2.js @@ -277,7 +277,9 @@ export default class acclist extends React.Component { let temp = null /* 处理商品 */ if (this.state.addIsType === 'addProduct') { - data = JSON.parse(sessionStorage.getItem('productData')) + data = JSON.parse(sessionStorage.getItem('productData')).filter( + (item) => item.type !== 2 + ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { return o.product_id == item.product_id @@ -286,7 +288,7 @@ export default class acclist extends React.Component { if (index > -1) { item.checked = this.state.tempdata[index].checked } - item.type = 'addProduct' + item.type = 1 item.only = item.product_id item.upstream = '直连天下' return item @@ -305,7 +307,9 @@ export default class acclist extends React.Component { this.setState({ rankoptions: arr }) } else { /* 处理立减金 */ - data = JSON.parse(sessionStorage.getItem('knockGoldData')) + data = JSON.parse(sessionStorage.getItem('knockGoldData')).filter( + (item) => item.type !== 1 + ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { return o.channel_activity_id === item.channel_activity_id @@ -321,7 +325,7 @@ export default class acclist extends React.Component { product_name: item.batch_goods_name, //名字 channel_activity_id: item.channel_activity_id, //批次号 only: item.channel_activity_id, - type: 'knockGold', //类型 + type: 2, //类型 upstream: item.channel === '1' ? '支付宝' : '微信', //上游 effectDate: item.time_limit.effect_time.start_time + @@ -436,7 +440,7 @@ export default class acclist extends React.Component { obj.detail_url = item.detail_url obj.account_type = item.account_type obj.map_product_name = item.map_product_name - if (item.type === 'knockGold') { + if (item.type === 2) { obj.channel_activity_id = item.channel_activity_id //批次号 obj.effectDate = item.effectDate //有效时间 } @@ -806,7 +810,7 @@ export default class acclist extends React.Component { (data) => { sessionStorage.setItem('productsList', JSON.stringify(data)) /* 区分立减金 */ - if (rowData.type === 'knockGold') { + if (rowData.type === 2) { const temp = JSON.parse(sessionStorage.getItem('knockGoldData')) const editData = temp.filter( (item) => item.channel_activity_id === rowData.channel_activity_id @@ -1463,13 +1467,7 @@ export default class acclist extends React.Component { ) } if (com == 'type') { - return ( - <> - {rowData.type === 'knockGold' - ? '立减金' - : '商品'} - - ) + return <>{rowData.type === 2 ? '立减金' : '商品'} } if (com == 'contract_price') { return ( diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js index 8958af15..72eb4c29 100644 --- a/src/pages/plan/key/edit.js +++ b/src/pages/plan/key/edit.js @@ -387,7 +387,7 @@ export default class acclist extends React.Component { /* 处理商品 */ if (this.state.addIsType === 'addProduct') { data = JSON.parse(sessionStorage.getItem('productData')).filter( - (item) => item.type !== 'knockGold' + (item) => item.type !== 2 ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -397,7 +397,7 @@ export default class acclist extends React.Component { if (index > -1) { item.checked = this.state.tempdata[index].checked } - item.type = 'addProduct' + item.type = 1 item.only = item.product_id item.upstream = '直连天下' return item @@ -417,7 +417,7 @@ export default class acclist extends React.Component { } else { /* 处理立减金 */ data = JSON.parse(sessionStorage.getItem('knockGoldData')).filter( - (item) => item.type !== 'addProduct' + (item) => item.type !== 1 ) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -433,7 +433,7 @@ export default class acclist extends React.Component { return { product_name: item.batch_goods_name, //名字 channel_activity_id: item.channel_activity_id, //批次号 - type: 'knockGold', //类型 + type: 2, //类型 only: item.channel_activity_id, upstream: item.channel === '1' ? '支付宝' : '微信', //上游 effectDate: @@ -557,7 +557,7 @@ export default class acclist extends React.Component { obj.describe_url = item.describe_url obj.detail_url = item.detail_url obj.map_product_name = item.map_product_name - if (item.type === 'knockGold') { + if (item.type === 2) { obj.channel_activity_id = item.channel_activity_id //批次号 obj.effectDate = item.effectDate //有效时间 } @@ -1060,7 +1060,7 @@ export default class acclist extends React.Component { console.log('keyProductClick 13==>', row) if (this.state.direct_reseller_id > 0) { /* 区分立减金 */ - if (row.type === 'knockGold') { + if (row.type === 2) { const temp = JSON.parse(sessionStorage.getItem('knockGoldData')) const editData = temp.filter( (item) => item.channel_activity_id === row.only @@ -1583,11 +1583,7 @@ export default class acclist extends React.Component { }} ComponentHandler={(com, rowData, rowIndex) => { if (com == 'type') { - return ( - <> - {rowData.type === 'knockGold' ? '立减金' : '商品'} - - ) + return <>{rowData.type === 2 ? '立减金' : '商品'} } if (com == 'edit') { return (