Authored by qxm

Merge branch 'master' into feature/qxm

... ... @@ -5,7 +5,6 @@ SHOPRO_VERSION=v2.4.1
# SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn
# SHOPRO_BASE_URL=http://mall.hcxtec.com
SHOPRO_BASE_URL=https://xunji.geaktec.com
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
# SHOPRO_DEV_BASE_URL=http://192.168.1.200:48081
# SHOPRO_DEV_BASE_URL=http://192.168.1.85:48080
... ...
{
"name": "智能健身",
"appid": "__UNI__7CAA18B",
"appid": "__UNI__8F24C84",
"description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。",
"versionName": "2025.10",
"versionCode": "183",
... ...
... ... @@ -261,7 +261,7 @@
userStore.setToken(authData.accessToken, authData.refreshToken || '');
// 3. 登录成功后,主动拉取一次用户信息同步至本地状态
await userStore.getInfo();
await userStore.getInfo();
uni.showToast({
title: '登录成功',
... ... @@ -273,7 +273,7 @@
uni.switchTab({
url: '/pages/xunji/xunji',
});
}, 1200);
}, 100);
} else {
uni.showToast({
title: res.msg || '登录失败,未获取到有效凭证',
... ...
... ... @@ -29,13 +29,11 @@ const options = {
isToken: true,
};
/** 登录页路径 */
const LOGIN_PAGE = '/pages7/pages/index/login';
/** 跳转到登录页(navigateTo 失败时 reLaunch,避免页面栈异常) */
function navigateToLogin() {
uni.navigateTo({
url: LOGIN_PAGE,
url: '/pages7/pages/index/login',
fail: () => {
uni.reLaunch({ url: '/pages/xunji/xunji' });
},
... ...
... ... @@ -8,7 +8,7 @@ import uniReadPagesV3Plugin from './sheep/router/utils/uni-read-pages-v3';
import mpliveMainfestPlugin from './sheep/libs/mplive-manifest-plugin';
// https://vitejs.dev/config/
export default (command, mode) => {
export default ({ command, mode }) => {
const env = loadEnv(mode, __dirname, 'SHOPRO_');
return {
envPrefix: 'SHOPRO_',
... ...