修复已知bug
This commit is contained in:
parent
31f79f03b4
commit
17a13e7613
|
@ -1,6 +1,6 @@
|
||||||
import {Notify} from "zent"
|
import {Notify} from "zent"
|
||||||
// export const baseurl = 'https://marketapi.1688sup.com'
|
// export const baseurl = 'https://marketapi.1688sup.com'
|
||||||
// window.baseurl = 'https://marketapi.1688sup.com';
|
window.baseurl = 'https://marketapi.1688sup.com';
|
||||||
|
|
||||||
let baseurl;
|
let baseurl;
|
||||||
if (process.env.NODE_ENV == "test") { // 测试环境
|
if (process.env.NODE_ENV == "test") { // 测试环境
|
||||||
|
@ -9,6 +9,7 @@ if (process.env.NODE_ENV == "test") { // 测试环境
|
||||||
if (process.env.NODE_ENV == "production") { // 生成环境
|
if (process.env.NODE_ENV == "production") { // 生成环境
|
||||||
baseurl = "https://marketapi.1688sup.com"
|
baseurl = "https://marketapi.1688sup.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(process.env.NODE_ENV )
|
console.log(process.env.NODE_ENV )
|
||||||
|
|
||||||
console.log("测试api",baseurl)
|
console.log("测试api",baseurl)
|
||||||
|
|
|
@ -175,7 +175,7 @@ import classNames from 'classnames'
|
||||||
<div className="iptright">
|
<div className="iptright">
|
||||||
{icon? <Icon type="search" className="iconType"/>:null}
|
{icon? <Icon type="search" className="iconType"/>:null}
|
||||||
|
|
||||||
<input autocomplete="off" 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:'请输入'}/>
|
<input autocomplete={kind=='password'?'new-password':'off'} 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">
|
<div className="ipticonR">
|
||||||
{disabled==false&&this.props.markedShow?<span className="showpwd" onClick={()=>this.showpwdFn(this)}>
|
{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" />}
|
{kind=="text"?<Icon type="eye-o" className="pwdShow"/>:<Icon className="pwdShow" type="closed-eye" />}
|
||||||
|
|
|
@ -20,7 +20,7 @@ export default class adduserinfo extends React.Component{
|
||||||
uploadimgFile:'',//分销商头像files
|
uploadimgFile:'',//分销商头像files
|
||||||
email_nums:1,
|
email_nums:1,
|
||||||
disabled:false,
|
disabled:false,
|
||||||
pwdtype:'password',
|
pwdtype:'text',
|
||||||
phoneSwitch:[false,false,false,false],
|
phoneSwitch:[false,false,false,false],
|
||||||
emailSwitch:[false,false,false,false],
|
emailSwitch:[false,false,false,false],
|
||||||
defaultFileList:[{src:'',}],//默认回显头像,//默认回显头像
|
defaultFileList:[{src:'',}],//默认回显头像,//默认回显头像
|
||||||
|
@ -258,7 +258,7 @@ export default class adduserinfo extends React.Component{
|
||||||
let reselData=_.cloneDeep(formInfo);//表单的信息
|
let reselData=_.cloneDeep(formInfo);//表单的信息
|
||||||
let data={
|
let data={
|
||||||
"name":reselData.name,
|
"name":reselData.name,
|
||||||
"password": 'yxxt2021',
|
"password": 'yxtx2021',
|
||||||
"account": reselData.account,
|
"account": reselData.account,
|
||||||
"contact_name": reselData.contact_name,
|
"contact_name": reselData.contact_name,
|
||||||
"company_id":{key:reselData.company_id,text:reselData.company_name},
|
"company_id":{key:reselData.company_id,text:reselData.company_name},
|
||||||
|
@ -279,7 +279,7 @@ export default class adduserinfo extends React.Component{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.setState({pwdtype:'password'});
|
||||||
this.setState({phoneSwitch:phoneSwitch})
|
this.setState({phoneSwitch:phoneSwitch})
|
||||||
|
|
||||||
let emailSwitch = this.state.emailSwitch
|
let emailSwitch = this.state.emailSwitch
|
||||||
|
|
|
@ -29,7 +29,7 @@ export default class adduserinfo extends React.Component{
|
||||||
departmentJob:[],//岗位
|
departmentJob:[],//岗位
|
||||||
roleList:[],//角色
|
roleList:[],//角色
|
||||||
headImg:'',
|
headImg:'',
|
||||||
pwdtype:'password',
|
pwdtype:'text',
|
||||||
defaultFileList:[{src:''}],
|
defaultFileList:[{src:''}],
|
||||||
disabled:false,
|
disabled:false,
|
||||||
id:''
|
id:''
|
||||||
|
@ -50,11 +50,12 @@ export default class adduserinfo extends React.Component{
|
||||||
this.getRoleFn();//获取角色
|
this.getRoleFn();//获取角色
|
||||||
let formInfo=this.props;
|
let formInfo=this.props;
|
||||||
if(formInfo&&formInfo.enumer==1){
|
if(formInfo&&formInfo.enumer==1){
|
||||||
|
this.setState({pwdtype:'password'});
|
||||||
let acceptData=_.cloneDeep(formInfo.rowData);
|
let acceptData=_.cloneDeep(formInfo.rowData);
|
||||||
let data={
|
let data={
|
||||||
user_name:acceptData.user_name,
|
user_name:acceptData.user_name,
|
||||||
mobile:acceptData.mobile,
|
mobile:acceptData.mobile,
|
||||||
password:'yxxt2021',
|
password:'yxtx2021',
|
||||||
real_name:acceptData.real_name,
|
real_name:acceptData.real_name,
|
||||||
company:companys.find(o=>o.key==acceptData.company_id),
|
company:companys.find(o=>o.key==acceptData.company_id),
|
||||||
deparment:{key:acceptData.department.id,text:acceptData.department.department_name},
|
deparment:{key:acceptData.department.id,text:acceptData.department.department_name},
|
||||||
|
|
Loading…
Reference in New Issue