From 0781fb1dd6a6363ea86834672e7ca8372e984eca Mon Sep 17 00:00:00 2001
From: Ethereal <3432649580@qq.com>
Date: Thu, 23 Oct 2025 11:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                    |  9 ++++
 manifest.json                             | 13 ++++-
 pages/start/Registration/Registration.vue |  6 +--
 pages/start/login/login.vue               | 85 ++++++++++++++++++++++++-------
 4 files changed, 89 insertions(+), 24 deletions(-)
 create mode 100644 .hbuilderx/launch.json

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..15db785
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,9 @@
+{
+    "version" : "1.0",
+    "configurations" : [
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-ios"
+        }
+    ]
+}
diff --git a/manifest.json b/manifest.json
index 9b2b32a..dd52cfc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,7 +16,9 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "OAuth" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
@@ -42,7 +44,14 @@
             },
             "ios" : {},
             /* ios打包配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "oauth" : {
+                    "apple" : {},
+                    "google" : {
+                        "clientid" : "135"
+                    }
+                }
+            }
         }
     },
     /* SDK配置 */
diff --git a/pages/start/Registration/Registration.vue b/pages/start/Registration/Registration.vue
index f81c670..8116282 100644
--- a/pages/start/Registration/Registration.vue
+++ b/pages/start/Registration/Registration.vue
@@ -11,7 +11,7 @@
     </view>
 
     <!-- Logo -->
-    <image class="logo" src="/static/logo.png" mode="aspectFit"></image>
+    <!-- <image class="logo" src="/static/logo.png" mode="aspectFit"></image> -->
 
     <!-- 欢迎语 -->
     <text class="welcome-text">欢迎来到 DeepChart</text>
@@ -242,8 +242,8 @@ function goToLogin() {
   font-weight: bold;
   color: #333333;
   margin-bottom: 60rpx;
-  text-align: left;
-  align-self: flex-start;
+  /* text-align: left; */
+  /* align-self: flex-start; */
 }
 .switch-container {
   display: flex;
diff --git a/pages/start/login/login.vue b/pages/start/login/login.vue
index 667653f..c1ad80e 100644
--- a/pages/start/login/login.vue
+++ b/pages/start/login/login.vue
@@ -14,10 +14,10 @@
     </view>
 
     <!-- Logo -->
-    <image class="logo" src="/static/logo.png" mode="aspectFit"></image>
+    <!-- <image class="logo" src="/static/logo.png" mode="aspectFit"></image> -->
 
     <!-- 欢迎语 -->
-    <text class="welcome-text">登录</text>
+    <text class="welcome-text">登录DeepChart</text>
 
     <!-- 邮箱/手机号切换 -->
     <view class="switch-container">
@@ -45,7 +45,11 @@
       />
       <view v-else class="phone-input-container">
         <view class="country-code-selector" @click="showCountryPicker">
-          <image class="country-flag-img" :src="selectedCountry.flag" mode="aspectFit"></image>
+          <image
+            class="country-flag-img"
+            :src="selectedCountry.flag"
+            mode="aspectFit"
+          ></image>
           <text class="country-code">{{ selectedCountry.code }}</text>
           <text class="arrow-down">▼</text>
         </view>
@@ -97,7 +101,7 @@
 <script setup>
 import { ref } from "vue";
 // 导入完整的国家列表
-import countryList from './list.js';
+import countryList from "./list.js";
 
 const email = ref("");
 const phone = ref("");
@@ -106,24 +110,31 @@ const switchType = ref("Email"); // 默认是邮箱注册
 const { safeAreaInsets } = uni.getSystemInfoSync();
 
 // 使用从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 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]);
+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}`),
+    itemList: countries.value.map(
+      (country) => `${country.name} ${country.code}`
+    ),
     success: function (res) {
       selectedCountry.value = countries.value[res.tapIndex];
-    }
+    },
   });
 }
 
@@ -157,7 +168,7 @@ function register() {
     console.log("登录:", email.value);
   }
 
-  if(switchType.value === "Phone"){
+  if (switchType.value === "Phone") {
     // 登录逻辑
     if (!phone.value) {
       uni.showToast({
@@ -175,11 +186,48 @@ function register() {
 function loginWithApple() {
   // Apple登录逻辑
   console.log("通过Apple登录");
+  uni.login({
+    provider: "apple",
+    success: function (loginRes) {
+      // 登录成功
+      uni.getUserInfo({
+        provider: "apple",
+        success: function (info) {
+          // 获取用户信息成功, info.authResult中保存登录认证数据
+		  console.log(info);
+        },
+      });
+    },
+    fail: function (err) {
+      // 登录授权失败
+      // err.code错误码参考`授权失败错误码(code)说明`
+	  console.log(err);
+	  
+    },
+  });
 }
 
 function loginWithGoogle() {
   // Google登录逻辑
   console.log("通过Google登录");
+  uni.login({
+    provider: "google",
+    success: function (loginRes) {
+      // 登录成功
+      uni.getUserInfo({
+        provider: "google",
+        success: function (info) {
+          // 获取用户信息成功, info.authResult保存用户信息
+		  console.log(info);
+        },
+      });
+    },
+    fail: function (err) {
+      // 登录授权失败
+      // err.code是错误码
+	  console.log(err);
+    },
+  });
 }
 
 function goToRegistration() {
@@ -194,12 +242,11 @@ function onPhoneInput(e) {
   const value = e.detail.value;
   // 使用 isNaN 检查是否为有效数字
   if (isNaN(value)) {
-    phone.value = '';
+    phone.value = "";
   } else {
     phone.value = value;
   }
 }
-
 </script>
 
 <style scoped>
@@ -258,8 +305,8 @@ function onPhoneInput(e) {
   font-weight: bold;
   color: #333333;
   margin-bottom: 60rpx;
-  text-align: left;
-  align-self: flex-start;
+  /* text-align: left; */
+  /* align-self: flex-start; */
 }
 .switch-container {
   display: flex;