Merge branch 'dev_1.0.2'

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){

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;
@@ -480,6 +483,7 @@ this.setState({pwdtype:e});
 			 }}   
 			 disabled={this.state.disabled}
 				 countShow= {true}
+				 onfocusFn={(e)=>this.changeKind()}
 			 onClearItem={(e)=>{
 			 					let model2 = this.state.model;
 			 					model2.password = '';

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',

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 = "";