diff --git a/client/src/pages/login/login.vue b/client/src/pages/login/login.vue
index 201f5ae..975cce3 100644
--- a/client/src/pages/login/login.vue
+++ b/client/src/pages/login/login.vue
@@ -219,7 +219,8 @@ const wechatLogin = async () => {
uni.showToast({ title: '登录成功', icon: 'success' })
setTimeout(() => uni.switchTab({ url: '/pages/index/index' }), 1000)
} catch (err) {
- uni.showToast({ title: '登录失败,请重试', icon: 'none' })
+ const msg = (err && (err.message || err.errMsg)) || ''
+ uni.showToast({ title: msg ? `登录失败:${msg}` : '登录失败,请重试', icon: 'none' })
} finally {
loading.value = false
}
diff --git a/client/src/pages/profile/profile.vue b/client/src/pages/profile/profile.vue
index 0381478..5f85216 100644
--- a/client/src/pages/profile/profile.vue
+++ b/client/src/pages/profile/profile.vue
@@ -122,22 +122,15 @@
-
+
-
-
-
- {{ loginLoading ? '登录中...' : '微信一键登录' }}
-
-
-
登录 / 注册
-
- 暂不登录,先体验
+
+ 去登录,同步点亮进度
@@ -155,8 +148,8 @@ import { useUserStore } from '@/stores/user'
import { knowledgeApi, aiChatApi } from '@/utils/api'
import { DIMENSIONS } from '@/utils/dimensions'
import AppIcon from '@/components/AppIcon.vue'
+import { APP_VERSION } from '@/utils/version'
-const VERSION = '1.2.0'
const SUB_GUEST = '游客 · 点亮进度保存在本机,登录后同步'
const SUB_USER = '已点亮 {n} 颗星球 · 连续 {d} 天'
const PLAN_FREE = '✦ 免费版'
@@ -169,9 +162,8 @@ const collectedCount = ref(0)
const stats = ref(null)
const byDim = ref({})
const quotaInfo = ref(null)
-const loginLoading = ref(false)
-const versionText = VERSION
+const versionText = APP_VERSION
const profileSubText = computed(() => {
if (!userStore.isLoggedIn) return SUB_GUEST
@@ -269,49 +261,6 @@ async function handleLogout() {
function goLogin() { uni.navigateTo({ url: '/pages/login/login' }) }
-// 小程序端:我的页就地微信一键登录(登录页保留为账号登录入口)
-// #ifdef MP-WEIXIN
-async function wechatLogin() {
- if (loginLoading.value) return
- const agreed = uni.getStorageSync('wx_login_agreed')
- if (!agreed) {
- uni.showModal({
- title: '用户协议',
- content: '登录即表示同意《用户协议》与《隐私政策》',
- confirmText: '同意并登录',
- cancelText: '取消',
- success: (res) => {
- if (res.confirm) {
- uni.setStorageSync('wx_login_agreed', '1')
- doWechatLogin()
- }
- }
- })
- return
- }
- doWechatLogin()
-}
-
-async function doWechatLogin() {
- loginLoading.value = true
- try {
- const loginRes = await new Promise((resolve, reject) => {
- uni.login({ success: resolve, fail: reject })
- })
- if (!loginRes.code) throw new Error('no code')
- await userStore.login(loginRes.code, {})
- uni.showToast({ title: '登录成功', icon: 'success' })
- // 登录后原地刷新档案数据,无需跳页
- await userStore.fetchMe()
- await Promise.all([loadStats(), loadCollected(), loadQuota()])
- } catch (e) {
- uni.showToast({ title: '登录失败,请重试', icon: 'none' })
- } finally {
- loginLoading.value = false
- }
-}
-// #endif
-function goBrowse() { uni.switchTab({ url: '/pages/index/index' }) }
function goChat() { uni.switchTab({ url: '/pages/chat/chat' }) }
function goFavorites() { uni.navigateTo({ url: '/pages/favorites/favorites' }) }
function goProgress() { uni.navigateTo({ url: '/pages/progress/progress' }) }
diff --git a/client/src/pages/settings/settings.vue b/client/src/pages/settings/settings.vue
index 5ec59eb..e1e78e5 100644
--- a/client/src/pages/settings/settings.vue
+++ b/client/src/pages/settings/settings.vue
@@ -59,11 +59,12 @@
- 宇之然 AI 维度 v1.0.0
+ 宇之然 AI 维度 v{{ appVersion }}