登录更快更安全
@@ -203,15 +205,16 @@ export default observer(() => {
size: "large",
}}
placeholder={"请输入验证码"}
- captchaTextRender={(timing: boolean) => {
+ captchaTextRender={(timing: boolean, count: number) => {
if (timing) {
- return `${"获取验证码"}`;
+ return `${count} ${"获取验证码"}`;
+ // return `${"获取验证码"}`;
}
return "获取验证码";
}}
name="activeCode"
phoneName={"phone"}
- countDown={300}
+ countDown={60}
rules={[
{
required: true,
diff --git a/src/views/User/Login/index.tsx b/src/views/User/Login/index.tsx
index aaa6e06..02f237e 100644
--- a/src/views/User/Login/index.tsx
+++ b/src/views/User/Login/index.tsx
@@ -180,7 +180,7 @@ export default observer(() => {
async function oAuthLogin(type: string) {
const res: any = await oauthLogin(type);
- window.open(res.data, "_blank");
+ window.open(res.data);
}
const [loginType, setLoginType] = useState
("account");
@@ -234,7 +234,9 @@ export default observer(() => {
微信扫码
- 关注公众号
+
+ 关注公众号
+
登录更快更安全
@@ -341,10 +343,10 @@ export default observer(() => {
size: "large",
}}
placeholder={"请输入验证码"}
- captchaTextRender={(timing: boolean) => {
+ captchaTextRender={(timing: boolean, count: number) => {
if (timing) {
- // return `${count} ${"获取验证码"}`;
- return `${"获取验证码"}`;
+ return `${count} ${"获取验证码"}`;
+ // return `${"获取验证码"}`;
}
return "获取验证码";
}}
@@ -357,7 +359,7 @@ export default observer(() => {
},
]}
fieldRef={captchaRef}
- countDown={300}
+ countDown={60}
onGetCaptcha={async () => {
await openSmsCaptcha();
}}
diff --git a/src/views/User/Register/index.tsx b/src/views/User/Register/index.tsx
index d7fa92a..55e722a 100644
--- a/src/views/User/Register/index.tsx
+++ b/src/views/User/Register/index.tsx
@@ -20,6 +20,7 @@ import { getSms, register } from "@/api/user";
import { TinyColor } from "@ctrl/tinycolor";
import { get, load } from "@/api/captcha";
import RotateCaptcha, { CaptchaInstance, type TicketInfoType } from "react-rotate-captcha";
+import { useNavigate } from "react-router-dom";
// import useStore from '@/utils/store/useStore.tsx'
type LoginType = "phone";
@@ -28,6 +29,7 @@ export default observer(() => {
const registerCaptcha = useRef(null);
const smsCaptcha = useRef(null);
const captchaRef = useRef();
+ const navigate = useNavigate();
const colors = ["#6253E1", "#04BEFE"];
const getHoverColors = (colors: string[]) =>
colors.map((color) => new TinyColor(color).lighten(5).toString());
@@ -94,11 +96,15 @@ export default observer(() => {
};
const res: any = await register(data);
if (res && res.success && res.code === 0) {
- message.open({
- content: res.data,
- type: "success",
- duration: 5,
- });
+ message
+ .open({
+ content: res.data,
+ type: "success",
+ duration: 5,
+ })
+ .then(() => {
+ navigate("/login");
+ });
} else if (res.code === 0 && !res.success) {
message.open({
content: res.data,
@@ -223,15 +229,16 @@ export default observer(() => {
size: "large",
}}
placeholder={"请输入验证码"}
- captchaTextRender={(timing: boolean) => {
+ captchaTextRender={(timing: boolean, count: number) => {
if (timing) {
- return `${"获取验证码"}`;
+ return `${count} ${"获取验证码"}`;
+ // return `${"获取验证码"}`;
}
return "获取验证码";
}}
name="activeCode"
phoneName={"phone"}
- countDown={300}
+ countDown={60}
rules={[
{
required: true,
diff --git a/vite.config.ts b/vite.config.ts
index d2e2163..a19807f 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -6,7 +6,6 @@ import * as path from "path";
import { resolve } from "path";
// icons plugin
import { createSvgIconsPlugin } from "vite-plugin-svg-icons";
-import imagemin from "unplugin-imagemin/vite";
import viteCompression from "vite-plugin-compression";
import { createHtmlPlugin } from "vite-plugin-html";
import legacy from "@vitejs/plugin-legacy";
@@ -62,31 +61,6 @@ export default defineConfig(({ mode }) => {
// 指定symbolId格式
symbolId: "icon-[dir]-[name]",
}),
- imagemin({
- // Default mode sharp. support squoosh and sharp
- mode: "sharp",
- beforeBundle: true,
- // Default configuration options for compressing different pictures
- compress: {
- jpg: {
- quality: 10,
- },
- jpeg: {
- quality: 10,
- },
- png: {
- quality: 10,
- },
- webp: {
- quality: 10,
- },
- },
- conversion: [
- { from: "jpeg", to: "webp" },
- { from: "png", to: "webp" },
- { from: "JPG", to: "jpeg" },
- ],
- }),
viteCompression({
verbose: true, // 是否在控制台中输出压缩结果
disable: false,
- 
- 
-