diff --git a/YJYF/YJYF.vue b/YJYF/YJYF.vue index d10a903..823dd3b 100644 --- a/YJYF/YJYF.vue +++ b/YJYF/YJYF.vue @@ -221,7 +221,7 @@ import { ref } from 'vue' import { onShow } from '@dcloudio/uni-app' import api from '@/utils/api.js' - import { isLogin, toLogin } from '@/utils/request.js' + import { isLogin, toLogin, setToken, setUser } from '@/utils/request.js' /* ---------- 系统适配:状态栏 / 导航栏高度(刘海屏 + 胶囊按钮) ---------- */ const statusBarHeight = ref(20) @@ -255,8 +255,33 @@ const cats = ref([]) const badge = ref({ coupon: 0, unread: 0 }) + let silentTried = false + + /** + * 静默微信登录:进主页时自动换取 openid 并建号, + * 成功 → 无感登录(可直接下单);失败 → 保持游客态,不打断浏览 + */ + function trySilentLogin() { + if (isLogin() || silentTried) return Promise.resolve() + silentTried = true + return new Promise((resolve) => { + uni.login({ + provider: 'weixin', + success: (r) => { + if (!r.code) { resolve(); return } + api.wxLogin({ code: r.code }).then((data) => { + setToken(data.token) + setUser(data.userinfo) + resolve() + }).catch(() => resolve()) + }, + fail: () => resolve() + }) + }) + } + async function loadHome() { - if (!isLogin()) { toLogin(); return } + await trySilentLogin() try { const res = await api.home() cats.value = res.cats || [] diff --git a/pages/login/login.vue b/pages/login/login.vue index a3833e9..6d29112 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -3,6 +3,7 @@ + ‹ 优匠优服 专业师傅 · 上门到家 @@ -32,15 +33,24 @@