From 0cf86dff04eac9f8cf3bf7e0e7d61ccbf45ecc58 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Thu, 16 Jun 2022 18:39:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangecode/add/add.js | 12 +++++------- src/pages/exchangecode/edit/edit.js | 11 ++++------- src/pages/plan/add/step2.js | 12 +++++------- src/pages/plan/key/edit.js | 11 +++-------- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js index e15fa6d4..b955b011 100644 --- a/src/pages/exchangecode/add/add.js +++ b/src/pages/exchangecode/add/add.js @@ -407,16 +407,14 @@ export default class acclist extends React.Component { setTimeout(() => { let data = null let temp = null - let concatData = null + let concatData = [] /* 处理商品 */ if (this.state.addIsType === 'addProduct') { data = JSON.parse(sessionStorage.getItem('productData')).filter( (item) => item.type !== 2 ) - concatData = JSON.parse( - sessionStorage.getItem('knockGoldData') - ).filter((item) => item.type !== 1) + concatData = this.state.tempdata.filter((item) => item.type !== 1) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -436,9 +434,9 @@ export default class acclist extends React.Component { data = JSON.parse(sessionStorage.getItem('knockGoldData')).filter( (item) => item.type !== 1 ) - concatData = JSON.parse(sessionStorage.getItem('productData')).filter( - (item) => item.type !== 2 - ) + + concatData = this.state.tempdata.filter((item) => item.type !== 2) + temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { return o.channel_activity_id === item.channel_activity_id diff --git a/src/pages/exchangecode/edit/edit.js b/src/pages/exchangecode/edit/edit.js index 2d9dffe9..24582755 100644 --- a/src/pages/exchangecode/edit/edit.js +++ b/src/pages/exchangecode/edit/edit.js @@ -688,16 +688,14 @@ export default class exchangedit extends React.Component { setTimeout(() => { let data = null let temp = null - let concatData = null + let concatData = [] /* 处理商品 */ if (this.state.addIsType === 'addProduct') { data = JSON.parse(sessionStorage.getItem('productData')).filter( (item) => item.type !== 2 ) - concatData = JSON.parse( - sessionStorage.getItem('knockGoldData') - ).filter((item) => item.type !== 1) + concatData = this.state.tempdata.filter((item) => item.type !== 1) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -718,9 +716,7 @@ export default class exchangedit extends React.Component { (item) => item.type !== 1 ) - concatData = JSON.parse(sessionStorage.getItem('productData')).filter( - (item) => item.type !== 2 - ) + concatData = this.state.tempdata.filter((item) => item.type !== 2) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -767,6 +763,7 @@ export default class exchangedit extends React.Component { }) } let newArray = deWeightThree(temp.concat(concatData), 'only') + console.log(newArray) //select数据 let arr = [] let rank = [] diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js index 88494c13..b48d6199 100644 --- a/src/pages/plan/add/step2.js +++ b/src/pages/plan/add/step2.js @@ -300,15 +300,13 @@ export default class acclist extends React.Component { setTimeout(() => { let data = null let temp = null - let concatData = null + let concatData = [] /* 处理商品 */ if (this.state.addIsType === 'addProduct') { data = JSON.parse(sessionStorage.getItem('productData')).filter( (item) => item.type !== 2 ) - concatData = JSON.parse( - sessionStorage.getItem('knockGoldData') - ).filter((item) => item.type !== 1) + concatData = this.state.tempdata.filter((item) => item.type !== 1) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { @@ -329,9 +327,9 @@ export default class acclist extends React.Component { data = JSON.parse(sessionStorage.getItem('knockGoldData')).filter( (item) => item.type !== 1 ) - concatData = JSON.parse(sessionStorage.getItem('productData')).filter( - (item) => item.type !== 2 - ) + + concatData = this.state.tempdata.filter((item) => item.type !== 2) + temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { return o.channel_activity_id === item.channel_activity_id diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js index ea983dc8..950e026d 100644 --- a/src/pages/plan/key/edit.js +++ b/src/pages/plan/key/edit.js @@ -416,16 +416,13 @@ export default class acclist extends React.Component { setTimeout(() => { let data = null let temp = null - let concatData = null + let concatData = [] /* 处理商品 */ if (this.state.addIsType === 'addProduct') { data = JSON.parse(sessionStorage.getItem('productData')).filter( (item) => item.type !== 2 ) - concatData = JSON.parse( - sessionStorage.getItem('knockGoldData') - ).filter((item) => item.type !== 1) - + concatData = this.state.tempdata.filter((item) => item.type !== 1) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { return o.product_id == item.product_id @@ -444,9 +441,7 @@ export default class acclist extends React.Component { data = JSON.parse(sessionStorage.getItem('knockGoldData')).filter( (item) => item.type !== 1 ) - concatData = JSON.parse(sessionStorage.getItem('productData')).filter( - (item) => item.type !== 2 - ) + concatData = this.state.tempdata.filter((item) => item.type !== 2) temp = _.map(data, (item) => { let index = this.state.tempdata.findIndex((o) => { return o.channel_activity_id === item.channel_activity_id