git
/
pioneer-share
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.0.4-issue'

This commit is contained in:
john 2024-06-13 15:48:01 +08:00
parent 906a28fe15 1a0f3b1fb8
commit 25de2f6159
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pages/SignIn.tsx
View File

@ -2,11 +2,8 @@ import { useState, useEffect } from "react";
import { useTranslation, getI18n } from "react-i18next"; import { useTranslation, getI18n } from "react-i18next";
import phoneIconSelect from "../assets/iconfont/phone_Select.svg"; import phoneIconSelect from "../assets/iconfont/phone_Select.svg";
import phoneIcon from "../assets/iconfont/phone.svg"; import phoneIcon from "../assets/iconfont/phone.svg";
import emailIcon from "../assets/iconfont/email.svg";
import emailIconSelect from "../assets/iconfont/email_Select.svg";
import Logo from "../assets/img/logo.png"; import Logo from "../assets/img/logo.png";
import "./SignIn.scss"; import "./SignIn.scss";
import EmailForm from "../components/EmailForm";
import PhoneForm from "../components/PhoneForm"; import PhoneForm from "../components/PhoneForm";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import useUserStore from "../store/user.ts"; import useUserStore from "../store/user.ts";
@ -17,7 +14,7 @@ function SignIn() {
const lang: string = getI18n().language; const lang: string = getI18n().language;
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const [selectIndex, setSelectIndex] = useState<number>(0); const [selectIndex, setSelectIndex] = useState<number>(1);
const { previousPathName, UpdatePreviousPathName } = useUserStore(); const { previousPathName, UpdatePreviousPathName } = useUserStore();
const navigate = useNavigate(); const navigate = useNavigate();
const { UpdateLang } = useUserStore(); const { UpdateLang } = useUserStore();
@ -103,13 +100,13 @@ function SignIn() {
<img src={Logo} alt="" /> <img src={Logo} alt="" />
</div> </div>
<div className="tabs"> <div className="tabs">
<div {/* <div
className={`tabs-button ${selectIndex === 0 && "selected"}`} className={`tabs-button ${selectIndex === 0 && "selected"}`}
onClick={handleTabs(0)} onClick={handleTabs(0)}
> >
<img src={selectIndex === 0 ? emailIconSelect : emailIcon} alt="" /> <img src={selectIndex === 0 ? emailIconSelect : emailIcon} alt="" />
<span>{t("E-mail")}</span> <span>{t("E-mail")}</span>
</div> </div> */}
<div <div
className={`tabs-button ${selectIndex === 1 && "selected"}`} className={`tabs-button ${selectIndex === 1 && "selected"}`}
onClick={handleTabs(1)} onClick={handleTabs(1)}
@ -118,7 +115,7 @@ function SignIn() {
<span>{t("phone")}</span> <span>{t("phone")}</span>
</div> </div>
</div> </div>
{selectIndex === 0 && <EmailForm></EmailForm>} {/* {selectIndex === 0 && <EmailForm></EmailForm>} */}
{selectIndex === 1 && <PhoneForm></PhoneForm>} {selectIndex === 1 && <PhoneForm></PhoneForm>}
<div className="to-download"> <div className="to-download">
<p style={{ color: "#999999" }}> <p style={{ color: "#999999" }}>