Skip to content

J
jinfa-platform
Commit c3b23dc9 authored by GuanHua's avatar GuanHua
Browse files
Options

feat:update

parent 3131198a
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 63 deletions
src/app.tsx
View file @ c3b23dc9
...@@ -81,7 +81,7 @@ export function render(oldRender: Function) { ...@@ -81,7 +81,7 @@ export function render(oldRender: Function) {
removeRouters() removeRouters()
history.push('/user/login') history.push('/user/login')
} }
oldRender() oldRender()
}) })
} else { } else {
...@@ -116,11 +116,11 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) { ...@@ -116,11 +116,11 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
return url === pathname && selfQuery.page_type === query.page_type return url === pathname && selfQuery.page_type === query.page_type
})) { })) {
// 深度匹配成功, 可正常访问 // 深度匹配成功, 可正常访问
return ; return;
} }
// 是否在路由权限列表里 // 是否在路由权限列表里
if (routeAuthUrls.includes(pathname)) { if (routeAuthUrls.includes(pathname)) {
return ; return;
} }
// 无权限访问时 // 无权限访问时
history.replace('/memberCenter/noAuth') history.replace('/memberCenter/noAuth')
......
src/pages/user/components/LoginWrap.tsx
View file @ c3b23dc9
...@@ -14,17 +14,19 @@ const LoginWrap: React.FC = () => { ...@@ -14,17 +14,19 @@ const LoginWrap: React.FC = () => {
const [validFrame, setValidFrame] = useState(false) const [validFrame, setValidFrame] = useState(false)
const [validButton, setValidButton] = useState(false) const [validButton, setValidButton] = useState(false)
const finish = (value:any) => { const finish = (value: any) => {
PublicApi.postMemberLogin(value).then(res => { PublicApi.postMemberLogin(value).then(res => {
const { data } = res if (res.code === 1000) {
setAuth({ const { data } = res
memberId: data.memberId, setAuth({
userId: data.userId, memberId: data.memberId,
token: data.token userId: data.userId,
}) token: data.token
setRouters(data.urls) })
// 此处需使用href跳转， 否则无法触发app.ts中的路由初始化校验 setRouters(data.urls)
window.location.href = '/memberCenter/home' // 此处需使用href跳转， 否则无法触发app.ts中的路由初始化校验
window.location.href = '/memberCenter/home'
}
}) })
} }
...@@ -33,61 +35,61 @@ const LoginWrap: React.FC = () => { ...@@ -33,61 +35,61 @@ const LoginWrap: React.FC = () => {
<p>{validFrame ? '当前手机号码：xxxxxxxxx' : '请使用平台账号登录'}</p> <p>{validFrame ? '当前手机号码：xxxxxxxxx' : '请使用平台账号登录'}</p>
{ {
validFrame ? validFrame ?
<> <>
<Row gutter={[0,80]}> <Row gutter={[0, 80]}>
<Col span={16}> <Col span={16}>
<Input size='large'/> <Input size='large' />
</Col> </Col>
<Col offset={1} span={7}> <Col offset={1} span={7}>
<Button type='default' size='large'>获取验证码</Button> <Button type='default' size='large'>获取验证码</Button>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col span={24}> <Col span={24}>
<Button type='primary' size='large' htmlType='submit' block>点击登录</Button> <Button type='primary' size='large' htmlType='submit' block>点击登录</Button>
</Col> </Col>
</Row> </Row>
</> </>
: :
<Form <Form
onFinish={finish} onFinish={finish}
>
<Form.Item
name='account'
rules={
[
{
required: true,
message: <><ExclamationCircleFilled style={{marginRight: 6}}/><span>请输入正确的用户名</span></>
}
]
}
>
<Input prefix={<UserOutlined />} placeholder='用户名/手机号' size='large'/>
</Form.Item>
<Form.Item
name='password'
rules={
[
{
required: true,
message: <><ExclamationCircleFilled style={{marginRight: 6}}/><span>请输入正确的密码</span></>
}
]
}
> >
<Input.Password prefix={<LockOutlined />} placeholder='请输入密码' size='large'/> <Form.Item
</Form.Item> name='account'
{ validButton && (<Form.Item rules={
[
{
required: true,
message: <><ExclamationCircleFilled style={{ marginRight: 6 }} /><span>请输入正确的用户名</span></>
}
]
}
>
<Input prefix={<UserOutlined />} placeholder='用户名/手机号' size='large' />
</Form.Item>
<Form.Item
name='password'
rules={
[
{
required: true,
message: <><ExclamationCircleFilled style={{ marginRight: 6 }} /><span>请输入正确的密码</span></>
}
]
}
>
<Input.Password prefix={<LockOutlined />} placeholder='请输入密码' size='large' />
</Form.Item>
{validButton && (<Form.Item
className={styles.loginVerBtn} className={styles.loginVerBtn}
> >
<Button ghost type='primary' block size='large'>点击进行验证</Button> <Button ghost type='primary' block size='large'>点击进行验证</Button>
</Form.Item>) </Form.Item>)
} }
<Form.Item> <Form.Item>
<Button type='primary' size='large' htmlType='submit' block>登录</Button> <Button type='primary' size='large' htmlType='submit' block>登录</Button>
</Form.Item> </Form.Item>
</Form> </Form>
} }
</> </>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment