From 59a5473bd823aa3f7024b51af7fa35bb10a3c44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=A3=9A?= <849005670@qq.com>
Date: Fri, 26 Nov 2021 09:38:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/exchangecode/commodity/goodedit.js | 80 +++++++++++---------
1 file changed, 45 insertions(+), 35 deletions(-)
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{
{this.state.model.cost_price}
-
+ {
+ this.state.loadshow?
{
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'}/>
-
-
-
-
- {
- 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'}/>
-
-
-
- {
- 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'}/>
-
-
+ value={this.state.model.stock} placeholder={"请输入"} labelWidth={'0px'} maxLength={7} height={'36px'} width={'520px'} alignment={'left'}/>
+ :null
+ }
+ {
+ this.state.loadshow?
+ {
+ 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'}/>
+
+ :null
+ }
+ {
+ this.state.loadshow?
+ {
+ 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'}/>
+
+ :null
+ }