|
|
|
@ -223,11 +223,21 @@ |
|
|
|
<!-- 同意弹窗 --> |
|
|
|
<uniPopup ref="agreementPopup" type="dialog"> |
|
|
|
<view class="popup-content"> |
|
|
|
<text class="popup-title">同意并继续</text> |
|
|
|
<text class="popup-message">请阅读并同意服务协议和隐私权限</text> |
|
|
|
<button class="agree-button" @click="handleAgree"> |
|
|
|
<text class="agree-text">同意</text> |
|
|
|
</button> |
|
|
|
<text class="popup-message" |
|
|
|
>请阅读并同意<text @click="openAgreement" class="popup-message-link" |
|
|
|
>服务协议</text |
|
|
|
>和<text @click="openPrivacy" class="popup-message-link" |
|
|
|
>隐私权限</text |
|
|
|
> |
|
|
|
</text> |
|
|
|
<view class="button-group"> |
|
|
|
<button class="cancel-button" @click="handleCancel"> |
|
|
|
<text class="cancel-text">取消</text> |
|
|
|
</button> |
|
|
|
<button class="agree-button" @click="handleAgree"> |
|
|
|
<text class="agree-text">同意</text> |
|
|
|
</button> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</uniPopup> |
|
|
|
<footerBar class="static-footer" :type="type"></footerBar> |
|
|
|
@ -419,7 +429,7 @@ async function register() { |
|
|
|
idToken: "", |
|
|
|
}); |
|
|
|
|
|
|
|
const message = res.message |
|
|
|
const message = res.message; |
|
|
|
if (res.code === 200) { |
|
|
|
// 登录成功 |
|
|
|
uni.showToast({ |
|
|
|
@ -466,6 +476,11 @@ function handleAgree() { |
|
|
|
checkboxUrl.value = "../../../static/icons/Check-one-true.png"; |
|
|
|
// 继续登录流程 |
|
|
|
} |
|
|
|
// 处理同意按钮点击 |
|
|
|
function handleCancel() { |
|
|
|
// 关闭弹窗 |
|
|
|
agreementPopup.value.close(); |
|
|
|
} |
|
|
|
|
|
|
|
function loginWithApple() { |
|
|
|
// Apple登录逻辑 |
|
|
|
@ -576,20 +591,16 @@ async function sendCode() { |
|
|
|
// 如果按钮已禁用,则不执行后续逻辑 |
|
|
|
if (isCodeBtnDisabled.value) return; |
|
|
|
|
|
|
|
|
|
|
|
// 发送验证码 |
|
|
|
const res = await SendCodeApi({ |
|
|
|
|
|
|
|
}) |
|
|
|
console.log("验证码:",res.message); |
|
|
|
const res = await SendCodeApi({}); |
|
|
|
console.log("验证码:", res.message); |
|
|
|
|
|
|
|
|
|
|
|
const message = res.message |
|
|
|
if(res.code ===200){ |
|
|
|
uni.showToast({ |
|
|
|
title: message, |
|
|
|
icon: "none", |
|
|
|
}); |
|
|
|
const message = res.message; |
|
|
|
if (res.code === 200) { |
|
|
|
uni.showToast({ |
|
|
|
title: message, |
|
|
|
icon: "none", |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
// 设置按钮为禁用状态 |
|
|
|
@ -1034,30 +1045,29 @@ function validatePhoneNumber(countryCode, phoneNumber) { |
|
|
|
width: 550rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-title { |
|
|
|
font-size: 36rpx; |
|
|
|
font-weight: bold; |
|
|
|
color: #333; |
|
|
|
margin-bottom: 80rpx; |
|
|
|
text-align: center; /* 水平居中 */ |
|
|
|
display: flex; /* 使用flex布局 */ |
|
|
|
justify-content: center; /* 水平居中 */ |
|
|
|
align-items: center; /* 垂直居中 */ |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.popup-message { |
|
|
|
font-size: 28rpx; |
|
|
|
color: #000000; |
|
|
|
margin-bottom: 80rpx; |
|
|
|
margin-bottom: 60rpx; |
|
|
|
margin-top: 20rpx; |
|
|
|
text-align: center; /* 水平居中 */ |
|
|
|
display: flex; /* 使用flex布局 */ |
|
|
|
justify-content: center; /* 水平居中 */ |
|
|
|
align-items: center; /* 垂直居中 */ |
|
|
|
font-weight: 300; |
|
|
|
} |
|
|
|
.popup-message-link{ |
|
|
|
font-weight: 700; |
|
|
|
} |
|
|
|
.button-group { |
|
|
|
display: flex; |
|
|
|
justify-content: space-around; |
|
|
|
} |
|
|
|
|
|
|
|
.agree-button { |
|
|
|
width: 300rpx; |
|
|
|
height: 80rpx; |
|
|
|
width: 160rpx; |
|
|
|
height: 56rpx; |
|
|
|
background-color: #000000; |
|
|
|
border-radius: 40rpx; |
|
|
|
display: flex; /* 添加flex布局 */ |
|
|
|
@ -1073,4 +1083,23 @@ function validatePhoneNumber(countryCode, phoneNumber) { |
|
|
|
justify-content: center; |
|
|
|
line-height: 1; /* 确保文字垂直居中 */ |
|
|
|
} |
|
|
|
|
|
|
|
.cancel-button { |
|
|
|
width: 160rpx; |
|
|
|
height: 56rpx; |
|
|
|
background-color: #e5e5e5; |
|
|
|
border-radius: 40rpx; |
|
|
|
display: flex; /* 添加flex布局 */ |
|
|
|
align-items: center; /* 垂直居中 */ |
|
|
|
justify-content: center; /* 水平居中 */ |
|
|
|
} |
|
|
|
.cancel-text { |
|
|
|
color: #333333; |
|
|
|
font-size: 34rpx; |
|
|
|
/* 添加垂直居中相关样式 */ |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
justify-content: center; |
|
|
|
line-height: 1; /* 确保文字垂直居中 */ |
|
|
|
} |
|
|
|
</style> |