diff --git a/src/components/login/Login.js b/src/components/login/Login.js index 03387f1..8604513 100644 --- a/src/components/login/Login.js +++ b/src/components/login/Login.js @@ -287,6 +287,8 @@ class LoginForm extends Component { ? "Please select branch name" : "請選擇分公司名稱"; /* 请选择分公司名称 */ let btnLogin = sLanguage === "sChinese" ? "登 录" : sLanguage === "sEnglish" ? "Login" : "登 錄"; /* 登 陆 */ + let btnRegister = sLanguage === "sChinese" ? "用户注册" : sLanguage === "sEnglish" ? "Register" : "用戶註冊"; /* 登 陆 */ + let btnFaceLogin = sLanguage === 'sChinese' ? '人脸登录' : (sLanguage === 'sEnglish' ? 'Face Login' : '人臉登錄');/* 人脸 登 陆 */ let Copyright = "Copyright"; /* Copyright */ let AddrOne = sLanguage === "sChinese" ? "小羚羊软件" : sLanguage === "sEnglish" ? "XiaoLingYangSoft" : "小羚羊軟件"; /* 小羚羊软件 */ let AddrTwo = sLanguage === "sChinese" ? "印刷智慧工厂" : sLanguage === "sEnglish" ? "PrintingSmartFactory" : "印刷智慧工廠"; /* 印刷智慧工厂 */ @@ -330,8 +332,15 @@ class LoginForm extends Component { const ChooseBranchCompanyData = loginInfo.filter(item => item.sControlName === "ChooseBranchCompany"); chooseBranchCompany = commonUtils.isNotEmptyArr(ChooseBranchCompanyData) ? ChooseBranchCompanyData[0].showName : chooseBranchCompany; - const BtnLoginData = loginInfo.filter(item => item.sControlName === "BtnLogin"); - btnLogin = commonUtils.isNotEmptyArr(BtnLoginData) ? BtnLoginData[0].showName : btnLogin; + const BtnLoginDataArr = loginInfo.filter(item => item.sControlName === "BtnLogin"); + btnLogin = commonUtils.isNotEmptyArr(BtnLoginDataArr) ? BtnLoginDataArr[0].showName : btnLogin; + + const BtnLoginDataRegister = loginInfo.filter(item => item.sControlName === "BtnRegister"); + btnRegister = commonUtils.isNotEmptyArr(BtnLoginDataRegister) ? BtnLoginDataRegister[0].showName : btnRegister; + + + let BtnFaceLoginArr = loginInfo.filter(item => item.sControlName === "BtnFaceLogin"); + btnFaceLogin = commonUtils.isNotEmptyArr(BtnFaceLoginArr) ? BtnFaceLoginArr[0].showName : btnFaceLogin; const CopyrightData = loginInfo.filter(item => item.sControlName === "Copyright"); Copyright = commonUtils.isNotEmptyArr(CopyrightData) ? CopyrightData[0].showName : Copyright; @@ -447,24 +456,7 @@ class LoginForm extends Component { > )} - {/**/} - {/* {getFieldDecorator('username', {*/} - {/* rules: [{ required: true, message: pleaseInputUserName }],*/} - {/* })(} placeholder={pleaseInputUserName} />)}*/} - {/**/} - {/**/} - {/* {getFieldDecorator('password', {*/} - {/* rules: [{ required: true, message: pleaseInputPassword }],*/} - {/* })(} type="password" placeholder={pleaseInputPassword} />)}*/} - {/**/} - {/* - - {getFieldDecorator('companys', { - initialValue: companysId, - rules: [{ required: true, message: chooseBranchCompany }], - })({options})} - - */} + @@ -475,12 +467,12 @@ class LoginForm extends Component { { ['project.xlyprint.cn', 'localhost'].includes(location.hostname) ? ( { this.setState({ userRegisterMode: true }); }}> - 用户注册 + {btnRegister} ) : "" } - 普通登录 - 扫脸登录 + {btnLogin} + {btnFaceLogin}