diff --git a/pages/start/Registration/Registration.vue b/pages/start/Registration/Registration.vue
index 71c6aa2..8e9ceb2 100644
--- a/pages/start/Registration/Registration.vue
+++ b/pages/start/Registration/Registration.vue
@@ -283,7 +283,7 @@ function sendCode() {
let time = 6;
const timer = setInterval(() => {
time--;
- codeBtnText.value = "重新发送 " + time + "s";
+ codeBtnText.value = "重新发送 " + time + "S";
if (time <= 0) {
clearInterval(timer);
codeBtnText.value = "重新发送";
@@ -604,7 +604,8 @@ function changeCheckbox() {
flex-direction: column;
font-size: 24rpx;
color: #999999;
- margin-bottom: 100rpx;
+ margin-top: 330rpx;
+ margin-bottom: -22rpx;
}
.third-party-login {
diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue
index b931c69..f5243d6 100644
--- a/pages/start/login/login.vue
+++ b/pages/start/login/login.vue
@@ -218,6 +218,17 @@
通过 Google 登录
+
+
+
+
+
@@ -226,9 +237,11 @@
import { ref } from "vue";
// 导入完整的国家列表
import countryList from "./list.js";
-import footerBar from '../../../components/footerBar-cn'
+import footerBar from "../../../components/footerBar-cn";
+import uniPopupDialogVue from "../../../uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue";
+import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
-const type = ref('member')
+const type = ref("member");
const email = ref("");
const password = ref("");
const phone = ref("");
@@ -291,6 +304,8 @@ function switchPhone() {
}
function register() {
+ if (switchType.value === "User") {
+ }
if (switchType.value === "Email") {
// 登录逻辑
if (!email.value) {
@@ -318,6 +333,31 @@ function register() {
// 发送登录请求
console.log("登录:", phone.value);
}
+
+ if (!agreed.value) {
+ // 显示同意弹窗
+ agreementPopup.value.open();
+ return;
+ }
+
+ // 如果已经同意,则继续登录流程
+ uni.showToast({
+ title: "登录成功",
+ icon: "success",
+ });
+}
+
+// 添加弹窗引用
+const agreementPopup = ref(null);
+
+// 处理同意按钮点击
+function handleAgree() {
+ // 关闭弹窗
+ agreementPopup.value.close();
+ // 设置为已同意
+ agreed.value = true;
+ checkboxUrl.value = "../../../static/icons/Check-one-true.png";
+ // 继续登录流程
}
function loginWithApple() {
@@ -771,7 +811,57 @@ function changeCheckbox() {
}
.static-footer {
- position: fixed;
- bottom: 0;
+ position: fixed;
+ bottom: 0;
}
+
+/* 弹窗样式 */
+.popup-content {
+ background-color: #ffffff;
+ padding: 40rpx;
+ text-align: center;
+ border-radius: 10rpx;
+ 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;
+ text-align: center; /* 水平居中 */
+ display: flex; /* 使用flex布局 */
+ justify-content: center; /* 水平居中 */
+ align-items: center; /* 垂直居中 */
+}
+
+.agree-button {
+ width: 300rpx;
+ height: 80rpx;
+ background-color: #000000;
+ border-radius: 40rpx;
+ display: flex; /* 添加flex布局 */
+ align-items: center; /* 垂直居中 */
+ justify-content: center; /* 水平居中 */
+}
+.agree-text {
+ color: #ffffff;
+ font-size: 34rpx;
+ /* 添加垂直居中相关样式 */
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ line-height: 1; /* 确保文字垂直居中 */
+}
+
\ No newline at end of file
diff --git a/pages/start/select/select.vue b/pages/start/select/select.vue
index 41ece7b..b86ee1e 100644
--- a/pages/start/select/select.vue
+++ b/pages/start/select/select.vue
@@ -17,11 +17,22 @@
+
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
index d5c20e1..0542c52 100644
--- a/uni_modules/uni-transition/package.json
+++ b/uni_modules/uni-transition/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-transition",
"displayName": "uni-transition 过渡动画",
- "version": "1.3.3",
+ "version": "1.3.6",
"description": "元素的简单过渡动画",
"keywords": [
"uni-ui",
@@ -12,12 +12,14 @@
],
"repository": "https://github.com/dcloudio/uni-ui",
"engines": {
- "HBuilderX": ""
+ "HBuilderX": "",
+ "uni-app": "^4.12",
+ "uni-app-x": ""
},
"directories": {
"example": "../../temps/example_temps"
},
-"dcloudext": {
+ "dcloudext": {
"sale": {
"regular": {
"price": "0.00"
@@ -35,49 +37,74 @@
"permissions": "无"
},
"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
- "type": "component-vue"
+ "type": "component-vue",
+ "darkmode": "x",
+ "i18n": "x",
+ "widescreen": "x"
},
"uni_modules": {
- "dependencies": ["uni-scss"],
+ "dependencies": [
+ "uni-scss"
+ ],
"encrypt": [],
"platforms": {
"cloud": {
- "tcb": "y",
- "aliyun": "y",
- "alipay": "n"
+ "tcb": "x",
+ "aliyun": "x",
+ "alipay": "x"
},
"client": {
- "App": {
- "app-vue": "y",
- "app-nvue": "y"
+ "uni-app": {
+ "vue": {
+ "vue2": "√",
+ "vue3": "√"
+ },
+ "web": {
+ "safari": "√",
+ "chrome": "√"
+ },
+ "app": {
+ "vue": "√",
+ "nvue": "√",
+ "android": "√",
+ "ios": "√",
+ "harmony": "√"
+ },
+ "mp": {
+ "weixin": {
+ },
+ "alipay": {
+ },
+ "toutiao": {
+ },
+ "baidu": {
+ },
+ "kuaishou": {
+ },
+ "jd": {
+ },
+ "harmony": "-",
+ "qq": "√",
+ "lark": "-"
+ },
+ "quickapp": {
+ "huawei": "√",
+ "union": "√"
+ }
},
- "H5-mobile": {
- "Safari": "y",
- "Android Browser": "y",
- "微信浏览器(Android)": "y",
- "QQ浏览器(Android)": "y"
- },
- "H5-pc": {
- "Chrome": "y",
- "IE": "y",
- "Edge": "y",
- "Firefox": "y",
- "Safari": "y"
- },
- "小程序": {
- "微信": "y",
- "阿里": "y",
- "百度": "y",
- "字节跳动": "y",
- "QQ": "y"
- },
- "快应用": {
- "华为": "u",
- "联盟": "u"
- },
- "Vue": {
- "vue2": "y",
- "vue3": "y"
+ "uni-app-x": {
+ "web": {
+ "safari": "-",
+ "chrome": "-"
+ },
+ "app": {
+ "android": "-",
+ "ios": "-",
+ "harmony": "-"
+ },
+ "mp": {
+ "weixin": "-"
+ }
}
}
}