From 48b9fd14fb56d363a8eec856cd6f3167b309e7e8 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Fri, 26 Nov 2021 16:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E7=9B=B4=E5=86=B2-=E7=9B=B4?=
 =?UTF-8?q?=E5=85=85=EF=BC=8C=E5=AF=86=E7=A0=81=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E5=8A=A0=E7=9C=BC=E7=9D=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/input/main.js                            | 4 +++-
 src/components/input/main.less                          | 4 +++-
 src/pages/exchangecode/commodity/goodedit.js            | 2 +-
 src/pages/exchangecode/product/add.js                   | 2 +-
 src/pages/plan/key/product/add.js                       | 2 +-
 src/pages/plan/product/add.js                           | 2 +-
 src/pages/system/account/add/adduserinfo/adduserinfo.js | 6 +++++-
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/input/main.js b/src/components/input/main.js
index 37a47875..963580a6 100644
--- a/src/components/input/main.js
+++ b/src/components/input/main.js
@@ -177,7 +177,9 @@ import classNames from 'classnames'
      
        <input name={this.props.name}   disabled={disabled} type={kind} onBlur={this.losefofn} onFocus={this.focusFn} style={{resize:'none'}} value={this.props.value}  onKeyDown={(e)=>this.sureFns(e)} maxLength={maxLength}    onChange={this.clearContent} onInput={this.handleInputChange} style={{height:height,lineHeight:height,width:width,textOverflow:'ellipsis'}} className={classes} placeholder={placeholder?placeholder:'请输入'}/>
        <div className="ipticonR">
-       {disabled==false&&this.props.markedShow?<span className="showpwd" onClick={()=>this.showpwdFn(this)}>-</span>:null}
+       {disabled==false&&this.props.markedShow?<span className="showpwd" onClick={()=>this.showpwdFn(this)}>
+        {kind=="text"?<Icon type="eye-o" className="pwdShow"/>:<Icon className="pwdShow"  type="closed-eye" />}
+       </span>:null}
        {disabled==false&&clearShow==true&&this.state.iptVal?<svg onClick={this.clearItem.bind(this)} viewBox="0 0 16 16" width="16px" height="16px"><circle fill="#AAAFBA" fill-rule="evenodd" cx="8" cy="8" r="8"></circle><path d="M5.333 5.333l5.334 5.334M10.667 5.333l-5.334 5.334" stroke="#FFF" stroke-linecap="square"></path></svg>:null}
        {disabled==false&&countShow==true?<span className="countTip">{this.state.iptVallength}/{maxLength}</span>:null}
        {unit?<font className="unit">{unit}</font>:null}
diff --git a/src/components/input/main.less b/src/components/input/main.less
index da856e1d..8ec97695 100644
--- a/src/components/input/main.less
+++ b/src/components/input/main.less
@@ -3,7 +3,6 @@
 .iptfillself{
   display: flex;
   align-items: center;
-  // margin-bottom: 24px!important;
   .label{
     margin-right: 58px;
     .warning{
@@ -93,4 +92,7 @@
  margin-left: 8px;
  right: 0;
  color: #939599;
+}
+.pwdShow{
+  font-size: 22px;
 }
\ No newline at end of file
diff --git a/src/pages/exchangecode/commodity/goodedit.js b/src/pages/exchangecode/commodity/goodedit.js
index 7005a708..34119bea 100644
--- a/src/pages/exchangecode/commodity/goodedit.js
+++ b/src/pages/exchangecode/commodity/goodedit.js
@@ -345,7 +345,7 @@ export default class adduserinfo extends React.Component{
 	    </FormItem>
 	<FormItem labelname="商品类型" prop="type" id="type">
 		<RadioGroup onChange={(e)=>{this.onTypeChange(e)}} value={this.state.model.type}>
-		        <RadioButton value={1}>直冲</RadioButton>
+		        <RadioButton value={1}>直充</RadioButton>
 		        <RadioButton value={2}>卡密</RadioButton>
 		 </RadioGroup>
 	</FormItem>
diff --git a/src/pages/exchangecode/product/add.js b/src/pages/exchangecode/product/add.js
index 8517dd94..26718fe3 100644
--- a/src/pages/exchangecode/product/add.js
+++ b/src/pages/exchangecode/product/add.js
@@ -278,7 +278,7 @@ export default class adduserinfo extends React.Component{
 	    </FormItem>
 	<FormItem labelname="商品类型" prop="type" id="type">
 		<RadioGroup onChange={(e)=>{this.onTypeChange(e)}} value={this.state.model.product_type}>
-		        <RadioButton value={1}>直冲</RadioButton>
+		        <RadioButton value={1}>直充</RadioButton>
 		        <RadioButton value={2}>卡密</RadioButton>
 		 </RadioGroup>
 	</FormItem>
diff --git a/src/pages/plan/key/product/add.js b/src/pages/plan/key/product/add.js
index 8517dd94..26718fe3 100644
--- a/src/pages/plan/key/product/add.js
+++ b/src/pages/plan/key/product/add.js
@@ -278,7 +278,7 @@ export default class adduserinfo extends React.Component{
 	    </FormItem>
 	<FormItem labelname="商品类型" prop="type" id="type">
 		<RadioGroup onChange={(e)=>{this.onTypeChange(e)}} value={this.state.model.product_type}>
-		        <RadioButton value={1}>直冲</RadioButton>
+		        <RadioButton value={1}>直充</RadioButton>
 		        <RadioButton value={2}>卡密</RadioButton>
 		 </RadioGroup>
 	</FormItem>
diff --git a/src/pages/plan/product/add.js b/src/pages/plan/product/add.js
index 8517dd94..26718fe3 100644
--- a/src/pages/plan/product/add.js
+++ b/src/pages/plan/product/add.js
@@ -278,7 +278,7 @@ export default class adduserinfo extends React.Component{
 	    </FormItem>
 	<FormItem labelname="商品类型" prop="type" id="type">
 		<RadioGroup onChange={(e)=>{this.onTypeChange(e)}} value={this.state.model.product_type}>
-		        <RadioButton value={1}>直冲</RadioButton>
+		        <RadioButton value={1}>直充</RadioButton>
 		        <RadioButton value={2}>卡密</RadioButton>
 		 </RadioGroup>
 	</FormItem>
diff --git a/src/pages/system/account/add/adduserinfo/adduserinfo.js b/src/pages/system/account/add/adduserinfo/adduserinfo.js
index a2b60716..1aaf8f03 100644
--- a/src/pages/system/account/add/adduserinfo/adduserinfo.js
+++ b/src/pages/system/account/add/adduserinfo/adduserinfo.js
@@ -29,6 +29,7 @@ export default class adduserinfo extends React.Component{
 		departmentJob:[],//岗位
 		roleList:[],//角色
 		headImg:'',
+		pwdtype:'password',
 		defaultFileList:[{src:''}],
 		disabled:false,
 		id:''
@@ -284,6 +285,9 @@ export default class adduserinfo extends React.Component{
 				}).catch(err=>{
 			});
 	}
+	changeType(e){
+		this.setState({pwdtype:e});
+		 }
  //获取角色
  getRoleFn(){
 	let _self=this;
@@ -397,7 +401,7 @@ export default class adduserinfo extends React.Component{
 						 model2.password = e;
 						 this.setState({model:model2})
 					 }}   
-					 kind="password"
+					 markedShow={(e)=>{this.changeType(e)}} kind={this.state.pwdtype} 
 					 disabled={this.state.disabled}
 					 onClearItem={(e)=>{
 										 let model2 = this.state.model;