Browse Source

layout fix

master
Alex Cheung 2 years ago
parent
commit
d3e9a9a9b7
2 changed files with 11 additions and 1 deletions
  1. +1
    -1
      src/pages/authentication/auth-forms/AuthLoginCustom.js
  2. +10
    -0
      src/pages/authentication/auth-forms/CustomFormWizard.js

+ 1
- 1
src/pages/authentication/auth-forms/AuthLoginCustom.js View File

@@ -229,7 +229,7 @@ const AuthLoginCustom = () => {


<Grid item xs={12}> <Grid item xs={12}>
<AnimateButton> <AnimateButton>
<Button disableElevation onClick={tryLogin}
<Button disableElevation
fullWidth size="large" type="submit" variant="contained" color="primary"> fullWidth size="large" type="submit" variant="contained" color="primary">
登錄 登錄
</Button> </Button>


+ 10
- 0
src/pages/authentication/auth-forms/CustomFormWizard.js View File

@@ -32,6 +32,7 @@ import axios from "axios";
import {POST_PUBLIC_USER_REGISTER} from "utils/ApiPathConst"; import {POST_PUBLIC_USER_REGISTER} from "utils/ApiPathConst";
import * as HttpUtils from 'utils/HttpUtils'; import * as HttpUtils from 'utils/HttpUtils';
import UploadFileTable from './UploadFileTable'; import UploadFileTable from './UploadFileTable';
import LoadingComponent from "../../extra-pages/LoadingComponent";


// assets // assets
import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons'; import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
@@ -74,6 +75,7 @@ const CustomFormWizard = (props) => {
const [termsAndConAccept, setTermsAndConAccept] = useState(false); const [termsAndConAccept, setTermsAndConAccept] = useState(false);
const [termsAndConNotAccept, setTermsAndConNotAccept] = useState(false); const [termsAndConNotAccept, setTermsAndConNotAccept] = useState(false);
const [isValid, setisValid] = useState(false); const [isValid, setisValid] = useState(false);
const [isLoading, setLoding] = useState(true);
const idDocTypeComboList = ComboData.idDocType; const idDocTypeComboList = ComboData.idDocType;
const address4ComboList = ComboData.district; const address4ComboList = ComboData.district;
@@ -166,6 +168,7 @@ const CustomFormWizard = (props) => {


const {handleSubmit} = useForm({}) const {handleSubmit} = useForm({})
const _onSubmit = () => { const _onSubmit = () => {
setLoding(true);
values.idDocType = selectedIdDocType values.idDocType = selectedIdDocType
values.address4 = selectedAddress4 values.address4 = selectedAddress4
values.address5 = selectedAddress5 values.address5 = selectedAddress5
@@ -225,13 +228,17 @@ const CustomFormWizard = (props) => {
onSuccess: (response)=>{ onSuccess: (response)=>{
console.log(response); console.log(response);
// setOpen(true); // setOpen(true);
setLoding(false);
} }
} }
); );
}) })
.catch(error => { .catch(error => {
console.error(error); console.error(error);
setLoding(false);
}); });
}else{
setLoding(false);
} }
} }


@@ -1230,6 +1237,8 @@ const CustomFormWizard = (props) => {
{/* Submit page */} {/* Submit page */}
<FormGroup id={"submitForm"} sx={{ display: props.step === 2 ? "" : "none"}}> <FormGroup id={"submitForm"} sx={{ display: props.step === 2 ? "" : "none"}}>
<Grid container spacing={3}> <Grid container spacing={3}>
{isLoading ?
<LoadingComponent/>:
<Grid item xs={12}> <Grid item xs={12}>
{checkUpload? {checkUpload?
// SUCCESS page // SUCCESS page
@@ -1249,6 +1258,7 @@ const CustomFormWizard = (props) => {
</Stack> </Stack>
} }
</Grid> </Grid>
}
</Grid> </Grid>
</FormGroup> </FormGroup>
</form> </form>


Loading…
Cancel
Save