From 5370e110c17cf2415fac5ddfc3340e0e0e764f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=A3=9A?= <849005670@qq.com>
Date: Fri, 10 Dec 2021 15:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E8=AE=A1=E5=88=92=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=8C=83=E5=9B=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangecode/add/add.js     |  4 +---
 src/pages/exchangecode/product/add.js |  3 ++-
 src/pages/plan/add/step2.js           |  5 +----
 src/pages/plan/key/edit.js            | 18 +++++++++++++++---
 src/pages/plan/key/product/add.js     |  2 +-
 src/pages/plan/product/add.js         |  4 ++--
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/pages/exchangecode/add/add.js b/src/pages/exchangecode/add/add.js
index ec8e3b0c..fa7bddee 100644
--- a/src/pages/exchangecode/add/add.js
+++ b/src/pages/exchangecode/add/add.js
@@ -340,9 +340,7 @@ export default class acclist extends React.Component{
 			
 			this.setState({drawerVisible:false})
 			let rank = _.map(this.state.rank,(item)=>{
-				let product =  productList.find((o)=>{return o.id == item.key })
-								
-			return item.text+"("+product.title+")"
+			return item.text
 			})
 			
 			console.log(rank)
diff --git a/src/pages/exchangecode/product/add.js b/src/pages/exchangecode/product/add.js
index 414f9739..f6a77181 100644
--- a/src/pages/exchangecode/product/add.js
+++ b/src/pages/exchangecode/product/add.js
@@ -120,6 +120,7 @@ export default class adduserinfo extends React.Component{
 	}
 	onProductChange(e){
 		this.setState({cur_product:e})
+		console.log("兑换码")
 		let cur_product = this.state.products.find((item)=>{return item.id == e.key})
 		let picItem = window.goods.find((item)=>{return item.id == cur_product.product_category_id})
 		let  quantity = this.state.model.quantity;
@@ -134,7 +135,7 @@ export default class adduserinfo extends React.Component{
 			quantity:quantity,
 			stock:quantity,
 			usage:0,
-			product_name:this.state.model.product_name,
+			product_name:cur_product.title,
 			show_url:picItem ? picItem.pic : "",
 			describe_url:picItem ? picItem.pic : "",
 			account_type:cur_product.account_type
diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js
index 890cb052..c68bac2d 100644
--- a/src/pages/plan/add/step2.js
+++ b/src/pages/plan/add/step2.js
@@ -251,10 +251,7 @@ export default class acclist extends React.Component{
 			
 			this.setState({drawerVisible:false})
 			let rank = _.map(this.state.rank,(item)=>{
-				
-			  let product =  productList.find((o)=>{return o.id == item.key })
-				
-				return item.text+"("+product.title+")"
+				return item.text
 			})
 			
 			console.log(rank)
diff --git a/src/pages/plan/key/edit.js b/src/pages/plan/key/edit.js
index abdf3cd3..346f0711 100644
--- a/src/pages/plan/key/edit.js
+++ b/src/pages/plan/key/edit.js
@@ -89,6 +89,20 @@ export default class acclist extends React.Component{
 				}
 				
 				this.setState({pagetitle:"编辑key"})
+				
+				for(let i = 0;i < req.code_batch.length;i++)
+				{
+					 let code_batch = req.code_batch[i];
+					 let range = []
+					for(let j = 0;j < code_batch.product.length;j++)
+					{
+						let product = code_batch.product[j];
+						range.push(product.product_name)
+					}
+					code_batch.range = range.toString();
+				}
+				
+				
 				let	model = {   
 							  style:  req.style,
 							  batch_name:req.batch_name,
@@ -359,9 +373,7 @@ export default class acclist extends React.Component{
 				
 				this.setState({drawerVisible:false})
 				let rank = _.map(this.state.rank,(item)=>{
-					let product =  productList.find((o)=>{return o.id == item.key })
-									
-				   return item.text+"("+product.title+")"
+				   return item.text
 				})
 				
 				console.log(rank)
diff --git a/src/pages/plan/key/product/add.js b/src/pages/plan/key/product/add.js
index 41346d95..599afa6d 100644
--- a/src/pages/plan/key/product/add.js
+++ b/src/pages/plan/key/product/add.js
@@ -123,7 +123,7 @@ export default class adduserinfo extends React.Component{
 			official_price:cur_product.official_price,
 			cost_price:cur_product.cost_price,
 			quantity:this.state.model.quantity,
-			product_name:this.state.model.product_name,
+			product_name:cur_product.title,
 			show_url:this.state.show_url ? this.state.show_url : "",
 			describe_url:this.state.describe_url ? this.state.describe_url : "",
 		}
diff --git a/src/pages/plan/product/add.js b/src/pages/plan/product/add.js
index ccf8ba37..b03af31a 100644
--- a/src/pages/plan/product/add.js
+++ b/src/pages/plan/product/add.js
@@ -123,7 +123,7 @@ export default class adduserinfo extends React.Component{
 		let picItem = window.goods.find((item)=>{return item.id == cur_product.product_category_id})
 		
 		console.log(picItem)
-		
+				
 		let model2 = {...this.state.model}
 		model2.product_id = cur_product.id;
 		model2.product_type=cur_product.type;
@@ -131,7 +131,7 @@ export default class adduserinfo extends React.Component{
 		model2.official_price=cur_product.official_price;
 		model2.cost_price=cur_product.cost_price;
 		model2.quantity=this.state.model.quantity;
-		model2.product_name=this.state.model.product_name;
+		model2.product_name=cur_product.title;
 		model2.account_type=cur_product.account_type;
 		model2.show_url=picItem ? picItem.pic : "";
 		model2.describe_url=picItem ? picItem.pic : "";