From 5f6615dbe5fbc7af941c5a6a3a4a1c4fa7dc153c Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Wed, 15 Dec 2021 13:53:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=86=E9=94=80=E5=95=86=E3=80=91?=
 =?UTF-8?q?=E5=88=86=E9=94=80=E5=95=86=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E2=80=9C=E4=B8=BB=E4=BD=93=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E3=80=90=E5=AF=86=E7=A0=81=E3=80=91=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=85=B3=E4=BA=8E=E5=AF=86=E7=A0=81=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BA=94=E8=AF=A5=E6=8E=A9=E7=A0=81=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/input/main.js                       |  4 +++-
 .../adddistributorinfo/adddistributorinfo.js       |  6 +++++-
 src/pages/distributor/list/list.js                 | 14 +++++++-------
 .../system/account/add/adduserinfo/adduserinfo.js  |  4 ++++
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/components/input/main.js b/src/components/input/main.js
index 8863bb6c..b2c3d741 100644
--- a/src/components/input/main.js
+++ b/src/components/input/main.js
@@ -93,7 +93,9 @@ import classNames from 'classnames'
     if(this.props.placeholder.length>10){
       this.setState({'focus':0});
     }
-
+    if(this.props.onfocusFn){
+      this.props.onfocusFn(e.target.value);
+    }
   }
   //失去焦点
   losefofn(e){
diff --git a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js
index fd584b42..29f22778 100644
--- a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js
+++ b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js
@@ -403,6 +403,9 @@ export default class adduserinfo extends React.Component{
  }
  changeType(e){
 this.setState({pwdtype:e});
+ }
+ changeKind(){
+	this.setState({pwdtype:'password'});
  }
   render(){
 		const companyOptions =this.state.companyList;
@@ -479,7 +482,8 @@ this.setState({pwdtype:e});
 				 this.setState({model:model2})
 			 }}   
 			 disabled={this.state.disabled}
-			   countShow= {true}
+				 countShow= {true}
+				 onfocusFn={(e)=>this.changeKind()}
 			 onClearItem={(e)=>{
 			 					let model2 = this.state.model;
 			 					model2.password = '';
diff --git a/src/pages/distributor/list/list.js b/src/pages/distributor/list/list.js
index 708d458a..14a56042 100644
--- a/src/pages/distributor/list/list.js
+++ b/src/pages/distributor/list/list.js
@@ -31,13 +31,13 @@ const Column = [
     type: "normal",
     width:'20%'
   },
-  // {
-  //   title: '余额',
-  //   name: 'balance',
-  //   type: "normal",
-  //   prop:'balance',
-  //   width:'auto'
-  // },
+  {
+    title: '主体名称',
+    name: 'subject',
+    type: "normal",
+    prop:'subject',
+    width:'auto'
+  },
   // {
   //   title: '累计消费',
   //   name: 'money',
diff --git a/src/pages/system/account/add/adduserinfo/adduserinfo.js b/src/pages/system/account/add/adduserinfo/adduserinfo.js
index b4306b22..1eefe275 100644
--- a/src/pages/system/account/add/adduserinfo/adduserinfo.js
+++ b/src/pages/system/account/add/adduserinfo/adduserinfo.js
@@ -321,6 +321,9 @@ export default class adduserinfo extends React.Component{
 		})
 		}).catch(err=>{
 	});
+}
+changeKind(){
+	this.setState({pwdtype:'password'});
 }
 	cancel(){
 	 //取消二次弹出框
@@ -422,6 +425,7 @@ export default class adduserinfo extends React.Component{
 					 }}   
 					 markedShow={(e)=>{this.changeType(e)}} kind={this.state.pwdtype} 
 					 disabled={this.state.disabled}
+					 onfocusFn={(e)=>this.changeKind()}
 					 onClearItem={(e)=>{
 										 let model2 = this.state.model;
 										 model2.password = "";