Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

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}

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;
 }

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>

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>

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>

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>

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;