diff --git a/src/pages/exchangecode/commodity/goodedit.js b/src/pages/exchangecode/commodity/goodedit.js
index dd9b98f1..c333f689 100644
--- a/src/pages/exchangecode/commodity/goodedit.js
+++ b/src/pages/exchangecode/commodity/goodedit.js
@@ -21,8 +21,14 @@ export default class adduserinfo extends React.Component{
 		  cost_price:"",
 		  stock:"",
 		  name:"",
+<<<<<<< HEAD
 		  show_url:"https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20211126/4dc4e28e0ec4a563f36e99d8f5cabb5c.png",
 		  describe_url:"https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20211126/4dc4e28e0ec4a563f36e99d8f5cabb5c.png",
+=======
+			show_url:"",
+			loadshow:false,
+		  describe_url:"",
+>>>>>>> 3687c26107f5edfe223b8de6bf6eae6556a7be32
 	  },
 	   cur_product:null,
 	  productOption:[],
@@ -293,7 +299,8 @@ export default class adduserinfo extends React.Component{
       <FormItem labelname="商品成本" prop="cost_price" id="cost_price">
 		  <div className="line-value">{this.state.model.cost_price}</div>
 	  </FormItem>	
-        <FormItem labelname="商品库存" prop="stock" id="stock">
+    {
+			this.state.loadshow? <FormItem labelname="商品库存" prop="stock" id="stock">
 			<Ipt  onChange={(e)=>{
 				 let model2 = this.state.model;
 				 model2.stock = e;
@@ -306,40 +313,43 @@ export default class adduserinfo extends React.Component{
 			  					this.setState({model:model2})
 			  				 }}
 			  
-			  value={this.state.model.stock}   placeholder={"请输入"}  labelWidth={'0px'}  maxLength={5} height={'36px'} width={'520px'}   alignment={'left'}/>
-			  </FormItem>	
-      
-		
-		<FormItem id="contract_price"    labelname="合同价" prop="contract_price">
-		 <Ipt  onChange={(e)=>{
-		 	 let model2 = this.state.model;
-		 	 model2.contract_price = e;
-		 	 this.setState({model:model2})
-		  }}  
-		   
-		   onClearItem={(e)=>{
-		   					let model2 = this.state.model;
-		   					model2.contract_price = "";
-		   					this.setState({model:model2})
-		   				 }}
-		   
-		   value={this.state.model.contract_price}   placeholder={"请输入"}  labelWidth={'0px'}  maxLength={16} height={'36px'} width={'520px'}   alignment={'left'}/>
-		  
-		</FormItem>	
-		<FormItem id="name"    labelname="商品名称" prop="name">
-		 <Ipt  onChange={(e)=>{
-		 	 let model2 = this.state.model;
-		 	 model2.name = e;
-		 	 this.setState({model:model2})
-		  }}  
-		   onClearItem={(e)=>{
-		   					let model2 = this.state.model;
-		   					model2.name = "";
-		   					this.setState({model:model2})
-		   				 }}
-		   value={this.state.model.name}   placeholder={"请输入"}  labelWidth={'0px'}  maxLength={16} height={'36px'} width={'520px'}   alignment={'left'}/>
-		  
-		</FormItem>	
+			  value={this.state.model.stock}   placeholder={"请输入"}  labelWidth={'0px'}  maxLength={7} height={'36px'} width={'520px'}   alignment={'left'}/>
+			  </FormItem>	:null
+		}
+    {
+			this.state.loadshow?<FormItem id="contract_price"    labelname="合同价" prop="contract_price">
+			<Ipt  onChange={(e)=>{
+				 let model2 = this.state.model;
+				 model2.contract_price = e;
+				 this.setState({model:model2})
+			 }}  
+				
+				onClearItem={(e)=>{
+									let model2 = this.state.model;
+									model2.contract_price = "";
+									this.setState({model:model2})
+								 }}
+				
+				value={this.state.model.contract_price}   placeholder={"请输入"}  labelWidth={'0px'}  maxLength={16} height={'36px'} width={'520px'}   alignment={'left'}/>
+			 
+		 </FormItem>	:null
+		}
+		{
+			this.state.loadshow?	<FormItem id="name"    labelname="商品名称" prop="name">
+			<Ipt  onChange={(e)=>{
+				 let model2 = this.state.model;
+				 model2.name = e;
+				 this.setState({model:model2})
+			 }}  
+				onClearItem={(e)=>{
+									let model2 = this.state.model;
+									model2.name = "";
+									this.setState({model:model2})
+								 }}
+				value={this.state.model.name}   placeholder={"请输入"}  labelWidth={'0px'}  maxLength={16} height={'36px'} width={'520px'}   alignment={'left'}/>
+			 
+		 </FormItem>	:null
+		}
 		
 		
 		<FormItem id="official_price"    labelname="商品官方价" prop="official_price">