From 3af5f2850d58a33749220660f1bc8f9f4474ce0b Mon Sep 17 00:00:00 2001
From: jacobxu666 <jacobxu666@gmail.com>
Date: Sun, 14 Jun 2026 21:54:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E6=94=B9=E9=80=A0=EF=BC=88=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=8E=88=E6=9D=83=20+=20API=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80=E6=94=B9=E4=B8=BA/mp-api=20+=20=E9=9A=90=E7=A7=81?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=A3=80=E6=9F=A5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue               | 12 +++++++++++
 src/api/types.ts          |  3 +++
 src/api/user.ts           |  6 +++---
 src/config/index.ts       |  6 +++---
 src/pages/login/login.vue | 43 ++++++++++++++++++++++++++++++++-------
 src/store/user.ts         | 19 +++--------------
 6 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d57fcee..d0b04bc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,6 +3,18 @@ import { onLaunch } from '@dcloudio/uni-app'
 import { useUserStore } from './store/user'
 
 onLaunch(() => {
+  // #ifdef MP-WEIXIN
+  wx.getPrivacySetting({
+    success: (res: any) => {
+      if (res.needAuthorization) {
+        uni.setStorageSync('needPrivacy', true)
+      } else {
+        uni.removeStorageSync('needPrivacy')
+      }
+    }
+  })
+  // #endif
+
   const userStore = useUserStore()
   // 如果有 token，尝试获取用户信息
   if (userStore.isLogin) {
diff --git a/src/api/types.ts b/src/api/types.ts
index 00f2992..d56dfda 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -11,6 +11,9 @@ export interface WxLoginResult {
   accessToken: string
   refreshToken: string
   userId: number
+  openId: string
+  mobile: string
+  expiresTime: string
 }
 
 /** 账号密码登录参数（降级方案） */
diff --git a/src/api/user.ts b/src/api/user.ts
index 0cf58a3..7b4093a 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,9 +1,9 @@
 import { get, post } from './request'
 import type { UserInfo, WxLoginResult, LoginParams } from './types'
 
-/** 微信授权登录 */
-export function wxLogin(code: string): Promise<WxLoginResult> {
-  return post<WxLoginResult>('/auth/wx-login', { code }, false)
+/** 微信小程序登录（loginCode + phoneCode） */
+export function wxLogin(data: { loginCode: string; phoneCode: string }): Promise<WxLoginResult> {
+  return post<WxLoginResult>('/auth/wx-login', data, false)
 }
 
 /** 账号密码登录（降级方案） */
diff --git a/src/config/index.ts b/src/config/index.ts
index a2c2638..b3c9f85 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -3,11 +3,11 @@
  * 根据 Vite 环境变量读取 API 基础地址等配置
  */
 
-/** API 基础地址（含 /manage-api 前缀） */
+/** API 基础地址（含 /mp-api 前缀） */
 export const BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:80'
 
-/** API 接口前缀 */
-export const API_PREFIX = '/manage-api'
+/** API 接口前缀（小程序走 MP_API 渠道） */
+export const API_PREFIX = '/mp-api'
 
 /** 完整 API 基础路径 */
 export const API_BASE = `${BASE_URL}${API_PREFIX}`
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 029122c..10bde67 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -8,7 +8,10 @@
 
     <view class="login-area">
       <!-- #ifdef MP-WEIXIN -->
-      <button class="btn-wx-login" @click="handleWxLogin" :disabled="loading">
+      <button class="btn-wx-login"
+              open-type="getPhoneNumber"
+              @getphonenumber="handleGetPhoneNumber"
+              :disabled="loading">
         {{ loading ? '登录中...' : '微信一键登录' }}
       </button>
       <!-- #endif -->
@@ -59,17 +62,43 @@ const form = reactive({
   password: ''
 })
 
-/** 微信一键登录 */
-async function handleWxLogin() {
+/** 微信手机号授权回调 → 登录 */
+async function handleGetPhoneNumber(e: any) {
+  // 用户拒绝授权手机号
+  if (e.detail.errMsg !== 'getPhoneNumber:ok') {
+    showToast('需要手机号授权才能登录')
+    return
+  }
+
   loading.value = true
   try {
-    await userStore.wxLogin()
+    const phoneCode = e.detail.code
+    if (!phoneCode) {
+      showToast('手机号获取失败，请重试')
+      return
+    }
+
+    // 获取微信登录 code（与 phoneCode 是完全不同的凭证）
+    const loginRes: any = await new Promise((resolve, reject) => {
+      uni.login({ provider: 'weixin', success: resolve, fail: reject })
+    })
+
+    // 防御性检查：loginCode 不能为空
+    if (!loginRes || !loginRes.code) {
+      showToast('微信登录失败，请重试')
+      return
+    }
+
+    await userStore.wxLogin({
+      loginCode: loginRes.code,   // wx.login() 返回的 code
+      phoneCode: phoneCode         // getPhoneNumber 返回的 code
+    })
+
     showToast('登录成功', 'success')
     setTimeout(() => {
-      uni.switchTab({ url: '/packages/user/pages/index/index' })
+      uni.switchTab({ url: '/pages/index/index' })
     }, 1000)
   } catch (err: any) {
-    console.error('微信登录失败:', err)
     showToast(err.message || '登录失败')
   } finally {
     loading.value = false
@@ -87,7 +116,7 @@ async function handleFallbackLogin() {
     await userStore.login({ username: form.username, password: form.password })
     showToast('登录成功', 'success')
     setTimeout(() => {
-      uni.switchTab({ url: '/packages/user/pages/index/index' })
+      uni.switchTab({ url: '/pages/index/index' })
     }, 1000)
   } catch (err: any) {
     console.error('登录失败:', err)
diff --git a/src/store/user.ts b/src/store/user.ts
index eac476b..6956b77 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -12,27 +12,14 @@ export const useUserStore = defineStore('user', () => {
 
   const isLogin = computed(() => !!token.value)
 
-  /** 微信授权登录 */
-  async function wxLogin() {
-    // #ifdef MP-WEIXIN
-    const loginRes = await new Promise<UniApp.LoginRes>((resolve, reject) => {
-      uni.login({
-        provider: 'weixin',
-        success: resolve,
-        fail: reject
-      })
-    })
-    const result = await apiWxLogin(loginRes.code)
+  /** 微信授权登录（接收 loginCode + phoneCode） */
+  async function wxLogin(params: { loginCode: string; phoneCode: string }) {
+    const result = await apiWxLogin(params)
     token.value = result.accessToken
     refreshToken.value = result.refreshToken
     setToken(result.accessToken)
     uni.setStorageSync(REFRESH_TOKEN_KEY, result.refreshToken)
     return result
-    // #endif
-
-    // #ifdef H5
-    throw new Error('H5 登录暂未开放，请在微信小程序中使用')
-    // #endif
   }
 
   /** 账号密码登录（降级方案） */