From 216e8a469e310719b7499c4ab34074651168cc68 Mon Sep 17 00:00:00 2001 From: Ethereal <3432649580@qq.com> Date: Thu, 23 Oct 2025 17:14:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=99=BB=E5=BD=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../start/components/login-prompt/login-prompt.vue | 134 ---------- pages/start/login/login.vue | 286 ++++++++++++++++----- static/icons/Check-one-false.png | Bin 0 -> 1079 bytes static/icons/Check-one-true.png | Bin 0 -> 1396 bytes 4 files changed, 215 insertions(+), 205 deletions(-) delete mode 100644 pages/start/components/login-prompt/login-prompt.vue create mode 100644 static/icons/Check-one-false.png create mode 100644 static/icons/Check-one-true.png diff --git a/pages/start/components/login-prompt/login-prompt.vue b/pages/start/components/login-prompt/login-prompt.vue deleted file mode 100644 index 52d43b1..0000000 --- a/pages/start/components/login-prompt/login-prompt.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue index ab5e5d7..244398f 100644 --- a/pages/start/login/login.vue +++ b/pages/start/login/login.vue @@ -9,12 +9,16 @@ --> - + 联系客服 @@ -29,32 +33,45 @@ 邮箱/用户名用户名 手机号邮箱 - + - + - + - + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + 接受 用户协议 和 + 隐私政策 + + + 忘记ID/密码 + - + - 或者 + 如果您还没有账号,点击注册 > + @@ -126,15 +213,9 @@ src="../../../static/icons/GoogleIcons.png" mode="aspectFit" > - 通过 Google 继续 + 通过 Google 登录 - - - @@ -151,6 +232,9 @@ const switchType = ref("Email"); // 默认是邮箱注册 const { safeAreaInsets } = uni.getSystemInfoSync(); const codeBtnText = ref("获取验证码"); const isCodeBtnDisabled = ref(false); // 添加验证码按钮禁用状态 +const checkboxUrl = ref("../../../static/icons/Check-one-false.png"); + + // 使用从list.js导入的完整国家列表数据 const countries = ref( @@ -183,7 +267,14 @@ function showCountryPicker() { function goToIndex() { // 返回上一页 - uni.navigateTo({ url: "/pages/start/index/index" }); + uni.navigateTo({ + url: "/pages/start/index/index", + }); +} + +function switchUser() { + // 切换到手机注册 + switchType.value = "User"; } function switchEmail() { @@ -236,7 +327,6 @@ function loginWithApple() { uni.getUserInfo({ provider: "apple", success: function (info) { - // 获取用户信息成功, info.authResult中保存登录认证数据 console.log(info); }, }); @@ -259,7 +349,6 @@ function loginWithGoogle() { uni.getUserInfo({ provider: "google", success: function (info) { - // 获取用户信息成功, info.authResult保存用户信息 console.log(info); }, }); @@ -290,27 +379,53 @@ function onPhoneInput(e) { } } -function sendCode(){ +function sendCode() { // 如果按钮已禁用,则不执行后续逻辑 if (isCodeBtnDisabled.value) return; - + // 设置按钮为禁用状态 isCodeBtnDisabled.value = true; - codeBtnText.value = "重新发送" - let time = 6 + codeBtnText.value = "重新发送"; + let time = 6; const timer = setInterval(() => { - time-- - codeBtnText.value = "重新发送 " + time + "s" + time--; + codeBtnText.value = "重新发送 " + time + "s"; if (time <= 0) { - clearInterval(timer) - codeBtnText.value = "重新发送" + clearInterval(timer); + codeBtnText.value = "重新发送"; // 倒计时结束后启用按钮 isCodeBtnDisabled.value = false; } - }, 1000) - + }, 1000); + + return; +} + +function openAgreement() { + // 打开用户协议 + console.log("打开用户协议"); + uni.navigateTo({ + url: "/pages/start/agreement/agreement", + }); +} + +function openPrivacy() { + // 打开隐私政策 + console.log("打开隐私政策"); + uni.navigateTo({ + url: "/pages/start/privacy/privacy", + }); +} - return +function recoverPassword() { + // 忘记密码 + console.log("忘记密码"); +} + + +function changeCheckbox(){ + agreed.value = !agreed.value; + checkboxUrl.value = agreed.value ? "../../../static/icons/Check-one-true.png" : "../../../static/icons/Check-one-false.png"; } @@ -320,7 +435,7 @@ function sendCode(){ flex-direction: column; align-items: center; justify-content: center; - padding: 0 40rpx; + padding: 0 70rpx; height: 100vh; background-color: #ffffff; } @@ -356,6 +471,7 @@ function sendCode(){ height: 40rpx; /* margin-right: 10rpx; */ } + .back-btn, .headphone-btn { font-size: 36rpx; @@ -379,6 +495,7 @@ function sendCode(){ /* text-align: left; */ /* align-self: flex-start; */ } + .switch-container { display: flex; margin-bottom: 40rpx; @@ -398,7 +515,8 @@ function sendCode(){ bottom: 0; left: 50%; transform: translateX(-50%); - width: 60%; /* 控制边框宽度 */ + width: 60%; + /* 控制边框宽度 */ height: 2rpx; background-color: transparent; } @@ -415,14 +533,14 @@ function sendCode(){ bottom: 0; left: 50%; transform: translateX(-50%); - width: 30%; /* 控制边框宽度 */ + width: 30%; + /* 控制边框宽度 */ height: 7rpx; background-color: #333333; } .input-container { width: 100%; - margin-bottom: 40rpx; } /* 添加图标输入框样式 */ @@ -498,7 +616,7 @@ function sendCode(){ height: 100%; border: none; background-color: transparent; - padding: 0 20rpx; + padding: 0 0rpx; } .send-code-btn { @@ -512,34 +630,62 @@ function sendCode(){ border-radius: 4px; background: #000; } +.send-code-btn-email { + width: 200rpx; + height: 60rpx; + display: inline-flex; + padding: 0rpx 10rpx; + justify-content: center; + align-items: center; + gap: 10px; + border-radius: 4px; + background: #000; + margin-right: 15rpx; +} .send-code-btn-disabled { - background: #E6E6E6; /* 禁用状态下的灰色背景 */ + background: #e6e6e6; + /* 禁用状态下的灰色背景 */ } + .send-code-btn-disabled-text { color: #999999 !important; } - -.send-code-text{ +.send-code-text { color: #fff; font-size: 28rpx; } +.agreement-container-one { + display: flex; + align-items: center; + align-self: flex-start; + margin-bottom: 80rpx; +} + .agreement-container { - /* display: flex; */ + display: flex; align-items: center; margin-bottom: 40rpx; + margin-top: -75.5rpx; align-self: flex-start; } .checkbox { - width: 10rpx; - height: 10rpx; - margin-right: 30rpx; + width: 30rpx; + height: 30rpx; + margin-left: 20rpx; /* flex: content; */ } +.agreement-text-one { + font-size: 22rpx; + color: #666666; + text-align: center; + margin-left: 10rpx; +} + .agreement-text { margin-left: 20rpx; font-size: 24rpx; @@ -573,14 +719,17 @@ function sendCode(){ width: 100%; margin-bottom: 60rpx; } + .third-party-text { + color: #ffffff; font-weight: bold; + white-space: pre; } .third-party-btn { width: 100%; height: 80rpx; - background-color: white; + background-color: rgb(0, 0, 0); border: 2rpx solid #e5e5e5; border-radius: 40rpx; display: flex; @@ -591,15 +740,10 @@ function sendCode(){ color: #333333; } +.google-icon, .apple-icon { - width: 30rpx; - height: 30rpx; - margin-right: 20rpx; -} - -.google-icon { - width: 30rpx; - height: 30rpx; + width: 60rpx; + height: 60rpx; margin-right: 20rpx; } diff --git a/static/icons/Check-one-false.png b/static/icons/Check-one-false.png new file mode 100644 index 0000000000000000000000000000000000000000..e924fd2743443d6c79b0fc604cce6d129a4f2d40 GIT binary patch literal 1079 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