diff --git a/pages.json b/pages.json
index 8ccdc0b..e20f43e 100644
--- a/pages.json
+++ b/pages.json
@@ -137,6 +137,15 @@
 				"navigationStyle": "custom",
 				"titleNView": false
 			}
+		},
+		{
+			"path" : "pages/start/recoverPassword/recoverPassword",
+			"style" : 
+			{
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"titleNView": false
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/start/Registration/Registration.vue b/pages/start/Registration/Registration.vue
index 71c6aa2..8ada58d 100644
--- a/pages/start/Registration/Registration.vue
+++ b/pages/start/Registration/Registration.vue
@@ -145,17 +145,23 @@
       >
     </view>
 
-
     <!-- 注册按钮 -->
     <button class="register-btn" @click="register">注册</button>
 
     <!-- 或者 -->
-    <text class="or-text" @click="goToLogin"
-      >已有账号？登录 
-    </text>
-
-   		<footerBar class="static-footer" :type="type"></footerBar>
-
+    <text class="or-text" @click="goToLogin">已有账号？登录 </text>
+
+    <!-- 同意弹窗 -->
+    <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>
+      </view>
+    </uniPopup>
+    <footerBar class="static-footer" :type="type"></footerBar>
   </view>
 </template>
 
@@ -163,15 +169,17 @@
 import { ref } from "vue";
 // 导入完整的国家列表
 import countryList from "../login/list";
-import footerBar from '../../../components/footerBar-cn.vue'
+import footerBar from "../../../components/footerBar-cn.vue";
+import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
+import { verificationPhone, verificationEmail } from "../login/verification";
 
-
-const type = ref('member')
+const type = ref("member");
 const email = ref("");
 const password = ref("");
 const phone = ref("");
+const country = ref("+86");
 const agreed = ref(false);
-const switchType = ref("Email"); // 默认是邮箱注册
+const switchType = ref("Phone"); // 默认是邮箱注册
 const { safeAreaInsets } = uni.getSystemInfoSync();
 const codeBtnText = ref("获取验证码");
 const isCodeBtnDisabled = ref(false); // 添加验证码按钮禁用状态
@@ -223,37 +231,109 @@ function switchPhone() {
   switchType.value = "Phone";
 }
 
+// function register() {
+//   if (switchType.value === "Email") {
+//     // 登录逻辑
+//     if (!email.value) {
+//       uni.showToast({
+//         title: "请输入邮箱地址",
+//         icon: "none",
+//       });
+//       return;
+//     }
+
+//     // 发送登录请求
+//     console.log("登录:", email.value);
+//   }
+
+//   if (switchType.value === "Phone") {
+//     // 登录逻辑
+//     if (!phone.value) {
+//       uni.showToast({
+//         title: "请输入手机号码",
+//         icon: "none",
+//       });
+//       return;
+//     }
+
+//     // 发送登录请求
+//     console.log("登录:", phone.value);
+//   }
+// }
 function register() {
-  if (switchType.value === "Email") {
+  if (switchType.value === "Phone") {
     // 登录逻辑
-    if (!email.value) {
+    if (!phone.value) {
       uni.showToast({
-        title: "请输入邮箱地址",
+        title: "请输入手机号码",
         icon: "none",
       });
       return;
     }
 
+    if (!password.value) {
+      uni.showToast({
+        title: "请输入验证码",
+        icon: "none",
+      });
+      return;
+    }
+    const phoneAll = `${country.value}${phone.value}`;
+    console.log("完整手机号" + phoneAll);
+    if (validatePhoneNumber(country.value, phone.value)) {
+      console.log("登录成功:", phoneAll);
+    }
+
     // 发送登录请求
-    console.log("登录:", email.value);
+    // console.log("登录:", phone.value);
   }
 
-  if (switchType.value === "Phone") {
+  if (switchType.value === "Email") {
     // 登录逻辑
-    if (!phone.value) {
+    if (!email.value) {
       uni.showToast({
-        title: "请输入手机号码",
+        title: "请输入邮箱地址",
+        icon: "none",
+      });
+      return;
+    }
+
+    if (!password.value) {
+      uni.showToast({
+        title: "请输入验证码",
+        icon: "none",
+      });
+      return;
+    }
+
+    const bool = verificationEmail(email.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "邮箱格式不正确",
         icon: "none",
       });
       return;
     }
 
     // 发送登录请求
-    console.log("登录:", phone.value);
+    console.log("登录:", email.value);
   }
-}
 
+  if (!agreed.value) {
+    // 显示同意弹窗
+    agreementPopup.value.open();
+    return;
+  }
 
+  // 如果已经同意，则继续登录流程
+  // uni.showToast({
+  //   title: "登录成功",
+  //   icon: "success",
+  // });
+}
 
 function goToLogin() {
   // 跳转到登录页
@@ -273,7 +353,72 @@ function onPhoneInput(e) {
   }
 }
 
+// function sendCode() {
+//   // 如果按钮已禁用，则不执行后续逻辑
+//   if (isCodeBtnDisabled.value) return;
+
+//   // 设置按钮为禁用状态
+//   isCodeBtnDisabled.value = true;
+//   codeBtnText.value = "重新发送";
+//   let time = 6;
+//   const timer = setInterval(() => {
+//     time--;
+//     codeBtnText.value = "重新发送 " + time + "S";
+//     if (time <= 0) {
+//       clearInterval(timer);
+//       codeBtnText.value = "重新发送";
+//       // 倒计时结束后启用按钮
+//       isCodeBtnDisabled.value = false;
+//     }
+//   }, 1000);
+
+//   return;
+// }
+
 function sendCode() {
+  if (switchType.value === "Phone") {
+    if (!phone.value) {
+      uni.showToast({
+        title: "请输入手机号",
+        icon: "none",
+      });
+      return;
+    }
+
+    const bool = verificationPhone(country.value, phone.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "手机号格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+  }
+
+  if (switchType.value === "Email") {
+    if (!email.value) {
+      uni.showToast({
+        title: "请输入邮箱地址",
+        icon: "none",
+      });
+      return;
+    }
+    const bool = verificationEmail(email.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "邮箱格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+  }
+
   // 如果按钮已禁用，则不执行后续逻辑
   if (isCodeBtnDisabled.value) return;
 
@@ -311,13 +456,61 @@ function openPrivacy() {
   });
 }
 
-
 function changeCheckbox() {
   agreed.value = !agreed.value;
   checkboxUrl.value = agreed.value
     ? "../../../static/icons/Check-one-true.png"
     : "../../../static/icons/Check-one-false.png";
 }
+
+// 验证手机号是否正确
+function validatePhoneNumber(countryCode, phoneNumber) {
+  // 检查是否为空
+  if (!phoneNumber || phoneNumber.trim() === "") {
+    uni.showToast({
+      title: "手机号不能为空",
+      icon: "none",
+    });
+    return false;
+  }
+
+  const bool = verificationPhone(countryCode, phoneNumber);
+  console.log("验证是否成功", bool);
+
+  // 检查格式是否正确
+  if (!bool) {
+    uni.showToast({
+      title: "手机号格式不正确",
+      icon: "none",
+    });
+    return false;
+  }
+
+  // 去掉+号后检查长度（手机号通常在7到15位之间）
+  const cleanNumber = phoneNumber.replace(/^\+/, "");
+  if (cleanNumber.length < 7 || cleanNumber.length > 15) {
+    uni.showToast({
+      title: "手机号长度不正确",
+      icon: "none",
+    });
+    return false;
+  }
+
+  return true;
+}
+
+// 添加弹窗引用
+const agreementPopup = ref(null);
+
+// 处理同意按钮点击
+function handleAgree() {
+  // 关闭弹窗
+  agreementPopup.value.close();
+  // 设置为已同意
+  agreed.value = true;
+  checkboxUrl.value = "../../../static/icons/Check-one-true.png";
+  // 继续登录流程
+}
 </script>
 
 <style scoped>
@@ -604,7 +797,8 @@ function changeCheckbox() {
   flex-direction: column;
   font-size: 24rpx;
   color: #999999;
-  margin-bottom: 100rpx;
+  margin-top: 330rpx;
+  margin-bottom: -22rpx;
 }
 
 .third-party-login {
@@ -658,7 +852,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; /* 确保文字垂直居中 */
 }
 </style>
\ No newline at end of file
diff --git a/pages/start/Registration/list.js b/pages/start/Registration/list.js
new file mode 100644
index 0000000..60058fb
--- /dev/null
+++ b/pages/start/Registration/list.js
@@ -0,0 +1,1341 @@
+export default {
+	"list": [
+     {
+          "short": "AD",
+          "name": "安道尔共和国",
+          "en": "Andorra",
+          "tel": "376",
+          "flag": "../../../static/flag/ad.png"
+     },
+     {
+          "short": "AE",
+          "name": "阿拉伯联合酋长国",
+          "en": "UnitedArabEmirates",
+          "tel": "971",
+          "flag": "../../../static/flag/ae.png"
+     },
+     {
+          "short": "AF",
+          "name": "阿富汗",
+          "en": "Afghanistan",
+          "tel": "93",
+          "flag": "../../../static/flag/af.png"
+     },
+     {
+          "short": "AG",
+          "name": "安提瓜和巴布达",
+          "en": "AntiguaandBarbuda",
+          "tel": "1268",
+          "flag": "../../../static/flag/ag.png"
+     },
+     {
+          "short": "AI",
+          "name": "安圭拉岛",
+          "en": "Anguilla",
+          "tel": "1264",
+          "flag": "../../../static/flag/ai.png"
+     },
+     {
+          "short": "AL",
+          "name": "阿尔巴尼亚",
+          "en": "Albania",
+          "tel": "355",
+          "flag": "../../../static/flag/al.png"
+     },
+     {
+          "short": "AM",
+          "name": "阿美尼亚",
+          "en": "Armenia",
+          "tel": "374",
+          "flag": "../../../static/flag/am.png"
+     },
+     {
+          "short": "SH",
+          "name": "阿森松",
+          "en": "Ascension",
+          "tel": "247",
+          "flag": "../../../static/flag/sh.png"
+     },
+     {
+          "short": "AO",
+          "name": "安哥拉",
+          "en": "Angola",
+          "tel": "244",
+          "flag": "../../../static/flag/ao.png"
+     },
+     {
+          "short": "AR",
+          "name": "阿根廷",
+          "en": "Argentina",
+          "tel": "54",
+          "flag": "../../../static/flag/ar.png"
+     },
+     {
+          "short": "AT",
+          "name": "奥地利",
+          "en": "Austria",
+          "tel": "43",
+          "flag": "../../../static/flag/at.png"
+     },
+     {
+          "short": "AU",
+          "name": "澳大利亚",
+          "en": "Australia",
+          "tel": "61",
+          "flag": "../../../static/flag/au.png"
+     },
+     {
+          "short": "AZ",
+          "name": "阿塞拜疆",
+          "en": "Azerbaijan",
+          "tel": "994",
+          "flag": "../../../static/flag/az.png"
+     },
+     {
+          "short": "BB",
+          "name": "巴巴多斯",
+          "en": "Barbados",
+          "tel": "1246",
+          "flag": "../../../static/flag/bb.png"
+     },
+     {
+          "short": "BD",
+          "name": "孟加拉国",
+          "en": "Bangladesh",
+          "tel": "880",
+          "flag": "../../../static/flag/bd.png"
+     },
+     {
+          "short": "BE",
+          "name": "比利时",
+          "en": "Belgium",
+          "tel": "32",
+          "flag": "../../../static/flag/be.png"
+     },
+     {
+          "short": "BF",
+          "name": "布基纳法索",
+          "en": "Burkina-faso",
+          "tel": "226",
+          "flag": "../../../static/flag/bf.png"
+     },
+     {
+          "short": "BG",
+          "name": "保加利亚",
+          "en": "Bulgaria",
+          "tel": "359",
+          "flag": "../../../static/flag/bg.png"
+     },
+     {
+          "short": "BH",
+          "name": "巴林",
+          "en": "Bahrain",
+          "tel": "973",
+          "flag": "../../../static/flag/bh.png"
+     },
+     {
+          "short": "BI",
+          "name": "布隆迪",
+          "en": "Burundi",
+          "tel": "257",
+          "flag": "../../../static/flag/bi.png"
+     },
+     {
+          "short": "BJ",
+          "name": "贝宁",
+          "en": "Benin",
+          "tel": "229",
+          "flag": "../../../static/flag/bj.png"
+     },
+     {
+          "short": "BL",
+          "name": "巴勒斯坦",
+          "en": "Palestine",
+          "tel": "970",
+          "flag": "../../../static/flag/bl.png"
+     },
+     {
+          "short": "BM",
+          "name": "百慕大群岛",
+          "en": "BermudaIs.",
+          "tel": "1441",
+          "flag": "../../../static/flag/bm.png"
+     },
+     {
+          "short": "BN",
+          "name": "文莱",
+          "en": "Brunei",
+          "tel": "673",
+          "flag": "../../../static/flag/bn.png"
+     },
+     {
+          "short": "BO",
+          "name": "玻利维亚",
+          "en": "Bolivia",
+          "tel": "591",
+          "flag": "../../../static/flag/bo.png"
+     },
+     {
+          "short": "BR",
+          "name": "巴西",
+          "en": "Brazil",
+          "tel": "55",
+          "flag": "../../../static/flag/br.png"
+     },
+     {
+          "short": "BS",
+          "name": "巴哈马",
+          "en": "Bahamas",
+          "tel": "1242",
+          "flag": "../../../static/flag/bs.png"
+     },
+     {
+          "short": "BW",
+          "name": "博茨瓦纳",
+          "en": "Botswana",
+          "tel": "267",
+          "flag": "../../../static/flag/bw.png"
+     },
+     {
+          "short": "BY",
+          "name": "白俄罗斯",
+          "en": "Belarus",
+          "tel": "375",
+          "flag": "../../../static/flag/by.png"
+     },
+     {
+          "short": "BZ",
+          "name": "伯利兹",
+          "en": "Belize",
+          "tel": "501",
+          "flag": "../../../static/flag/bz.png"
+     },
+     {
+          "short": "CA",
+          "name": "加拿大",
+          "en": "Canada",
+          "tel": "1",
+          "flag": "../../../static/flag/ca.png"
+     },
+     {
+          "short": "",
+          "name": "开曼群岛",
+          "en": "CaymanIs.",
+          "tel": "1345",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "CF",
+          "name": "中非共和国",
+          "en": "CentralAfricanRepublic",
+          "tel": "236",
+          "flag": "../../../static/flag/cf.png"
+     },
+     {
+          "short": "CG",
+          "name": "刚果",
+          "en": "Congo",
+          "tel": "242",
+          "flag": "../../../static/flag/cg.png"
+     },
+     {
+          "short": "CH",
+          "name": "瑞士",
+          "en": "Switzerland",
+          "tel": "41",
+          "flag": "../../../static/flag/ch.png"
+     },
+     {
+          "short": "CK",
+          "name": "库克群岛",
+          "en": "CookIs.",
+          "tel": "682",
+          "flag": "../../../static/flag/ck.png"
+     },
+     {
+          "short": "CL",
+          "name": "智利",
+          "en": "Chile",
+          "tel": "56",
+          "flag": "../../../static/flag/cl.png"
+     },
+     {
+          "short": "CM",
+          "name": "喀麦隆",
+          "en": "Cameroon",
+          "tel": "237",
+          "flag": "../../../static/flag/cm.png"
+     },
+     {
+          "short": "CN",
+          "name": "中国",
+          "en": "China",
+          "tel": "86",
+          "flag": "../../../static/flag/cn.png"
+     },
+     {
+          "short": "CO",
+          "name": "哥伦比亚",
+          "en": "Colombia",
+          "tel": "57",
+          "flag": "../../../static/flag/co.png"
+     },
+     {
+          "short": "CR",
+          "name": "哥斯达黎加",
+          "en": "CostaRica",
+          "tel": "506",
+          "flag": "../../../static/flag/cr.png"
+     },
+     {
+          "short": "CU",
+          "name": "古巴",
+          "en": "Cuba",
+          "tel": "53",
+          "flag": "../../../static/flag/cu.png"
+     },
+     {
+          "short": "CY",
+          "name": "塞浦路斯",
+          "en": "Cyprus",
+          "tel": "357",
+          "flag": "../../../static/flag/cy.png"
+     },
+     {
+          "short": "CZ",
+          "name": "捷克",
+          "en": "CzechRepublic",
+          "tel": "420",
+          "flag": "../../../static/flag/cz.png"
+     },
+     {
+          "short": "DE",
+          "name": "德国",
+          "en": "Germany",
+          "tel": "49",
+          "flag": "../../../static/flag/de.png"
+     },
+     {
+          "short": "DJ",
+          "name": "吉布提",
+          "en": "Djibouti",
+          "tel": "253",
+          "flag": "../../../static/flag/dj.png"
+     },
+     {
+          "short": "DK",
+          "name": "丹麦",
+          "en": "Denmark",
+          "tel": "45",
+          "flag": "../../../static/flag/dk.png"
+     },
+     {
+          "short": "DO",
+          "name": "多米尼加共和国",
+          "en": "DominicaRep.",
+          "tel": "1890",
+          "flag": "../../../static/flag/do.png"
+     },
+     {
+          "short": "DZ",
+          "name": "阿尔及利亚",
+          "en": "Algeria",
+          "tel": "213",
+          "flag": "../../../static/flag/dz.png"
+     },
+     {
+          "short": "EC",
+          "name": "厄瓜多尔",
+          "en": "Ecuador",
+          "tel": "593",
+          "flag": "../../../static/flag/ec.png"
+     },
+     {
+          "short": "EE",
+          "name": "爱沙尼亚",
+          "en": "Estonia",
+          "tel": "372",
+          "flag": "../../../static/flag/ee.png"
+     },
+     {
+          "short": "EG",
+          "name": "埃及",
+          "en": "Egypt",
+          "tel": "20",
+          "flag": "../../../static/flag/eg.png"
+     },
+     {
+          "short": "ES",
+          "name": "西班牙",
+          "en": "Spain",
+          "tel": "34",
+          "flag": "../../../static/flag/es.png"
+     },
+     {
+          "short": "ET",
+          "name": "埃塞俄比亚",
+          "en": "Ethiopia",
+          "tel": "251",
+          "flag": "../../../static/flag/et.png"
+     },
+     {
+          "short": "FI",
+          "name": "芬兰",
+          "en": "Finland",
+          "tel": "358",
+          "flag": "../../../static/flag/fi.png"
+     },
+     {
+          "short": "FJ",
+          "name": "斐济",
+          "en": "Fiji",
+          "tel": "679",
+          "flag": "../../../static/flag/fj.png"
+     },
+     {
+          "short": "FR",
+          "name": "法国",
+          "en": "France",
+          "tel": "33",
+          "flag": "../../../static/flag/fr.png"
+     },
+     {
+          "short": "GA",
+          "name": "加蓬",
+          "en": "Gabon",
+          "tel": "241",
+          "flag": "../../../static/flag/ga.png"
+     },
+     {
+          "short": "GB",
+          "name": "英国",
+          "en": "UnitedKiongdom",
+          "tel": "44",
+          "flag": "../../../static/flag/gb.png"
+     },
+     {
+          "short": "GD",
+          "name": "格林纳达",
+          "en": "Grenada",
+          "tel": "1809",
+          "flag": "../../../static/flag/gd.png"
+     },
+     {
+          "short": "GE",
+          "name": "格鲁吉亚",
+          "en": "Georgia",
+          "tel": "995",
+          "flag": "../../../static/flag/ge.png"
+     },
+     {
+          "short": "GF",
+          "name": "法属圭亚那",
+          "en": "FrenchGuiana",
+          "tel": "594",
+          "flag": "../../../static/flag/gf.png"
+     },
+     {
+          "short": "GH",
+          "name": "加纳",
+          "en": "Ghana",
+          "tel": "233",
+          "flag": "../../../static/flag/gh.png"
+     },
+     {
+          "short": "GI",
+          "name": "直布罗陀",
+          "en": "Gibraltar",
+          "tel": "350",
+          "flag": "../../../static/flag/gi.png"
+     },
+     {
+          "short": "GM",
+          "name": "冈比亚",
+          "en": "Gambia",
+          "tel": "220",
+          "flag": "../../../static/flag/gm.png"
+     },
+     {
+          "short": "GN",
+          "name": "几内亚",
+          "en": "Guinea",
+          "tel": "224",
+          "flag": "../../../static/flag/gn.png"
+     },
+     {
+          "short": "GR",
+          "name": "希腊",
+          "en": "Greece",
+          "tel": "30",
+          "flag": "../../../static/flag/gr.png"
+     },
+     {
+          "short": "GT",
+          "name": "危地马拉",
+          "en": "Guatemala",
+          "tel": "502",
+          "flag": "../../../static/flag/gt.png"
+     },
+     {
+          "short": "GU",
+          "name": "关岛",
+          "en": "Guam",
+          "tel": "1671",
+          "flag": "../../../static/flag/gu.png"
+     },
+     {
+          "short": "GY",
+          "name": "圭亚那",
+          "en": "Guyana",
+          "tel": "592",
+          "flag": "../../../static/flag/gy.png"
+     },
+     {
+          "short": "HK",
+          "name": "香港(中国)",
+          "en": "Hongkong",
+          "tel": "852",
+          "flag": "../../../static/flag/hk.png"
+     },
+     {
+          "short": "HN",
+          "name": "洪都拉斯",
+          "en": "Honduras",
+          "tel": "504",
+          "flag": "../../../static/flag/hn.png"
+     },
+     {
+          "short": "HT",
+          "name": "海地",
+          "en": "Haiti",
+          "tel": "509",
+          "flag": "../../../static/flag/ht.png"
+     },
+     {
+          "short": "HU",
+          "name": "匈牙利",
+          "en": "Hungary",
+          "tel": "36",
+          "flag": "../../../static/flag/hu.png"
+     },
+     {
+          "short": "ID",
+          "name": "印度尼西亚",
+          "en": "Indonesia",
+          "tel": "62",
+          "flag": "../../../static/flag/id.png"
+     },
+     {
+          "short": "IE",
+          "name": "爱尔兰",
+          "en": "Ireland",
+          "tel": "353",
+          "flag": "../../../static/flag/ie.png"
+     },
+     {
+          "short": "IL",
+          "name": "以色列",
+          "en": "Israel",
+          "tel": "972",
+          "flag": "../../../static/flag/il.png"
+     },
+     {
+          "short": "IN",
+          "name": "印度",
+          "en": "India",
+          "tel": "91",
+          "flag": "../../../static/flag/in.png"
+     },
+     {
+          "short": "IQ",
+          "name": "伊拉克",
+          "en": "Iraq",
+          "tel": "964",
+          "flag": "../../../static/flag/iq.png"
+     },
+     {
+          "short": "IR",
+          "name": "伊朗",
+          "en": "Iran",
+          "tel": "98",
+          "flag": "../../../static/flag/ir.png"
+     },
+     {
+          "short": "IS",
+          "name": "冰岛",
+          "en": "Iceland",
+          "tel": "354",
+          "flag": "../../../static/flag/is.png"
+     },
+     {
+          "short": "IT",
+          "name": "意大利",
+          "en": "Italy",
+          "tel": "39",
+          "flag": "../../../static/flag/it.png"
+     },
+     {
+          "short": "",
+          "name": "科特迪瓦",
+          "en": "IvoryCoast",
+          "tel": "225",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "JM",
+          "name": "牙买加",
+          "en": "Jamaica",
+          "tel": "1876",
+          "flag": "../../../static/flag/jm.png"
+     },
+     {
+          "short": "JO",
+          "name": "约旦",
+          "en": "Jordan",
+          "tel": "962",
+          "flag": "../../../static/flag/jo.png"
+     },
+     {
+          "short": "JP",
+          "name": "日本",
+          "en": "Japan",
+          "tel": "81",
+          "flag": "../../../static/flag/jp.png"
+     },
+     {
+          "short": "KE",
+          "name": "肯尼亚",
+          "en": "Kenya",
+          "tel": "254",
+          "flag": "../../../static/flag/ke.png"
+     },
+     {
+          "short": "KG",
+          "name": "吉尔吉斯坦",
+          "en": "Kyrgyzstan",
+          "tel": "331",
+          "flag": "../../../static/flag/kg.png"
+     },
+     {
+          "short": "KH",
+          "name": "柬埔寨",
+          "en": "Kampuchea(Cambodia)",
+          "tel": "855",
+          "flag": "../../../static/flag/kh.png"
+     },
+     {
+          "short": "KP",
+          "name": "朝鲜",
+          "en": "NorthKorea",
+          "tel": "850",
+          "flag": "../../../static/flag/kp.png"
+     },
+     {
+          "short": "KR",
+          "name": "韩国",
+          "en": "Korea",
+          "tel": "82",
+          "flag": "../../../static/flag/kr.png"
+     },
+     {
+          "short": "KT",
+          "name": "科特迪瓦共和国",
+          "en": "RepublicofIvoryCoast",
+          "tel": "225",
+          "flag": "../../../static/flag/kt.png"
+     },
+     {
+          "short": "KW",
+          "name": "科威特",
+          "en": "Kuwait",
+          "tel": "965",
+          "flag": "../../../static/flag/kw.png"
+     },
+     {
+          "short": "KZ",
+          "name": "哈萨克斯坦",
+          "en": "Kazakstan",
+          "tel": "327",
+          "flag": "../../../static/flag/kz.png"
+     },
+     {
+          "short": "LA",
+          "name": "老挝",
+          "en": "Laos",
+          "tel": "856",
+          "flag": "../../../static/flag/la.png"
+     },
+     {
+          "short": "LB",
+          "name": "黎巴嫩",
+          "en": "Lebanon",
+          "tel": "961",
+          "flag": "../../../static/flag/lb.png"
+     },
+     {
+          "short": "LC",
+          "name": "圣卢西亚",
+          "en": "St.Lucia",
+          "tel": "1758",
+          "flag": "../../../static/flag/lc.png"
+     },
+     {
+          "short": "LI",
+          "name": "列支敦士登",
+          "en": "Liechtenstein",
+          "tel": "423",
+          "flag": "../../../static/flag/li.png"
+     },
+     {
+          "short": "LK",
+          "name": "斯里兰卡",
+          "en": "SriLanka",
+          "tel": "94",
+          "flag": "../../../static/flag/lk.png"
+     },
+     {
+          "short": "LR",
+          "name": "利比里亚",
+          "en": "Liberia",
+          "tel": "231",
+          "flag": "../../../static/flag/lr.png"
+     },
+     {
+          "short": "LS",
+          "name": "莱索托",
+          "en": "Lesotho",
+          "tel": "266",
+          "flag": "../../../static/flag/ls.png"
+     },
+     {
+          "short": "LT",
+          "name": "立陶宛",
+          "en": "Lithuania",
+          "tel": "370",
+          "flag": "../../../static/flag/lt.png"
+     },
+     {
+          "short": "LU",
+          "name": "卢森堡",
+          "en": "Luxembourg",
+          "tel": "352",
+          "flag": "../../../static/flag/lu.png"
+     },
+     {
+          "short": "LV",
+          "name": "拉脱维亚",
+          "en": "Latvia",
+          "tel": "371",
+          "flag": "../../../static/flag/lv.png"
+     },
+     {
+          "short": "LY",
+          "name": "利比亚",
+          "en": "Libya",
+          "tel": "218",
+          "flag": "../../../static/flag/ly.png"
+     },
+     {
+          "short": "MA",
+          "name": "摩洛哥",
+          "en": "Morocco",
+          "tel": "212",
+          "flag": "../../../static/flag/ma.png"
+     },
+     {
+          "short": "MC",
+          "name": "摩纳哥",
+          "en": "Monaco",
+          "tel": "377",
+          "flag": "../../../static/flag/mc.png"
+     },
+     {
+          "short": "MD",
+          "name": "摩尔多瓦",
+          "en": "Moldova,Republicof",
+          "tel": "373",
+          "flag": "../../../static/flag/md.png"
+     },
+     {
+          "short": "MG",
+          "name": "马达加斯加",
+          "en": "Madagascar",
+          "tel": "261",
+          "flag": "../../../static/flag/mg.png"
+     },
+     {
+          "short": "ML",
+          "name": "马里",
+          "en": "Mali",
+          "tel": "223",
+          "flag": "../../../static/flag/ml.png"
+     },
+     {
+          "short": "MM",
+          "name": "缅甸",
+          "en": "Burma",
+          "tel": "95",
+          "flag": "../../../static/flag/mm.png"
+     },
+     {
+          "short": "MN",
+          "name": "蒙古",
+          "en": "Mongolia",
+          "tel": "976",
+          "flag": "../../../static/flag/mn.png"
+     },
+     {
+          "short": "MO",
+          "name": "澳门（中国）",
+          "en": "Macao",
+          "tel": "853",
+          "flag": "../../../static/flag/mo.png"
+     },
+     {
+          "short": "MS",
+          "name": "蒙特塞拉特岛",
+          "en": "MontserratIs",
+          "tel": "1664",
+          "flag": "../../../static/flag/ms.png"
+     },
+     {
+          "short": "MT",
+          "name": "马耳他",
+          "en": "Malta",
+          "tel": "356",
+          "flag": "../../../static/flag/mt.png"
+     },
+     {
+          "short": "",
+          "name": "马里亚那群岛",
+          "en": "MarianaIs",
+          "tel": "1670",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "",
+          "name": "马提尼克",
+          "en": "Martinique",
+          "tel": "596",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "MU",
+          "name": "毛里求斯",
+          "en": "Mauritius",
+          "tel": "230",
+          "flag": "../../../static/flag/mu.png"
+     },
+     {
+          "short": "MV",
+          "name": "马尔代夫",
+          "en": "Maldives",
+          "tel": "960",
+          "flag": "../../../static/flag/mv.png"
+     },
+     {
+          "short": "MW",
+          "name": "马拉维",
+          "en": "Malawi",
+          "tel": "265",
+          "flag": "../../../static/flag/mw.png"
+     },
+     {
+          "short": "MX",
+          "name": "墨西哥",
+          "en": "Mexico",
+          "tel": "52",
+          "flag": "../../../static/flag/mx.png"
+     },
+     {
+          "short": "MY",
+          "name": "马来西亚",
+          "en": "Malaysia",
+          "tel": "60",
+          "flag": "../../../static/flag/my.png"
+     },
+     {
+          "short": "MZ",
+          "name": "莫桑比克",
+          "en": "Mozambique",
+          "tel": "258",
+          "flag": "../../../static/flag/mz.png"
+     },
+     {
+          "short": "NA",
+          "name": "纳米比亚",
+          "en": "Namibia",
+          "tel": "264",
+          "flag": "../../../static/flag/na.png"
+     },
+     {
+          "short": "NE",
+          "name": "尼日尔",
+          "en": "Niger",
+          "tel": "977",
+          "flag": "../../../static/flag/ne.png"
+     },
+     {
+          "short": "NG",
+          "name": "尼日利亚",
+          "en": "Nigeria",
+          "tel": "234",
+          "flag": "../../../static/flag/ng.png"
+     },
+     {
+          "short": "NI",
+          "name": "尼加拉瓜",
+          "en": "Nicaragua",
+          "tel": "505",
+          "flag": "../../../static/flag/ni.png"
+     },
+     {
+          "short": "NL",
+          "name": "荷兰",
+          "en": "Netherlands",
+          "tel": "31",
+          "flag": "../../../static/flag/nl.png"
+     },
+     {
+          "short": "NO",
+          "name": "挪威",
+          "en": "Norway",
+          "tel": "47",
+          "flag": "../../../static/flag/no.png"
+     },
+     {
+          "short": "NP",
+          "name": "尼泊尔",
+          "en": "Nepal",
+          "tel": "977",
+          "flag": "../../../static/flag/np.png"
+     },
+     {
+          "short": "NR",
+          "name": "瑙鲁",
+          "en": "Nauru",
+          "tel": "674",
+          "flag": "../../../static/flag/nr.png"
+     },
+     {
+          "short": "NZ",
+          "name": "新西兰",
+          "en": "NewZealand",
+          "tel": "64",
+          "flag": "../../../static/flag/nz.png"
+     },
+     {
+          "short": "OM",
+          "name": "阿曼",
+          "en": "Oman",
+          "tel": "968",
+          "flag": "../../../static/flag/om.png"
+     },
+     {
+          "short": "PA",
+          "name": "巴拿马",
+          "en": "Panama",
+          "tel": "507",
+          "flag": "../../../static/flag/pa.png"
+     },
+     {
+          "short": "PE",
+          "name": "秘鲁",
+          "en": "Peru",
+          "tel": "51",
+          "flag": "../../../static/flag/pe.png"
+     },
+     {
+          "short": "PF",
+          "name": "法属玻利尼西亚",
+          "en": "FrenchPolynesia",
+          "tel": "689",
+          "flag": "../../../static/flag/pf.png"
+     },
+     {
+          "short": "PG",
+          "name": "巴布亚新几内亚",
+          "en": "PapuaNewCuinea",
+          "tel": "675",
+          "flag": "../../../static/flag/pg.png"
+     },
+     {
+          "short": "PH",
+          "name": "菲律宾",
+          "en": "Philippines",
+          "tel": "63",
+          "flag": "../../../static/flag/ph.png"
+     },
+     {
+          "short": "PK",
+          "name": "巴基斯坦",
+          "en": "Pakistan",
+          "tel": "92",
+          "flag": "../../../static/flag/pk.png"
+     },
+     {
+          "short": "PL",
+          "name": "波兰",
+          "en": "Poland",
+          "tel": "48",
+          "flag": "../../../static/flag/pl.png"
+     },
+     {
+          "short": "PR",
+          "name": "波多黎各",
+          "en": "PuertoRico",
+          "tel": "1787",
+          "flag": "../../../static/flag/pr.png"
+     },
+     {
+          "short": "PT",
+          "name": "葡萄牙",
+          "en": "Portugal",
+          "tel": "351",
+          "flag": "../../../static/flag/pt.png"
+     },
+     {
+          "short": "PY",
+          "name": "巴拉圭",
+          "en": "Paraguay",
+          "tel": "595",
+          "flag": "../../../static/flag/py.png"
+     },
+     {
+          "short": "QA",
+          "name": "卡塔尔",
+          "en": "Qatar",
+          "tel": "974",
+          "flag": "../../../static/flag/qa.png"
+     },
+     {
+          "short": "",
+          "name": "留尼旺",
+          "en": "Reunion",
+          "tel": "262",
+          "flag": "../../../static/flag/.png"
+     },
+     {
+          "short": "RO",
+          "name": "罗马尼亚",
+          "en": "Romania",
+          "tel": "40",
+          "flag": "../../../static/flag/ro.png"
+     },
+     {
+          "short": "RU",
+          "name": "俄罗斯",
+          "en": "Russia",
+          "tel": "7",
+          "flag": "../../../static/flag/ru.png"
+     },
+     {
+          "short": "SA",
+          "name": "沙特阿拉伯",
+          "en": "SaudiArabia",
+          "tel": "966",
+          "flag": "../../../static/flag/sa.png"
+     },
+     {
+          "short": "SB",
+          "name": "所罗门群岛",
+          "en": "SolomonIs",
+          "tel": "677",
+          "flag": "../../../static/flag/sb.png"
+     },
+     {
+          "short": "SC",
+          "name": "塞舌尔",
+          "en": "Seychelles",
+          "tel": "248",
+          "flag": "../../../static/flag/sc.png"
+     },
+     {
+          "short": "SD",
+          "name": "苏丹",
+          "en": "Sudan",
+          "tel": "249",
+          "flag": "../../../static/flag/sd.png"
+     },
+     {
+          "short": "SE",
+          "name": "瑞典",
+          "en": "Sweden",
+          "tel": "46",
+          "flag": "../../../static/flag/se.png"
+     },
+     {
+          "short": "SG",
+          "name": "新加坡",
+          "en": "Singapore",
+          "tel": "65",
+          "flag": "../../../static/flag/sg.png"
+     },
+     {
+          "short": "SI",
+          "name": "斯洛文尼亚",
+          "en": "Slovenia",
+          "tel": "386",
+          "flag": "../../../static/flag/si.png"
+     },
+     {
+          "short": "SK",
+          "name": "斯洛伐克",
+          "en": "Slovakia",
+          "tel": "421",
+          "flag": "../../../static/flag/sk.png"
+     },
+     {
+          "short": "SL",
+          "name": "塞拉利昂",
+          "en": "SierraLeone",
+          "tel": "232",
+          "flag": "../../../static/flag/sl.png"
+     },
+     {
+          "short": "SM",
+          "name": "圣马力诺",
+          "en": "SanMarino",
+          "tel": "378",
+          "flag": "../../../static/flag/sm.png"
+     },
+     {
+          "short": "AS",
+          "name": "东萨摩亚(美)",
+          "en": "SamoaEastern",
+          "tel": "684",
+          "flag": "../../../static/flag/as.png"
+     },
+     {
+          "short": "WS",
+          "name": "西萨摩亚",
+          "en": "SanMarino",
+          "tel": "685",
+          "flag": "../../../static/flag/ws.png"
+     },
+     {
+          "short": "SN",
+          "name": "塞内加尔",
+          "en": "Senegal",
+          "tel": "221",
+          "flag": "../../../static/flag/sn.png"
+     },
+     {
+          "short": "SO",
+          "name": "索马里",
+          "en": "Somali",
+          "tel": "252",
+          "flag": "../../../static/flag/so.png"
+     },
+     {
+          "short": "SR",
+          "name": "苏里南",
+          "en": "Suriname",
+          "tel": "597",
+          "flag": "../../../static/flag/sr.png"
+     },
+     {
+          "short": "ST",
+          "name": "圣多美和普林西比",
+          "en": "SaoTomeandPrincipe",
+          "tel": "239",
+          "flag": "../../../static/flag/st.png"
+     },
+     {
+          "short": "SV",
+          "name": "萨尔瓦多",
+          "en": "EISalvador",
+          "tel": "503",
+          "flag": "../../../static/flag/sv.png"
+     },
+     {
+          "short": "SY",
+          "name": "叙利亚",
+          "en": "Syria",
+          "tel": "963",
+          "flag": "../../../static/flag/sy.png"
+     },
+     {
+          "short": "SZ",
+          "name": "斯威士兰",
+          "en": "Swaziland",
+          "tel": "268",
+          "flag": "../../../static/flag/sz.png"
+     },
+     {
+          "short": "TD",
+          "name": "乍得",
+          "en": "Chad",
+          "tel": "235",
+          "flag": "../../../static/flag/td.png"
+     },
+     {
+          "short": "TG",
+          "name": "多哥",
+          "en": "Togo",
+          "tel": "228",
+          "flag": "../../../static/flag/tg.png"
+     },
+     {
+          "short": "TH",
+          "name": "泰国",
+          "en": "Thailand",
+          "tel": "66",
+          "flag": "../../../static/flag/th.png"
+     },
+     {
+          "short": "TJ",
+          "name": "塔吉克斯坦",
+          "en": "Tajikstan",
+          "tel": "992",
+          "flag": "../../../static/flag/tj.png"
+     },
+     {
+          "short": "TM",
+          "name": "土库曼斯坦",
+          "en": "Turkmenistan",
+          "tel": "993",
+          "flag": "../../../static/flag/tm.png"
+     },
+     {
+          "short": "TN",
+          "name": "突尼斯",
+          "en": "Tunisia",
+          "tel": "216",
+          "flag": "../../../static/flag/tn.png"
+     },
+     {
+          "short": "TO",
+          "name": "汤加",
+          "en": "Tonga",
+          "tel": "676",
+          "flag": "../../../static/flag/to.png"
+     },
+     {
+          "short": "TR",
+          "name": "土耳其",
+          "en": "Turkey",
+          "tel": "90",
+          "flag": "../../../static/flag/tr.png"
+     },
+     {
+          "short": "TT",
+          "name": "特立尼达和多巴哥",
+          "en": "TrinidadandTobago",
+          "tel": "1809",
+          "flag": "../../../static/flag/tt.png"
+     },
+     {
+          "short": "TW",
+          "name": "台湾（中国）",
+          "en": "Taiwan",
+          "tel": "886",
+          "flag": "../../../static/flag/cn.png"
+     },
+     {
+          "short": "TZ",
+          "name": "坦桑尼亚",
+          "en": "Tanzania",
+          "tel": "255",
+          "flag": "../../../static/flag/tz.png"
+     },
+     {
+          "short": "UA",
+          "name": "乌克兰",
+          "en": "Ukraine",
+          "tel": "380",
+          "flag": "../../../static/flag/ua.png"
+     },
+     {
+          "short": "UG",
+          "name": "乌干达",
+          "en": "Uganda",
+          "tel": "256",
+          "flag": "../../../static/flag/ug.png"
+     },
+     {
+          "short": "US",
+          "name": "美国",
+          "en": "UnitedStatesofAmerica",
+          "tel": "1",
+          "flag": "../../../static/flag/us.png"
+     },
+     {
+          "short": "UY",
+          "name": "乌拉圭",
+          "en": "Uruguay",
+          "tel": "598",
+          "flag": "../../../static/flag/uy.png"
+     },
+     {
+          "short": "UZ",
+          "name": "乌兹别克斯坦",
+          "en": "Uzbekistan",
+          "tel": "233",
+          "flag": "../../../static/flag/uz.png"
+     },
+     {
+          "short": "VC",
+          "name": "圣文森特岛",
+          "en": "SaintVincent",
+          "tel": "1784",
+          "flag": "../../../static/flag/vc.png"
+     },
+     {
+          "short": "VE",
+          "name": "委内瑞拉",
+          "en": "Venezuela",
+          "tel": "58",
+          "flag": "../../../static/flag/ve.png"
+     },
+     {
+          "short": "VN",
+          "name": "越南",
+          "en": "Vietnam",
+          "tel": "84",
+          "flag": "../../../static/flag/vn.png"
+     },
+     {
+          "short": "YE",
+          "name": "也门",
+          "en": "Yemen",
+          "tel": "967",
+          "flag": "../../../static/flag/ye.png"
+     },
+     {
+          "short": "YU",
+          "name": "南斯拉夫",
+          "en": "Yugoslavia",
+          "tel": "381",
+          "flag": "../../../static/flag/yu.png"
+     },
+     {
+          "short": "ZA",
+          "name": "南非",
+          "en": "SouthAfrica",
+          "tel": "27",
+          "flag": "../../../static/flag/za.png"
+     },
+     {
+          "short": "ZM",
+          "name": "赞比亚",
+          "en": "Zambia",
+          "tel": "260",
+          "flag": "../../../static/flag/zm.png"
+     },
+     {
+          "short": "ZR",
+          "name": "扎伊尔",
+          "en": "Zaire",
+          "tel": "243",
+          "flag": "../../../static/flag/zr.png"
+     },
+     {
+          "short": "ZW",
+          "name": "津巴布韦",
+          "en": "Zimbabwe",
+          "tel": "263",
+          "flag": "../../../static/flag/zw.png"
+     }
+]
+}
\ No newline at end of file
diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue
index b931c69..5570bfa 100644
--- a/pages/start/login/login.vue
+++ b/pages/start/login/login.vue
@@ -63,7 +63,7 @@
             class="input-field"
             type="text"
             placeholder="请输入DeepChart ID"
-            v-model="email"
+            v-model="deepChartID"
           />
         </view>
         <view class="input-with-icon">
@@ -195,7 +195,8 @@
 
     <!-- 或者 -->
     <text class="or-text" @click="goToRegistration"
-      >如果您还没有账号，点击注册 >
+      >如果您还没有账号，点击注册 
+      <image class="to-icon" src="../../../static/icons/To.png"></image>
     </text>
 
     <!-- 第三方登录 -->
@@ -218,6 +219,17 @@
         <text class="third-party-text">通过 Google 登录</text>
       </view>
     </view>
+
+    <!-- 同意弹窗 -->
+    <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>
+      </view>
+    </uniPopup>
     <footerBar class="static-footer" :type="type"></footerBar>
   </view>
 </template>
@@ -226,14 +238,19 @@
 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";
+import { verificationPhone, verificationEmail } from "../login/verification";
 
-const type = ref('member')
+const deepChartID = ref("");
+const type = ref("member");
 const email = ref("");
 const password = ref("");
+const country = ref("+86");
 const phone = ref("");
 const agreed = ref(false);
-const switchType = ref("Email"); // 默认是邮箱注册
+const switchType = ref("User"); // 默认是邮箱注册
 const { safeAreaInsets } = uni.getSystemInfoSync();
 const codeBtnText = ref("获取验证码");
 const isCodeBtnDisabled = ref(false); // 添加验证码按钮禁用状态
@@ -264,6 +281,7 @@ function showCountryPicker() {
     ),
     success: function (res) {
       selectedCountry.value = countries.value[res.tapIndex];
+      country.value = selectedCountry.value.code;
     },
   });
 }
@@ -278,31 +296,38 @@ function goToIndex() {
 function switchUser() {
   // 切换到手机注册
   switchType.value = "User";
+  password.value = "";
 }
 
 function switchEmail() {
   // 切换到邮箱注册
   switchType.value = "Email";
+  password.value = "";
 }
 
 function switchPhone() {
   // 切换到手机注册
   switchType.value = "Phone";
+  password.value = "";
 }
 
 function register() {
-  if (switchType.value === "Email") {
-    // 登录逻辑
-    if (!email.value) {
+  if (switchType.value === "User") {
+    if (!deepChartID.value) {
       uni.showToast({
-        title: "请输入邮箱地址",
+        title: "请输入用户名",
         icon: "none",
       });
       return;
     }
 
-    // 发送登录请求
-    console.log("登录:", email.value);
+    if (!password.value) {
+      uni.showToast({
+        title: "请输入密码",
+        icon: "none",
+      });
+      return;
+    }
   }
 
   if (switchType.value === "Phone") {
@@ -315,9 +340,81 @@ function register() {
       return;
     }
 
+    if (!password.value) {
+      uni.showToast({
+        title: "请输入验证码",
+        icon: "none",
+      });
+      return;
+    }
+    const phoneAll = `${country.value}${phone.value}`;
+    console.log("完整手机号" + phoneAll);
+    if (validatePhoneNumber(country.value, phone.value)) {
+      console.log("登录成功:", phoneAll);
+    }
+
+    // 发送登录请求
+    // console.log("登录:", phone.value);
+  }
+
+  if (switchType.value === "Email") {
+    // 登录逻辑
+    if (!email.value) {
+      uni.showToast({
+        title: "请输入邮箱地址",
+        icon: "none",
+      });
+      return;
+    }
+
+    if (!password.value) {
+      uni.showToast({
+        title: "请输入验证码",
+        icon: "none",
+      });
+      return;
+    }
+
+    const bool = verificationEmail(email.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "邮箱格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+
     // 发送登录请求
-    console.log("登录:", phone.value);
+    console.log("登录:", email.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() {
@@ -383,6 +480,49 @@ function onPhoneInput(e) {
 }
 
 function sendCode() {
+  if (switchType.value === "Phone") {
+    if (!phone.value) {
+      uni.showToast({
+        title: "请输入手机号",
+        icon: "none",
+      });
+      return;
+    }
+
+    const bool = verificationPhone(country.value, phone.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "手机号格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+  }
+
+  if (switchType.value === "Email") {
+    if (!email.value) {
+      uni.showToast({
+        title: "请输入邮箱地址",
+        icon: "none",
+      });
+      return;
+    }
+    const bool = verificationEmail(email.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "邮箱格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+  }
+
   // 如果按钮已禁用，则不执行后续逻辑
   if (isCodeBtnDisabled.value) return;
 
@@ -422,7 +562,10 @@ function openPrivacy() {
 
 function recoverPassword() {
   // 忘记密码
-  console.log("忘记密码");
+  // console.log("忘记密码");
+  uni.navigateTo({
+    url: "/pages/start/recoverPassword/recoverPassword",
+  });
 }
 
 function changeCheckbox() {
@@ -431,6 +574,42 @@ function changeCheckbox() {
     ? "../../../static/icons/Check-one-true.png"
     : "../../../static/icons/Check-one-false.png";
 }
+
+// 验证手机号是否正确
+function validatePhoneNumber(countryCode, phoneNumber) {
+  // 检查是否为空
+  if (!phoneNumber || phoneNumber.trim() === "") {
+    uni.showToast({
+      title: "手机号不能为空",
+      icon: "none",
+    });
+    return false;
+  }
+
+  const bool = verificationPhone(countryCode, phoneNumber);
+  console.log("验证是否成功", bool);
+
+  // 检查格式是否正确
+  if (!bool) {
+    uni.showToast({
+      title: "手机号格式不正确",
+      icon: "none",
+    });
+    return false;
+  }
+
+  // 去掉+号后检查长度（手机号通常在7到15位之间）
+  const cleanNumber = phoneNumber.replace(/^\+/, "");
+  if (cleanNumber.length < 7 || cleanNumber.length > 15) {
+    uni.showToast({
+      title: "手机号长度不正确",
+      icon: "none",
+    });
+    return false;
+  }
+
+  return true;
+}
 </script>
 
 <style scoped>
@@ -720,6 +899,11 @@ function changeCheckbox() {
   margin-bottom: 40rpx;
 }
 
+.to-icon{
+  width: 10rpx;
+  height: 16rpx;
+}
+
 .third-party-login {
   width: 100%;
   margin-bottom: 60rpx;
@@ -771,7 +955,56 @@ 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; /* 确保文字垂直居中 */
 }
 </style>
\ No newline at end of file
diff --git a/pages/start/login/verification.js b/pages/start/login/verification.js
new file mode 100644
index 0000000..31d5ed5
--- /dev/null
+++ b/pages/start/login/verification.js
@@ -0,0 +1,69 @@
+
+function verificationPhone(countryCode,phoneNumber) { 
+  switch (countryCode) {
+    case '+86':
+      return verificationChina(phoneNumber);
+    case '+1':
+        return verificationAmerica(phoneNumber);
+    case '+65':
+        return verificationSingapore(phoneNumber);
+    case '+60':
+        return verificationMalaysia(phoneNumber);
+    case '+66':
+        return verificationThailand(phoneNumber);
+    case '+852':
+        return verificationHongKong(phoneNumber);
+    case '+84':
+        return verificationVietnam(phoneNumber);
+    default:
+      return true;
+  }
+}
+
+
+function verificationChina(phoneNumber){
+      const phoneRegex = /^1[3-9]\d{9}$/;
+      return phoneRegex.test(phoneNumber);
+}
+
+
+function verificationAmerica(phoneNumber){
+      const phoneRegex = /^[2-9]\d{2}[- ]?\d{4}$/;
+      return phoneRegex.test(phoneNumber);
+}
+function verificationSingapore(phoneNumber){
+      const phoneRegex = /^[89]\d{7}$/;
+      return phoneRegex.test(phoneNumber);
+}
+function verificationMalaysia(phoneNumber){
+      const phoneRegex = /^01\d{8}$/;
+      return phoneRegex.test(phoneNumber);
+}
+
+function verificationHongKong(phoneNumber){
+      const phoneRegex = /^0[896]\d{8}$/;
+      return phoneRegex.test(phoneNumber);
+}
+
+
+function verificationThailand(phoneNumber){
+      const phoneRegex = /^[5-9]\d{7}$/;
+      return phoneRegex.test(phoneNumber);
+}
+
+
+
+function verificationVietnam(phoneNumber){
+      const phoneRegex = /^(0)?[3-9]\d{8}$/;
+      return phoneRegex.test(phoneNumber);
+}
+
+
+
+
+function verificationEmail(email) {
+      const emailRegex = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$/;
+      return emailRegex.test(email);
+}
+
+export  {verificationPhone,verificationEmail}
\ No newline at end of file
diff --git a/pages/start/recoverPassword/recoverPassword.vue b/pages/start/recoverPassword/recoverPassword.vue
new file mode 100644
index 0000000..c23443b
--- /dev/null
+++ b/pages/start/recoverPassword/recoverPassword.vue
@@ -0,0 +1,985 @@
+<template>
+  <view class="login-registration-container">
+    <!-- 自定义导航栏 -->
+    <view
+      class="custom-navbar"
+      :style="{ paddingTop: safeAreaInsets?.top + 'px' }"
+    >
+      <view class="nav-left">
+        <image
+          class="icons"
+          @click="goToBack"
+          src="../../../static/icons/back.png"
+          alt="返回首页"
+        />
+      </view>
+      <view class="nav-right">
+        <image
+          class="icons"
+          src="../../../static/icons/Headset.png"
+          alt="联系客服"
+        />
+      </view>
+    </view>
+
+    <!-- Logo -->
+    <!-- <image class="logo" src="/static/logo.png" mode="aspectFit"></image> -->
+
+    <!-- 欢迎语 -->
+    <text class="welcome-text">找回密码</text>
+
+    <!-- 邮箱/手机号切换 -->
+    <view v-if="!isRecovering" class="switch-container">
+      <text
+        class="switch-item"
+        :class="{ active: switchType === 'Email' }"
+        @click="switchEmail"
+        >邮箱</text
+      >
+      <text
+        class="switch-item"
+        :class="{ active: switchType === 'Phone' }"
+        @click="switchPhone"
+        >手机号</text
+      >
+    </view>
+    <view v-else class="switch-container-occupy"> </view>
+    <!-- 输入框 -->
+    <view v-if="isRecovering" class="input-container">
+      <view v-if="switchType === 'Email'">
+        <!-- 修改邮箱输入框容器，将图标包含在内 -->
+        <view class="input-with-icon">
+          <image
+            class="input-icon"
+            src="../../../static/icons/Unlock.png"
+            alt=""
+          />
+          <input
+            class="input-field"
+            :type="newPasswordLookFirst ? 'text' : 'password'"
+            placeholder="输入新密码"
+            v-model="newPasswordFirst"
+          />
+          <image
+            class="input-icon-eye"
+            @click="newPasswordLookFirst = !newPasswordLookFirst"
+            :src="
+              !newPasswordLookFirst
+                ? '../../../static/icons/unlook.png'
+                : '../../../static/icons/look.png'
+            "
+            alt=""
+          />
+        </view>
+        <view class="input-with-icon">
+          <image
+            class="input-icon"
+            src="../../../static/icons/Unlock.png"
+            alt=""
+          />
+          <input
+            class="input-field"
+            :type="newPasswordLookSecond ? 'text' : 'password'"
+            placeholder="再次确认"
+            v-model="newPasswordSecond"
+          />
+          <image
+            class="input-icon-eye"
+            @click="newPasswordLookSecond = !newPasswordLookSecond"
+            :src="
+              !newPasswordLookSecond
+                ? '../../../static/icons/unlook.png'
+                : '../../../static/icons/look.png'
+            "
+            alt=""
+          />
+        </view>
+      </view>
+    </view>
+    <view v-else class="input-container">
+      <view v-if="switchType === 'Email'">
+        <!-- 修改邮箱输入框容器，将图标包含在内 -->
+        <view class="input-with-icon">
+          <image
+            class="input-icon"
+            src="../../../static/icons/Mail.png"
+            alt=""
+          />
+          <input
+            class="input-field"
+            type="text"
+            placeholder="请输入邮箱"
+            v-model="email"
+          />
+          <view>
+            <button
+              class="send-code-btn-email"
+              :disabled="isCodeBtnDisabled"
+              :class="{ 'send-code-btn-disabled': isCodeBtnDisabled }"
+              @click="sendCode"
+            >
+              <text
+                class="send-code-text"
+                :class="{ 'send-code-btn-disabled-text': isCodeBtnDisabled }"
+                >{{ codeBtnText }}</text
+              >
+            </button>
+          </view>
+        </view>
+        <view class="input-with-icon">
+          <image
+            class="input-icon"
+            src="../../../static/icons/Text-recognition.png"
+            alt=""
+          />
+          <input
+            class="input-field"
+            type="text"
+            placeholder="请输入验证码"
+            v-model="password"
+          />
+        </view>
+      </view>
+      <view v-if="switchType === 'Phone'" class="phone-input-container">
+        <view class="country-code-selector" @click="showCountryPicker">
+          <image
+            class="country-flag-img"
+            src="../../../static/icons/Iphone.png"
+            mode="aspectFit"
+          ></image>
+          <text class="country-code">{{ selectedCountry.code }}</text>
+          <!-- <text class="arrow-down">▼</text> -->
+        </view>
+        <input
+          class="input-field phone-input"
+          type="number"
+          placeholder="输入手机号"
+          v-model="phone"
+          @input="onPhoneInput"
+        />
+        <view>
+          <button
+            class="send-code-btn"
+            :disabled="isCodeBtnDisabled"
+            :class="{ 'send-code-btn-disabled': isCodeBtnDisabled }"
+            @click="sendCode"
+          >
+            <text
+              class="send-code-text"
+              :class="{ 'send-code-btn-disabled-text': isCodeBtnDisabled }"
+              >{{ codeBtnText }}</text
+            >
+          </button>
+        </view>
+      </view>
+      <view v-if="switchType === 'Phone'" class="input-with-icon">
+        <image
+          class="input-icon"
+          src="../../../static/icons/Text-recognition.png"
+          alt=""
+        />
+        <input
+          class="input-field"
+          type="text"
+          placeholder="请输入验证码"
+          v-model="password"
+        />
+      </view>
+    </view>
+
+    <!-- 用户协议 -->
+    <view @click="changeCheckbox" class="agreement-container-one">
+      <text
+        class="agreement-text-one"
+        :style="!isRecovering ? 'visibility: hidden' : 'visibility: visible'"
+      >
+        密码最少8位数
+      </text>
+    </view>
+
+    <!-- 注册按钮 -->
+    <button class="register-btn" @click="register">
+      {{ isRecovering ? "确认" : "下一步" }}
+    </button>
+
+    <!-- 或者 -->
+    <text class="or-text-one" @click="goToRegistration"
+      >如果您还没有账号，点击注册
+      <image class="to-icon" src="../../../static/icons/To.png"></image>
+    </text>
+
+    <!-- 或者 -->
+    <text class="or-text" @click="goToLogin">已有账号？登录 </text>
+
+    <!-- 同意弹窗 -->
+    <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>
+      </view>
+    </uniPopup>
+    <footerBar class="static-footer" :type="type"></footerBar>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+// 导入完整的国家列表
+import countryList from "../login/list";
+import footerBar from "../../../components/footerBar-cn.vue";
+import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
+import { verificationPhone, verificationEmail } from "../login/verification";
+
+const type = ref("member");
+const email = ref("");
+const password = ref("");
+const newPasswordFirst = ref("");
+const newPasswordSecond = ref("");
+const phone = ref("");
+const country = ref("+86");
+const agreed = ref(false);
+const switchType = ref("Phone"); // 默认是邮箱注册
+const { safeAreaInsets } = uni.getSystemInfoSync();
+const codeBtnText = ref("获取验证码");
+const isCodeBtnDisabled = ref(false); // 添加验证码按钮禁用状态
+const checkboxUrl = ref("../../../static/icons/Check-one-false.png");
+const isRecovering = ref(false);
+const newPasswordLookFirst = ref(false);
+const newPasswordLookSecond = ref(false);
+
+// 使用从list.js导入的完整国家列表数据
+const countries = ref(
+  countryList.list.map((item) => ({
+    name: item.name,
+    code: `+${item.tel}`,
+    flag: item.flag,
+    short: item.short,
+    en: item.en,
+  }))
+);
+
+// 默认选中的国家（中国）
+const selectedCountry = ref(
+  countries.value.find((country) => country.short === "CN") ||
+    countries.value[0]
+);
+
+// 显示国家选择器
+function showCountryPicker() {
+  uni.showActionSheet({
+    itemList: countries.value.map(
+      (country) => `${country.name} ${country.code}`
+    ),
+    success: function (res) {
+      selectedCountry.value = countries.value[res.tapIndex];
+    },
+  });
+}
+
+function goToBack() {
+  // 返回上一页
+  uni.navigateBack(-1);
+}
+
+function switchEmail() {
+  // 切换到邮箱注册
+  switchType.value = "Email";
+}
+
+function switchPhone() {
+  // 切换到手机注册
+  switchType.value = "Phone";
+}
+
+
+function register() {
+  if (isRecovering.value) {
+
+	if(!newPasswordFirst.value || !newPasswordSecond.value){
+		uni.showToast({
+			title: "密码不能为空",
+			icon: "none",
+		});
+		return;
+	}
+
+	if (newPasswordFirst.value !== newPasswordSecond.value) {
+		uni.showToast({
+			title: "前后密码不一致",
+			icon: "none",
+		});
+		return;
+	}
+
+	// 密码逻辑
+    return;
+  }
+  if (switchType.value === "Phone") {
+    // 登录逻辑
+    if (!phone.value) {
+      uni.showToast({
+        title: "请输入手机号码",
+        icon: "none",
+      });
+      return;
+    }
+
+    if (!password.value) {
+      uni.showToast({
+        title: "请输入验证码",
+        icon: "none",
+      });
+      return;
+    }
+    const phoneAll = `${country.value}${phone.value}`;
+    console.log("完整手机号" + phoneAll);
+    if (validatePhoneNumber(country.value, phone.value)) {
+      console.log("登录成功:", phoneAll);
+    }
+
+    // 发送登录请求
+    // console.log("登录:", phone.value);
+  }
+
+  if (switchType.value === "Email") {
+    // 登录逻辑
+    if (!email.value) {
+      uni.showToast({
+        title: "请输入邮箱地址",
+        icon: "none",
+      });
+      return;
+    }
+
+    if (!password.value) {
+      uni.showToast({
+        title: "请输入验证码",
+        icon: "none",
+      });
+      return;
+    }
+
+    const bool = verificationEmail(email.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "邮箱格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+
+    // 发送登录请求
+    console.log("登录:", email.value);
+  }
+
+
+
+  isRecovering.value = !isRecovering.value;
+
+  // 如果已经同意，则继续登录流程
+  // uni.showToast({
+  //   title: "登录成功",
+  //   icon: "success",
+  // });
+}
+
+function goToLogin() {
+  // 跳转到登录页
+  uni.navigateTo({
+    url: "/pages/start/login/login",
+  });
+}
+
+function onPhoneInput(e) {
+  // 确保只允许输入数字
+  const value = e.detail.value;
+  // 使用 isNaN 检查是否为有效数字
+  if (isNaN(value)) {
+    phone.value = "";
+  } else {
+    phone.value = value;
+  }
+}
+
+// function sendCode() {
+//   // 如果按钮已禁用，则不执行后续逻辑
+//   if (isCodeBtnDisabled.value) return;
+
+//   // 设置按钮为禁用状态
+//   isCodeBtnDisabled.value = true;
+//   codeBtnText.value = "重新发送";
+//   let time = 6;
+//   const timer = setInterval(() => {
+//     time--;
+//     codeBtnText.value = "重新发送 " + time + "S";
+//     if (time <= 0) {
+//       clearInterval(timer);
+//       codeBtnText.value = "重新发送";
+//       // 倒计时结束后启用按钮
+//       isCodeBtnDisabled.value = false;
+//     }
+//   }, 1000);
+
+//   return;
+// }
+
+function sendCode() {
+  if (switchType.value === "Phone") {
+    if (!phone.value) {
+      uni.showToast({
+        title: "请输入手机号",
+        icon: "none",
+      });
+      return;
+    }
+
+    const bool = verificationPhone(country.value, phone.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "手机号格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+  }
+
+  if (switchType.value === "Email") {
+    if (!email.value) {
+      uni.showToast({
+        title: "请输入邮箱地址",
+        icon: "none",
+      });
+      return;
+    }
+    const bool = verificationEmail(email.value);
+    console.log("验证是否成功", bool);
+
+    // 检查格式是否正确
+    if (!bool) {
+      uni.showToast({
+        title: "邮箱格式不正确",
+        icon: "none",
+      });
+      return;
+    }
+  }
+
+  // 如果按钮已禁用，则不执行后续逻辑
+  if (isCodeBtnDisabled.value) return;
+
+  // 设置按钮为禁用状态
+  isCodeBtnDisabled.value = true;
+  codeBtnText.value = "重新发送";
+  let time = 6;
+  const timer = setInterval(() => {
+    time--;
+    codeBtnText.value = "重新发送 " + time + "s";
+    if (time <= 0) {
+      clearInterval(timer);
+      codeBtnText.value = "重新发送";
+      // 倒计时结束后启用按钮
+      isCodeBtnDisabled.value = false;
+    }
+  }, 1000);
+
+  return;
+}
+
+function openAgreement() {
+  // 打开用户协议
+  console.log("打开用户协议");
+  uni.navigateTo({
+    url: "/pages/start/agreement/agreement",
+  });
+}
+
+function openPrivacy() {
+  // 打开隐私政策
+  console.log("打开隐私政策");
+  uni.navigateTo({
+    url: "/pages/start/privacy/privacy",
+  });
+}
+
+function changeCheckbox() {
+  agreed.value = !agreed.value;
+  checkboxUrl.value = agreed.value
+    ? "../../../static/icons/Check-one-true.png"
+    : "../../../static/icons/Check-one-false.png";
+}
+
+// 验证手机号是否正确
+function validatePhoneNumber(countryCode, phoneNumber) {
+  // 检查是否为空
+  if (!phoneNumber || phoneNumber.trim() === "") {
+    uni.showToast({
+      title: "手机号不能为空",
+      icon: "none",
+    });
+    return false;
+  }
+
+  const bool = verificationPhone(countryCode, phoneNumber);
+  console.log("验证是否成功", bool);
+
+  // 检查格式是否正确
+  if (!bool) {
+    uni.showToast({
+      title: "手机号格式不正确",
+      icon: "none",
+    });
+    return false;
+  }
+
+  // 去掉+号后检查长度（手机号通常在7到15位之间）
+  const cleanNumber = phoneNumber.replace(/^\+/, "");
+  if (cleanNumber.length < 7 || cleanNumber.length > 15) {
+    uni.showToast({
+      title: "手机号长度不正确",
+      icon: "none",
+    });
+    return false;
+  }
+
+  return true;
+}
+
+// 添加弹窗引用
+const agreementPopup = ref(null);
+
+// 处理同意按钮点击
+function handleAgree() {
+  // 关闭弹窗
+  agreementPopup.value.close();
+  // 设置为已同意
+  agreed.value = true;
+  checkboxUrl.value = "../../../static/icons/Check-one-true.png";
+  // 继续登录流程
+}
+</script>
+
+<style scoped>
+.login-registration-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 70rpx;
+  height: 100vh;
+  background-color: #ffffff;
+}
+
+/* 自定义导航栏样式 */
+.custom-navbar {
+  position: absolute;
+  top: 0;
+  left: 0;
+  /* z-index: 999; */
+  width: 90%;
+  height: 80rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10rpx 40rpx;
+  margin-bottom: 20rpx;
+}
+
+.nav-left,
+.nav-right {
+  flex: 1;
+}
+
+.nav-right {
+  display: flex;
+  justify-content: flex-end;
+}
+.nav-left {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.icons {
+  margin: 20rpx;
+  width: 40rpx;
+  height: 40rpx;
+  /* margin-right: 10rpx; */
+}
+
+.back-btn,
+.headphone-btn {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333333;
+  padding: 10rpx;
+}
+
+.logo {
+  width: 120rpx;
+  height: 120rpx;
+  margin-bottom: 60rpx;
+  border-radius: 20%;
+}
+
+.welcome-text {
+  font-size: 48rpx;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 60rpx;
+  /* text-align: left; */
+  /* align-self: flex-start; */
+}
+
+.switch-container {
+  display: flex;
+  margin-bottom: 40rpx;
+  align-self: flex-start;
+}
+
+.switch-item {
+  font-size: 28rpx;
+  color: #999999;
+  padding: 10rpx 20rpx;
+  position: relative;
+}
+
+.switch-item::after {
+  content: "";
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 60%;
+  /* 控制边框宽度 */
+  height: 2rpx;
+  background-color: transparent;
+}
+
+.switch-item.active {
+  color: #333333;
+  font-weight: 700;
+}
+
+.switch-item.active::after {
+  content: "";
+  position: absolute;
+  top: 60rpx;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 30%;
+  /* 控制边框宽度 */
+  height: 7rpx;
+  background-color: #333333;
+}
+
+.input-container {
+  width: 100%;
+}
+
+/* 添加图标输入框样式 */
+.input-with-icon {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 80rpx;
+  border-bottom: 2rpx solid #e5e5e5;
+  margin-bottom: 20rpx;
+}
+
+.input-icon {
+  width: 40rpx;
+  height: 40rpx;
+  margin: 0 20rpx;
+}
+.input-icon-eye {
+  width: 40rpx;
+  height: 20rpx;
+  margin: 0 20rpx;
+}
+
+.input-field {
+  flex: 1;
+  height: 80rpx;
+  padding: 15rpx 0;
+  font-size: 28rpx;
+  color: #333333;
+  border: none;
+  background-color: transparent;
+}
+
+.phone-input-container {
+  display: flex;
+  align-items: center;
+  width: 95.8%;
+  height: 80rpx;
+  /* border-radius: 20rpx; */
+  /* border: 2rpx solid #e5e5e5; */
+  /* background-color: #f5f5f5; */
+  padding: 0 10rpx;
+  border-bottom: 2rpx solid #e5e5e5;
+  margin-bottom: 20rpx;
+}
+
+.country-code-selector {
+  display: flex;
+  align-items: center;
+  padding: 0 10rpx;
+  padding-bottom: 1rpx;
+  height: 100%;
+  /* border-right: 2rpx solid #e5e5e5; */
+  /* background-color: #f5f5f5; */
+  border-radius: 20rpx 0 0 20rpx;
+}
+
+.country-code {
+  font-size: 28rpx;
+  color: #333333;
+  margin-right: 10rpx;
+}
+
+.country-flag-img {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 10rpx;
+}
+
+.arrow-down {
+  font-size: 20rpx;
+  color: #999999;
+}
+
+.phone-input {
+  flex: 1;
+  width: auto;
+  height: 100%;
+  border: none;
+  background-color: transparent;
+  padding: 0 0rpx;
+}
+
+.send-code-btn {
+  width: 200rpx;
+  height: 60rpx;
+  display: inline-flex;
+  padding: 0rpx 10rpx;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  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;
+  /* 禁用状态下的灰色背景 */
+}
+
+.send-code-btn-disabled-text {
+  color: #999999 !important;
+}
+
+.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;
+  align-items: center;
+  margin-bottom: 40rpx;
+  margin-top: -75.5rpx;
+  align-self: flex-start;
+}
+
+.checkbox {
+  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;
+  color: #666666;
+}
+
+.link {
+  color: #333333;
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.register-btn {
+  width: 100%;
+  height: 80rpx;
+  background-color: #000000;
+  color: white;
+  font-size: 32rpx;
+  font-weight: bold;
+  border-radius: 40rpx;
+  margin-bottom: 40rpx;
+}
+
+.or-text {
+  flex-direction: column;
+  font-size: 24rpx;
+  color: #999999;
+  margin-top: 294rpx;
+  margin-bottom: -22rpx;
+}
+
+.to-icon {
+  width: 10rpx;
+  height: 16rpx;
+}
+
+.or-text-one {
+  flex-direction: column;
+  font-size: 24rpx;
+  color: #999999;
+}
+
+.third-party-login {
+  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: rgb(0, 0, 0);
+  border: 2rpx solid #e5e5e5;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+  color: #333333;
+}
+
+.google-icon,
+.apple-icon {
+  width: 60rpx;
+  height: 60rpx;
+  margin-right: 20rpx;
+}
+
+.existing-account {
+  display: flex;
+  align-items: center;
+}
+
+.account-text {
+  font-size: 24rpx;
+  color: #666666;
+}
+
+.login-link {
+  font-size: 24rpx;
+  font-weight: bold;
+  color: #333333;
+  margin-left: 10rpx;
+  text-decoration: underline;
+}
+
+.static-footer {
+  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; /* 确保文字垂直居中 */
+}
+
+.switch-container-occupy {
+  margin-top: 100rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/start/select/select.vue b/pages/start/select/select.vue
index 41ece7b..ca555ea 100644
--- a/pages/start/select/select.vue
+++ b/pages/start/select/select.vue
@@ -17,11 +17,22 @@
       <button class="register-button" @click="toRegistration">注册</button>
     </view>
 
+    <footerBar class="static-footer" :type="type"></footerBar>
 
   </view>
 </template>
 
 <script setup>
+
+
+import footerBar from '../../../components/footerBar-cn'
+import { ref, reactive, toRefs, watch } from 'vue'
+
+const type = ref('member')
+
+
+
+
 function toRegistration() {
   uni.navigateTo({
     url: "/pages/start/Registration/Registration",
@@ -42,8 +53,11 @@ function toLogin() {
   align-items: center;
   /* justify-content: space-between; */
   padding: 40rpx;
-  height: 100vh;
+  height: 90vh;
   background-color: #ffffff;
+  overflow: hidden;
+  max-height: 100vh;
+  -webkit-overflow-scrolling: none;
 }
 
 .title-section {
@@ -56,30 +70,32 @@ function toLogin() {
 .main-title {
   text-align: center;
   font-size: 64rpx;
-  font-weight: 800;
+  font-weight: 300;
   color: #000000;
   margin-bottom: 10rpx;
 }
 .subtitle-section {
-  margin-bottom: 100rpx;
+  margin-bottom: 80rpx;
 }
 .subtitle {
-  font-weight: bold;
+  /* font-weight: bold; */
   font-size: 32rpx;
   color: #333333;
 }
 
 .phone-card {
-  background-image: url("/static/images/card.jpg");
-  background-size: 100% 100%;
+  background-image: url("/static/select.png");
+  background-repeat: no-repeat;
+  background-size: contain;
   background-position: center;
-  min-width: 400rpx;
-  min-height: 700rpx;
-  width: 400rpx;
-  height: 700rpx;
-  border-radius: 40rpx;
+  /* background-position: center; */
+  /* min-width: 300rpx; */
+
+  width: 420rpx;
+  height: 786rpx;
+  border-radius: 50rpx;
   padding: 40rpx;
-  box-shadow: 0 20rpx 40rpx rgba(0, 0, 0, 0.3);
+  /* box-shadow: 0 20rpx 40rpx rgba(0, 0, 0, 0.3); */
   position: relative;
   overflow: hidden;
 }
@@ -149,4 +165,11 @@ function toLogin() {
 .nav-item.active .nav-text {
   color: #000000;
 }
+
+.static-footer {
+	position: fixed;
+	bottom: 0;
+  left: 0;
+  right: 0;
+}
 </style>
\ No newline at end of file
diff --git a/pages/start/startup/startup.vue b/pages/start/startup/startup.vue
index 25e1b11..d21c46b 100644
--- a/pages/start/startup/startup.vue
+++ b/pages/start/startup/startup.vue
@@ -16,11 +16,13 @@ onShow(() => {
     });
   }, 3000);
 });
+
+
 </script>
 
 <style>
 .background {
-  background: linear-gradient(180deg, #2a0c4d, #1d0836, #0d0218);
+  background: linear-gradient(180deg, #FB6967, #FB6967);
   width: 100vw;
   height: 100vh;
 }
diff --git a/static/icons/To.png b/static/icons/To.png
new file mode 100644
index 0000000..b69da88
Binary files /dev/null and b/static/icons/To.png differ
diff --git a/static/icons/back.png b/static/icons/back.png
new file mode 100644
index 0000000..2820d33
Binary files /dev/null and b/static/icons/back.png differ
diff --git a/static/icons/look.png b/static/icons/look.png
new file mode 100644
index 0000000..84aa1d8
Binary files /dev/null and b/static/icons/look.png differ
diff --git a/static/icons/start-logo.png b/static/icons/start-logo.png
new file mode 100644
index 0000000..212cfd2
Binary files /dev/null and b/static/icons/start-logo.png differ
diff --git a/static/icons/unlook.png b/static/icons/unlook.png
new file mode 100644
index 0000000..3d41307
Binary files /dev/null and b/static/icons/unlook.png differ
diff --git a/static/select.png b/static/select.png
new file mode 100644
index 0000000..a18b79c
Binary files /dev/null and b/static/select.png differ
diff --git a/static/start-logo.png b/static/start-logo.png
new file mode 100644
index 0000000..212cfd2
Binary files /dev/null and b/static/start-logo.png differ
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index decd775..c72474a 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,3 +1,21 @@
+## 1.9.11（2025-08-20）
+- 修复 uni-popup-dialog组件设置 borderRadius 不生效的 Bug
+## 1.9.10（2025-07-18）
+- 修复 nvue 下弹窗样式错乱的问题 ，更新依赖 uni-transition 组件
+- 更新 示例取消 borderRadius 属性 ，如需内容圆角，用户应该直接在内容插槽中实现
+## 1.9.9（2025-06-11）
+- 修复 uni-popup-dialog 中 setVal 方法报错的问题
+- 修复 uni-popup-dialog 数据双向绑定问题。
+## 1.9.8（2025-04-16）
+- 修复 更新组件示例 ，解决更新数据或保存项目导致弹窗消失的问题
+## 1.9.7（2025-04-14）
+- 修复 uni-popup-dialog 弹出框在vue3中双向绑定问题
+## 1.9.6（2025-01-08）
+- 修复 示例中过期图片地址
+## 1.9.5（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.9.2（2024-09-21）
+- 修复 uni-popup在android上的重复点击弹出位置不正确的bug
 ## 1.9.1（2024-04-02）
 - 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
 ## 1.9.0（2024-03-28）
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index 08707d4..ea93ea5 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-popup-dialog">
+	<view class="uni-popup-dialog" :style="{ borderRadius }">
 		<view class="uni-dialog-title">
 			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
 		</view>
@@ -124,6 +124,10 @@
 			focus: {
 				type: Boolean,
 				default: true,
+			},
+		    borderRadius: {
+				type: String,
+				default: '11px',
 			}
 		},
 		data() {
@@ -156,12 +160,13 @@
 				}
 			},
 			value(val) {
-				if (this.maxlength != -1 && this.mode === 'input') {
-					this.val = val.slice(0, this.maxlength);
-				} else {
-					this.val = val
-				}
+				this.setVal(val)
+			},
+			// #ifdef VUE3
+			modelValue(val) {
+				this.setVal(val)
 			},
+			// #endif
 			val(val) {
 				// #ifdef VUE2
 				// TODO 兼容 vue2
@@ -189,6 +194,16 @@
 		},
 		methods: {
 			/**
+			 * 给val属性赋值
+			 */
+			setVal(val) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			},
+			/**
 			 * 点击确认按钮
 			 */
 			onOk() {
@@ -218,7 +233,6 @@
 <style lang="scss">
 	.uni-popup-dialog {
 		width: 300px;
-		border-radius: 11px;
 		background-color: #fff;
 	}
 
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index f7e667c..c8945d5 100644
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -39,24 +39,25 @@
 		},
 		data() {
 			return {
+				// TODO 替换为自己的图标
 				bottomData: [{
 						text: '微信',
-						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
 						name: 'wx'
 					},
 					{
 						text: '支付宝',
-						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
 						name: 'ali'
 					},
 					{
 						text: 'QQ',
-						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
 						name: 'qq'
 					},
 					{
 						text: '新浪',
-						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
 						name: 'sina'
 					},
 					// {
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index 8349e99..5af55e0 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -192,6 +192,17 @@
 		},
 		mounted() {
 			const fixSize = () => {
+				// #ifdef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getWindowInfo()
+				// #endif
+				// #ifndef MP-WEIXIN
 				const {
 					windowWidth,
 					windowHeight,
@@ -200,6 +211,7 @@
 					screenHeight,
 					safeAreaInsets
 				} = uni.getSystemInfoSync()
+				// #endif
 				this.popupWidth = windowWidth
 				this.popupHeight = windowHeight + (windowTop || 0)
 				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
@@ -350,6 +362,7 @@
 				this.showPopup = true
 				this.showTrans = true
 				this.$nextTick(() => {
+					this.showPoptrans()
 					if (this.messageChild && this.type === 'message') {
 						this.messageChild.timerClose()
 					}
@@ -372,8 +385,7 @@
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPopup = true
-				this.showTrans = true
+				this.showPoptrans()
 			},
 			/**
 			 * 中间弹出样式处理
@@ -403,8 +415,7 @@
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPopup = true
-				this.showTrans = true
+				this.showPoptrans()
 			},
 			left(type) {
 				this.popupstyle = 'left'
@@ -423,8 +434,7 @@
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPopup = true
-				this.showTrans = true
+				this.showPoptrans()
 			},
 			right(type) {
 				this.popupstyle = 'right'
@@ -443,8 +453,13 @@
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
-				this.showPopup = true
-				this.showTrans = true
+				this.showPoptrans()
+			},
+			showPoptrans(){
+				this.$nextTick(()=>{
+					this.showPopup = true
+					this.showTrans = true
+				})
 			}
 		}
 	}
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index 3cfa384..eb2bb05 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,88 +1,107 @@
 {
-	"id": "uni-popup",
-	"displayName": "uni-popup 弹出层",
-	"version": "1.9.1",
-	"description": " Popup 组件，提供常用的弹层",
-	"keywords": [
-        "uni-ui",
-        "弹出层",
-        "弹窗",
-        "popup",
-        "弹框"
+  "id": "uni-popup",
+  "displayName": "uni-popup 弹出层",
+  "version": "1.9.11",
+  "description": " Popup 组件，提供常用的弹层",
+  "keywords": [
+    "uni-ui",
+    "弹出层",
+    "弹窗",
+    "popup",
+    "弹框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.07",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss",
+      "uni-transition"
     ],
-	"repository": "https://github.com/dcloudio/uni-ui",
-	"engines": {
-		"HBuilderX": ""
-	},
-	"directories": {
-		"example": "../../temps/example_temps"
-	},
-    "dcloudext": {
-        "sale": {
-			"regular": {
-				"price": "0.00"
-			},
-			"sourcecode": {
-				"price": "0.00"
-			}
-		},
-		"contact": {
-			"qq": ""
-		},
-		"declaration": {
-			"ads": "无",
-			"data": "无",
-			"permissions": "无"
-		},
-        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-        "type": "component-vue"
-	},
-	"uni_modules": {
-		"dependencies": [
-			"uni-scss",
-			"uni-transition"
-		],
-		"encrypt": [],
-		"platforms": {
-			"cloud": {
-				"tcb": "y",
-                "aliyun": "y",
-                "alipay": "n"
-			},
-			"client": {
-				"App": {
-					"app-vue": "y",
-					"app-nvue": "y"
-				},
-				"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"
-                }
-			}
-		}
-	}
-}
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "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": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "android": "√",
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
index faaf336..01bfb58 100644
--- a/uni_modules/uni-transition/changelog.md
+++ b/uni_modules/uni-transition/changelog.md
@@ -1,3 +1,10 @@
+## 1.3.6（2025-07-18）
+- 修复 nvue 页面，样式错误问题
+## 1.3.5（2025-06-11）
+- 修复 第一次执行不显示动画的问题
+## 1.3.4（2025-04-16）
+- 修复 页面数据更新到底动画复原的问题
+- 修复 示例页面打开报错的问题
 ## 1.3.3（2024-04-23）
 - 修复 当元素会受变量影响自动隐藏的bug
 ## 1.3.2（2023-05-04）
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
index f3ddd1f..7677553 100644
--- a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -1,286 +1,292 @@
 <template>
-  <!-- #ifndef APP-NVUE -->
-  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
-  <!-- #endif -->
-  <!-- #ifdef APP-NVUE -->
-  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
-  <!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
 </template>
 
 <script>
-import { createAnimation } from './createAnimation'
+	import { createAnimation } from './createAnimation'
 
-/**
- * Transition 过渡动画
- * @description 简单过渡动画组件
- * @tutorial https://ext.dcloud.net.cn/plugin?id=985
- * @property {Boolean} show = [false|true] 控制组件显示或隐藏
- * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
- *  @value fade 渐隐渐出过渡
- *  @value slide-top 由上至下过渡
- *  @value slide-right 由右至左过渡
- *  @value slide-bottom 由下至上过渡
- *  @value slide-left 由左至右过渡
- *  @value zoom-in 由小到大过渡
- *  @value zoom-out 由大到小过渡
- * @property {Number} duration 过渡动画持续时间
- * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
- */
-export default {
-	name: 'uniTransition',
-	emits:['click','change'],
-	props: {
-		show: {
-			type: Boolean,
-			default: false
-		},
-		modeClass: {
-			type: [Array, String],
-			default() {
-				return 'fade'
-			}
-		},
-		duration: {
-			type: Number,
-			default: 300
-		},
-		styles: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		customClass:{
-			type: String,
-			default: ''
-		},
-		onceRender:{
-			type:Boolean,
-			default:false
-		},
-	},
-	data() {
-		return {
-			isShow: false,
-			transform: '',
-			opacity: 1,
-			animationData: {},
-			durationTime: 300,
-			config: {}
-		}
-	},
-	watch: {
-		show: {
-			handler(newVal) {
-				if (newVal) {
-					this.open()
-				} else {
-					// 避免上来就执行 close,导致动画错乱
-					if (this.isShow) {
-						this.close()
-					}
+	/**
+	 * Transition 过渡动画
+	 * @description 简单过渡动画组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+	 * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+	 *  @value fade 渐隐渐出过渡
+	 *  @value slide-top 由上至下过渡
+	 *  @value slide-right 由右至左过渡
+	 *  @value slide-bottom 由下至上过渡
+	 *  @value slide-left 由左至右过渡
+	 *  @value zoom-in 由小到大过渡
+	 *  @value zoom-out 由大到小过渡
+	 * @property {Number} duration 过渡动画持续时间
+	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+	 */
+	export default {
+		name: 'uniTransition',
+		emits: ['click', 'change'],
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			modeClass: {
+				type: [Array, String],
+				default () {
+					return 'fade'
 				}
 			},
-			immediate: true
-		}
-	},
-	computed: {
-		// 生成样式数据
-		stylesObject() {
-			let styles = {
-				...this.styles,
-				'transition-duration': this.duration / 1000 + 's'
-			}
-			let transform = ''
-			for (let i in styles) {
-				let line = this.toLine(i)
-				transform += line + ':' + styles[i] + ';'
-			}
-			return transform
+			duration: {
+				type: Number,
+				default: 300
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			customClass: {
+				type: String,
+				default: ''
+			},
+			onceRender: {
+				type: Boolean,
+				default: false
+			},
 		},
-		// 初始化动画条件
-		transformStyles() {
-			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
-		}
-	},
-	created() {
-		// 动画默认配置
-		this.config = {
-			duration: this.duration,
-			timingFunction: 'ease',
-			transformOrigin: '50% 50%',
-			delay: 0
-		}
-		this.durationTime = this.duration
-	},
-	methods: {
-		/**
-		 *  ref 触发 初始化动画
-		 */
-		init(obj = {}) {
-			if (obj.duration) {
-				this.durationTime = obj.duration
+		data() {
+			return {
+				isShow: false,
+				transform: '',
+				opacity: 0,
+				animationData: {},
+				durationTime: 300,
+				config: {}
 			}
-			this.animation = createAnimation(Object.assign(this.config, obj),this)
 		},
-		/**
-		 * 点击组件触发回调
-		 */
-		onClick() {
-			this.$emit('click', {
-				detail: this.isShow
-			})
-		},
-		/**
-		 * ref 触发 动画分组
-		 * @param {Object} obj
-		 */
-		step(obj, config = {}) {
-			if (!this.animation) return
-			for (let i in obj) {
-				try {
-					if(typeof obj[i] === 'object'){
-						this.animation[i](...obj[i])
-					}else{
-						this.animation[i](obj[i])
+		watch: {
+			show: {
+				handler(newVal) {
+					if (newVal) {
+						this.open()
+					} else {
+						// 避免上来就执行 close,导致动画错乱
+						if (this.isShow) {
+							this.close()
+						}
 					}
-				} catch (e) {
-					console.error(`方法 ${i} 不存在`)
-				}
+				},
+				immediate: true
 			}
-			this.animation.step(config)
-			return this
 		},
-		/**
-		 *  ref 触发 执行动画
-		 */
-		run(fn) {
-			if (!this.animation) return
-			this.animation.run(fn)
-		},
-		// 开始过度动画
-		open() {
-			clearTimeout(this.timer)
-			this.transform = ''
-			this.isShow = true
-			let { opacity, transform } = this.styleInit(false)
-			if (typeof opacity !== 'undefined') {
-				this.opacity = opacity
+		computed: {
+			// 生成样式数据
+			stylesObject() {
+				let styles = {
+					...this.styles,
+					'transition-duration': this.duration / 1000 + 's'
+				}
+				let transform = ''
+				for (let i in styles) {
+					let line = this.toLine(i)
+					transform += line + ':' + styles[i] + ';'
+				}
+				return transform
+			},
+			// 初始化动画条件
+			transformStyles() {
+				return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
 			}
-			this.transform = transform
-			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
-			this.$nextTick(() => {
-				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
-				this.timer = setTimeout(() => {
-					this.animation = createAnimation(this.config, this)
-					this.tranfromInit(false).step()
-					this.animation.run()
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				}, 20)
-			})
 		},
-		// 关闭过度动画
-		close(type) {
-			if (!this.animation) return
-			this.tranfromInit(true)
-				.step()
-				.run(() => {
-					this.isShow = false
-					this.animationData = null
-					this.animation = null
-					let { opacity, transform } = this.styleInit(false)
-					this.opacity = opacity || 1
-					this.transform = transform
-					this.$emit('change', {
-						detail: this.isShow
-					})
-				})
-		},
-		// 处理动画开始前的默认样式
-		styleInit(type) {
-			let styles = {
-				transform: ''
+		created() {
+			// 动画默认配置
+			this.config = {
+				duration: this.duration,
+				timingFunction: 'ease',
+				transformOrigin: '50% 50%',
+				delay: 0
 			}
-			let buildStyle = (type, mode) => {
-				if (mode === 'fade') {
-					styles.opacity = this.animationType(type)[mode]
-				} else {
-					styles.transform += this.animationType(type)[mode] + ' '
+			this.durationTime = this.duration
+		},
+		methods: {
+			/**
+			 *  ref 触发 初始化动画
+			 */
+			init(obj = {}) {
+				if (obj.duration) {
+					this.durationTime = obj.duration
 				}
-			}
-			if (typeof this.modeClass === 'string') {
-				buildStyle(type, this.modeClass)
-			} else {
-				this.modeClass.forEach(mode => {
-					buildStyle(type, mode)
+				this.animation = createAnimation(Object.assign(this.config, obj), this)
+			},
+			/**
+			 * 点击组件触发回调
+			 */
+			onClick() {
+				this.$emit('click', {
+					detail: this.isShow
 				})
-			}
-			return styles
-		},
-		// 处理内置组合动画
-		tranfromInit(type) {
-			let buildTranfrom = (type, mode) => {
-				let aniNum = null
-				if (mode === 'fade') {
-					aniNum = type ? 0 : 1
-				} else {
-					aniNum = type ? '-100%' : '0'
-					if (mode === 'zoom-in') {
-						aniNum = type ? 0.8 : 1
-					}
-					if (mode === 'zoom-out') {
-						aniNum = type ? 1.2 : 1
+			},
+			/**
+			 * ref 触发 动画分组
+			 * @param {Object} obj
+			 */
+			step(obj, config = {}) {
+				if (!this.animation) return this
+				Object.keys(obj).forEach(key => {
+					const value = obj[key]
+					if (typeof this.animation[key] === 'function') {
+						Array.isArray(value) ?
+							this.animation[key](...value) :
+							this.animation[key](value)
 					}
-					if (mode === 'slide-right') {
-						aniNum = type ? '100%' : '0'
+				})
+				this.animation.step(config)
+				return this
+			},
+			/**
+			 *  ref 触发 执行动画
+			 */
+			run(fn) {
+				if (!this.animation) return
+				this.animation.run(fn)
+			},
+			// 开始过度动画
+			open() {
+				clearTimeout(this.timer)
+				this.isShow = true
+				// 新增初始状态重置逻辑（关键）
+				this.transform = this.styleInit(false).transform || ''
+				this.opacity = this.styleInit(false).opacity || 0
+
+				// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+				this.$nextTick(() => {
+					// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+					this.timer = setTimeout(() => {
+						this.animation = createAnimation(this.config, this)
+						this.tranfromInit(false).step()
+						this.animation.run(() => {
+							// #ifdef APP-NVUE
+							this.transform = this.styleInit(false).transform || ''
+							this.opacity = this.styleInit(false).opacity || 1
+							// #endif
+							// #ifndef APP-NVUE
+							this.transform = ''
+							this.opacity = this.styleInit(false).opacity || 1
+							// #endif
+							this.$emit('change', {
+								detail: this.isShow
+							})
+						})
+					}, 80)
+				})
+			},
+			// 关闭过度动画
+			close(type) {
+				if (!this.animation) return
+				this.tranfromInit(true)
+					.step()
+					.run(() => {
+						this.isShow = false
+						this.animationData = null
+						this.animation = null
+						let { opacity, transform } = this.styleInit(false)
+						this.opacity = opacity || 1
+						this.transform = transform
+						this.$emit('change', {
+							detail: this.isShow
+						})
+					})
+			},
+			// 处理动画开始前的默认样式
+			styleInit(type) {
+				let styles = { transform: '', opacity: 1 }
+				const buildStyle = (type, mode) => {
+					const value = this.animationType(type)[mode] // 直接使用 type 控制状态
+					if (mode.startsWith('fade')) {
+						styles.opacity = value
+					} else {
+						styles.transform += value + ' '
 					}
-					if (mode === 'slide-bottom') {
-						aniNum = type ? '100%' : '0'
+				}
+
+				if (typeof this.modeClass === 'string') {
+					buildStyle(type, this.modeClass)
+				} else {
+					this.modeClass.forEach(mode => buildStyle(type, mode))
+				}
+				return styles
+			},
+			// 处理内置组合动画
+			tranfromInit(type) {
+				let buildTranfrom = (type, mode) => {
+					let aniNum = null
+					if (mode === 'fade') {
+						aniNum = type ? 0 : 1
+					} else {
+						aniNum = type ? '-100%' : '0'
+						if (mode === 'zoom-in') {
+							aniNum = type ? 0.8 : 1
+						}
+						if (mode === 'zoom-out') {
+							aniNum = type ? 1.2 : 1
+						}
+						if (mode === 'slide-right') {
+							aniNum = type ? '100%' : '0'
+						}
+						if (mode === 'slide-bottom') {
+							aniNum = type ? '100%' : '0'
+						}
 					}
+					this.animation[this.animationMode()[mode]](aniNum)
+				}
+				if (typeof this.modeClass === 'string') {
+					buildTranfrom(type, this.modeClass)
+				} else {
+					this.modeClass.forEach(mode => {
+						buildTranfrom(type, mode)
+					})
 				}
-				this.animation[this.animationMode()[mode]](aniNum)
-			}
-			if (typeof this.modeClass === 'string') {
-				buildTranfrom(type, this.modeClass)
-			} else {
-				this.modeClass.forEach(mode => {
-					buildTranfrom(type, mode)
-				})
-			}
 
-			return this.animation
-		},
-		animationType(type) {
-			return {
-				fade: type ? 0 : 1,
-				'slide-top': `translateY(${type ? '0' : '-100%'})`,
-				'slide-right': `translateX(${type ? '0' : '100%'})`,
-				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
-				'slide-left': `translateX(${type ? '0' : '-100%'})`,
-				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
-				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
-			}
-		},
-		// 内置动画类型与实际动画对应字典
-		animationMode() {
-			return {
-				fade: 'opacity',
-				'slide-top': 'translateY',
-				'slide-right': 'translateX',
-				'slide-bottom': 'translateY',
-				'slide-left': 'translateX',
-				'zoom-in': 'scale',
-				'zoom-out': 'scale'
+				return this.animation
+			},
+			animationType(type) {
+				return {
+					fade: type ? 1 : 0,
+					'slide-top': `translateY(${type ? '0' : '-100%'})`,
+					'slide-right': `translateX(${type ? '0' : '100%'})`,
+					'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+					'slide-left': `translateX(${type ? '0' : '-100%'})`,
+					'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+					'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+				}
+			},
+			// 内置动画类型与实际动画对应字典
+			animationMode() {
+				return {
+					fade: 'opacity',
+					'slide-top': 'translateY',
+					'slide-right': 'translateX',
+					'slide-bottom': 'translateY',
+					'slide-left': 'translateX',
+					'zoom-in': 'scale',
+					'zoom-out': 'scale'
+				}
+			},
+			// 驼峰转中横线
+			toLine(name) {
+				return name.replace(/([A-Z])/g, '-$1').toLowerCase()
 			}
-		},
-		// 驼峰转中横线
-		toLine(name) {
-			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
 		}
 	}
-}
 </script>
 
 <style></style>
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": "-"
+          }
         }
       }
     }