chore: user模块去掉less和样式调整 (#11002)

src/app.tsx

@@ -34,7 +34,7 @@ export async function getInitialState(): Promise<{
   };
   // 如果不是登录页面，执行
   const { location } = history;
-  if (location.pathname !== loginPath) {
+  if (![loginPath, '/user/register', '/user/register-result'].includes(location.pathname)) {
     const currentUser = await fetchUserInfo();
     return {
       fetchUserInfo,

src/pages/user/register-result/style.less

@@ -1,23 +0,0 @@
-.registerResult {
-  width: 800px;
-  min-height: 400px;
-  margin: auto;
-  padding: 80px;
-  background: none;
-  :global {
-    .anticon {
-      font-size: 64px;
-    }
-  }
-  .title {
-    margin-top: 32px;
-    font-size: 20px;
-    line-height: 28px;
-  }
-  .actions {
-    margin-top: 40px;
-    a + a {
-      margin-left: 8px;
-    }
-  }
-}

src/pages/user/register/index.tsx

@@ -1,5 +1,5 @@
 import { history, Link, useRequest } from '@umijs/max';
-import { Button, Col, Form, Input, message, Popover, Progress, Row, Select } from 'antd';
+import { Button, Col, Form, Input, message, Popover, Progress, Row, Select, Space } from 'antd';
 import type { Store } from 'antd/es/form/interface';
 import type { FC } from 'react';
 import { useEffect, useState } from 'react';
@@ -9,7 +9,6 @@ import useStyles from './style.style';
 
 const FormItem = Form.Item;
 const { Option } = Select;
-const InputGroup = Input.Group;
 
 const passwordProgressMap: {
   ok: 'success';
@@ -83,7 +82,7 @@ const Register: FC = () => {
       if (data.status === 'ok') {
         message.success('注册成功！');
         history.push({
-          pathname: '/user/register-result?account=' + params.email,
+          pathname: `/user/register-result?account=${params[0].email}`,
         });
       }
     },
@@ -140,7 +139,7 @@ const Register: FC = () => {
       <h3>注册</h3>
       <Form form={form} name="UserRegister" onFinish={onFinish}>
         <FormItem
-          name="mail"
+          name="email"
           rules={[
             {
               required: true,
@@ -216,37 +215,35 @@ const Register: FC = () => {
         >
           <Input size="large" type="password" placeholder="确认密码" />
         </FormItem>
-        <InputGroup compact>
+        <FormItem
-          <Select
+          name="mobile"
-            size="large"
+          rules={[
-            value={prefix}
+            {
-            onChange={changePrefix}
+              required: true,
-            style={{
+              message: '请输入手机号!',
-              width: '20%',
+            },
-            }}
+            {
-          >
+              pattern: /^\d{11}$/,
-            <Option value="86">+86</Option>
+              message: '手机号格式错误!',
-            <Option value="87">+87</Option>
+            },
-          </Select>
+          ]}
-          <FormItem
+        >
-            style={{
+          <Space.Compact style={{ width: '100%' }}>
-              width: '80%',
+            <Select
-            }}
+              size="large"
-            name="mobile"
+              value={prefix}
-            rules={[
+              onChange={changePrefix}
-              {
+              style={{
-                required: true,
+                width: '30%',
-                message: '请输入手机号!',
+              }}
-              },
+            >
-              {
+              <Option value="86">+86</Option>
-                pattern: /^\d{11}$/,
+              <Option value="87">+87</Option>
-                message: '手机号格式错误!',
+            </Select>
-              },
+
-            ]}
-          >
             <Input size="large" placeholder="手机号" />
-          </FormItem>
+          </Space.Compact>
-        </InputGroup>
+        </FormItem>
         <Row gutter={8}>
           <Col span={16}>
             <FormItem
@@ -273,18 +270,20 @@ const Register: FC = () => {
           </Col>
         </Row>
         <FormItem>
-          <Button
+          <div className={styles.footer}>
-            size="large"
+            <Button
-            loading={submitting}
+              size="large"
-            className={styles.submit}
+              loading={submitting}
-            type="primary"
+              className={styles.submit}
-            htmlType="submit"
+              type="primary"
-          >
+              htmlType="submit"
-            <span>注册</span>
+            >
-          </Button>
+              <span>注册</span>
-          <Link className={styles.login} to="/user/login">
+            </Button>
-            <span>使用已有账户登录</span>
+            <Link to="/user/login">
-          </Link>
+              <span>使用已有账户登录</span>
+            </Link>
+          </div>
         </FormItem>
       </Form>
     </div>

src/pages/user/register/style.less

@@ -1,60 +0,0 @@
-@import '~antd/es/style/themes/default.less';
-
-.main {
-  width: 368px;
-  margin: 0 auto;
-
-  h3 {
-    margin-bottom: 20px;
-    font-size: 16px;
-  }
-
-  .password {
-    margin-bottom: 24px;
-    :global {
-      .ant-form-item-explain {
-        display: none;
-      }
-    }
-  }
-
-  .getCaptcha {
-    display: block;
-    width: 100%;
-  }
-
-  .submit {
-    width: 50%;
-  }
-
-  .login {
-    float: right;
-    line-height: @btn-height-lg;
-  }
-}
-
-.success,
-.warning,
-.error {
-  transition: color 0.3s;
-}
-
-.success {
-  color: @success-color;
-}
-
-.warning {
-  color: @warning-color;
-}
-
-.error {
-  color: @error-color;
-}
-
-.progress-pass > .progress {
-  :global {
-    .ant-progress-bg {
-      background-color: @warning-color;
-    }
-  }
-}

src/pages/user/register/style.style.ts

@@ -15,13 +15,16 @@ const useStyles = createStyles(({ token }) => {
       display: 'block',
       width: '100%',
     },
+
+    footer: {
+      width: '100%',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+    },
     submit: {
       width: '50%',
     },
-    login: {
-      float: 'right',
-      lineHeight: token.controlHeight,
-    },
     success: {
       transition: 'color 0.3s',
       color: token.colorSuccess,