diff --git a/app/login/page.js b/app/login/page.js index d8edbb6..98091c2 100644 --- a/app/login/page.js +++ b/app/login/page.js @@ -131,11 +131,15 @@ function Login({ handleLogin }) { code: veriCode, }; try { - const data = await requireAPI("POST", `/api/login/${ - type === "password" ? "login_by_pswd" : "login_by_veri_code" - }`, { - body, - }); + const data = await requireAPI( + "POST", + `/api/login/${ + type === "password" ? "login_by_pswd" : "login_by_veri_code" + }`, + { + body, + } + ); if (data.ret === -1) { Toast.show({ icon: "fail", @@ -148,8 +152,12 @@ function Login({ handleLogin }) { saveUserInfo(data, mobilePhone, regionCode); signIn(data); handleLogin({ isSignin: true, userToken: data.data.token }); - - router.push(!data?.data?.is_enabled ? "/":"/my/setting/editPassword?is_enabled="+data?.data?.is_enabled); + + router.push( + !data?.data?.is_enabled + ? "/" + : "/my/setting/editPassword?is_enabled=" + data?.data?.is_enabled + ); } catch (error) { console.error(error); } @@ -198,151 +206,159 @@ function Login({ handleLogin }) { }; return (
-
- -
- { - const index = tabItems.findIndex((item) => item.key === key); - setActiveIndex(index); - swiperRef.current?.swipeTo(index); - }} - className={`w-full ${styles.customTabs}`} - > - {tabItems.map((item) => ( - - ))} - -
- null} - ref={swiperRef} - defaultIndex={activeIndex} - onIndexChange={(index) => { - setActiveIndex(index); - }} - > - -
-
-

- +{loginInfo.regionCode} -

- - setLoginInfo({ ...loginInfo, mobilePhone: value }) - } - value={loginInfo.mobilePhone} - style={{ "--color": "#FFFFFF", "--font-size": "16px","--placeholder-color": "#FFFFFF80", }} - /> -
- -
-

- 验证码 -

- setVeriCode(value)} - value={veriCode} - type="number" - style={{ - "--placeholder-color": "#FFFFFF80", - "--font-size": "16px", - }} - /> - -
-
- - -
- -
-
-

- +{loginInfo.regionCode} -

- - setLoginInfo({ ...loginInfo, mobilePhone: value }) - } - value={loginInfo.mobilePhone} - style={{ "--color": "#FFFFFF", "--font-size": "16px","--placeholder-color": "#FFFFFF80", }} - /> -
- -
-

- 密码 -

- - setLoginInfo({ ...loginInfo, password: value }) - } - value={loginInfo.password} - type="password" - style={{ - "--placeholder-color": "#FFFFFF80", - "--font-size": "16px", - }} - /> -
-
-
router.push(`/my/setting/editPassword`)} - className="w-full text-[#FF669E] text-xs mt-2 text-right" +
+ +
+ { + const index = tabItems.findIndex((item) => item.key === key); + setActiveIndex(index); + swiperRef.current?.swipeTo(index); + }} + className={`w-full ${styles.customTabs}`} > - 忘记密码? -
- - - -
+ {tabItems.map((item) => ( + + ))} + +
+ null} + ref={swiperRef} + defaultIndex={activeIndex} + onIndexChange={(index) => { + setActiveIndex(index); + }} + > + +
+
+

+ +{loginInfo.regionCode} +

+ + setLoginInfo({ ...loginInfo, mobilePhone: value }) + } + value={loginInfo.mobilePhone} + style={{ + "--color": "#FFFFFF", + "--font-size": "16px", + "--placeholder-color": "#FFFFFF80", + }} + /> +
+ +
+

+ 验证码 +

+ setVeriCode(value)} + value={veriCode} + type="number" + style={{ + "--placeholder-color": "#FFFFFF80", + "--font-size": "16px", + }} + /> + +
+
+ + +
+ +
+
+

+ +{loginInfo.regionCode} +

+ + setLoginInfo({ ...loginInfo, mobilePhone: value }) + } + value={loginInfo.mobilePhone} + style={{ + "--color": "#FFFFFF", + "--font-size": "16px", + "--placeholder-color": "#FFFFFF80", + }} + /> +
+ +
+

+ 密码 +

+ + setLoginInfo({ ...loginInfo, password: value }) + } + value={loginInfo.password} + type="password" + style={{ + "--placeholder-color": "#FFFFFF80", + "--font-size": "16px", + }} + /> +
+
+
router.push(`/my/setting/editPassword`)} + className="w-full text-[#FF669E] text-xs mt-2 text-right" + > + 忘记密码? +
+ +
+
+
); } @@ -367,14 +383,18 @@ const LoginBtn = ({ loginInfo, setLoginInfo, type, handleSubmit }) => { 我已阅读并同意 router.push(`webView/${encodeURIComponent("/doc/useragreement")}`)} + onClick={() => + router.push(`webView/${encodeURIComponent("/doc/useragreement")}`) + } className="text-[#FF669E] text-xs" > 《用户协议》 router.push(`webView/${encodeURIComponent("/doc/privatypolicy")}`)} + onClick={() => + router.push(`webView/${encodeURIComponent("/doc/privatypolicy")}`) + } className="text-[#FF669E] text-xs" > 《隐私政策》 diff --git a/app/my/setting/feedback/page.js b/app/my/setting/feedback/page.js index 5ff3194..b1301ae 100644 --- a/app/my/setting/feedback/page.js +++ b/app/my/setting/feedback/page.js @@ -7,6 +7,8 @@ import { faAngleLeft } from "@fortawesome/free-solid-svg-icons"; import { useRouter } from "next/navigation"; import UploadImgs from "@/components/UploadImgs"; import { get } from "@/utils/storeInfo"; +import {multiUploadImage} from "@/utils/upload"; +import requireAPI from "@/utils/requireAPI"; export default function Feedback() { const [value, setValue] = useState(); const [assets, setAssets] = useState([]); @@ -22,40 +24,41 @@ export default function Feedback() { }); return; } + + //提交数据 + setIsSubmitting(true); // const media = await multiUpload(assets); - console.log("media",{image_ids:assets,video_ids:[]}) - // //提交数据 - // setIsSubmitting(true); - // const media = await multiUpload(assets); - // const account = await get("account"); - // try { - // const data = await requireAPI("POST", `/api/feedback/create`, { - // body: { - // mid: account.mid, - // discription: value, - // credentials: media, - // }, - // }); - // if (data.ret === -1) { - // Toast.show({ - // icon: "fail", - // content: data.msg, - // position: "top", - // }); - // return; - // } - // //提交成功后显示Toast并返回上一页 - // Toast.show({ - // icon: "success", - // content: "反馈提交成功", - // position: "top", - // }); - // router.goBack(); - // } catch (error) { - // console.error(error); - // } finally { - // setIsSubmitting(false); - // } + const media = await multiUploadImage(assets); + console.log("media",media) + const account = await get("account"); + try { + const data = await requireAPI("POST", `/api/feedback/create`, { + body: { + mid: account.mid, + discription: value, + credentials: media, + }, + }); + if (data.ret === -1) { + Toast.show({ + icon: "fail", + content: data.msg, + position: "top", + }); + return; + } + //提交成功后显示Toast并返回上一页 + Toast.show({ + icon: "success", + content: "反馈提交成功", + position: "top", + }); + router.back(); + } catch (error) { + console.error(error); + } finally { + setIsSubmitting(false); + } }; return (
@@ -84,7 +87,7 @@ export default function Feedback() {

截图(最多9张)

- +