修复 key批次编辑页面，编辑兑换码批次，编辑商品，点击提交后，会在商品范围中新增一条商品数据

src/pages/exchangecode/add/add.js

@@ -407,11 +407,17 @@ export default class acclist extends React.Component {
       setTimeout(() => {
         let data = null
         let temp = null
+        let concatData = null
         /* 处理商品 */
         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)
+
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.product_id == item.product_id
@@ -430,6 +436,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
+          )
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.channel_activity_id === item.channel_activity_id
@@ -470,8 +479,7 @@ export default class acclist extends React.Component {
             return newObj
           })
         }
-        let newArray = temp.concat(this.state.tempdata)
+        let newArray = deWeightThree(temp.concat(concatData), 'only')
-        newArray = deWeightThree(newArray, 'only')
 
         //select数据
         let arr = []

src/pages/exchangecode/edit/edit.js

@@ -688,11 +688,17 @@ export default class exchangedit extends React.Component {
       setTimeout(() => {
         let data = null
         let temp = null
+        let concatData = null
         /* 处理商品 */
         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)
+
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.product_id == item.product_id
@@ -711,6 +717,11 @@ export default class exchangedit 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
+          )
+
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.channel_activity_id === item.channel_activity_id
@@ -755,9 +766,7 @@ export default class exchangedit extends React.Component {
             return newObj
           })
         }
-        let newArray = temp.concat(this.state.tempdata)
+        let newArray = deWeightThree(temp.concat(concatData), 'only')
-        newArray = deWeightThree(newArray, 'only')
-
         //select数据
         let arr = []
         let rank = []

src/pages/plan/add/step2.js

@@ -300,11 +300,16 @@ export default class acclist extends React.Component {
       setTimeout(() => {
         let data = null
         let temp = null
+        let concatData = null
         /* 处理商品 */
         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)
+
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.product_id == item.product_id
@@ -324,7 +329,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
+          )
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.channel_activity_id === item.channel_activity_id
@@ -365,8 +372,7 @@ export default class acclist extends React.Component {
             return newObj
           })
         }
-        let newArray = temp.concat(this.state.tempdata)
+        let newArray = deWeightThree(temp.concat(concatData), 'only')
-        newArray = deWeightThree(newArray, 'only')
 
         //select数据
         let arr = []

src/pages/plan/key/edit.js

@@ -416,11 +416,16 @@ export default class acclist extends React.Component {
       setTimeout(() => {
         let data = null
         let temp = null
+        let concatData = null
         /* 处理商品 */
         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)
+
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.product_id == item.product_id
@@ -439,6 +444,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
+          )
           temp = _.map(data, (item) => {
             let index = this.state.tempdata.findIndex((o) => {
               return o.channel_activity_id === item.channel_activity_id
@@ -479,8 +487,7 @@ export default class acclist extends React.Component {
             return newObj
           })
         }
-        let newArray = temp.concat(this.state.tempdata)
+        let newArray = deWeightThree(temp.concat(concatData), 'only')
-        newArray = deWeightThree(newArray, 'only')
 
         //select数据
         let arr = []