Merge branch 'master' into feature/qxm
Showing
5 changed files
with
4 additions
and
7 deletions
| @@ -5,7 +5,6 @@ SHOPRO_VERSION=v2.4.1 | @@ -5,7 +5,6 @@ SHOPRO_VERSION=v2.4.1 | ||
| 5 | # SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn | 5 | # SHOPRO_BASE_URL=http://api-dashboard.yudao.iocoder.cn |
| 6 | # SHOPRO_BASE_URL=http://mall.hcxtec.com | 6 | # SHOPRO_BASE_URL=http://mall.hcxtec.com |
| 7 | SHOPRO_BASE_URL=https://xunji.geaktec.com | 7 | SHOPRO_BASE_URL=https://xunji.geaktec.com |
| 8 | - | ||
| 9 | # 后端接口 - 测试环境(通过 process.env.NODE_ENV = development) | 8 | # 后端接口 - 测试环境(通过 process.env.NODE_ENV = development) |
| 10 | # SHOPRO_DEV_BASE_URL=http://192.168.1.200:48081 | 9 | # SHOPRO_DEV_BASE_URL=http://192.168.1.200:48081 |
| 11 | # SHOPRO_DEV_BASE_URL=http://192.168.1.85:48080 | 10 | # SHOPRO_DEV_BASE_URL=http://192.168.1.85:48080 |
| 1 | { | 1 | { |
| 2 | "name": "智能健身", | 2 | "name": "智能健身", |
| 3 | - "appid": "__UNI__7CAA18B", | 3 | + "appid": "__UNI__8F24C84", |
| 4 | "description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。", | 4 | "description": "基于 uni-app + Vue3 技术驱动的在线商城系统,内含诸多功能与丰富的活动,期待您的使用和反馈。", |
| 5 | "versionName": "2025.10", | 5 | "versionName": "2025.10", |
| 6 | "versionCode": "183", | 6 | "versionCode": "183", |
| @@ -273,7 +273,7 @@ | @@ -273,7 +273,7 @@ | ||
| 273 | uni.switchTab({ | 273 | uni.switchTab({ |
| 274 | url: '/pages/xunji/xunji', | 274 | url: '/pages/xunji/xunji', |
| 275 | }); | 275 | }); |
| 276 | - }, 1200); | 276 | + }, 100); |
| 277 | } else { | 277 | } else { |
| 278 | uni.showToast({ | 278 | uni.showToast({ |
| 279 | title: res.msg || '登录失败,未获取到有效凭证', | 279 | title: res.msg || '登录失败,未获取到有效凭证', |
| @@ -29,13 +29,11 @@ const options = { | @@ -29,13 +29,11 @@ const options = { | ||
| 29 | isToken: true, | 29 | isToken: true, |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | -/** 登录页路径 */ | ||
| 33 | -const LOGIN_PAGE = '/pages7/pages/index/login'; | ||
| 34 | 32 | ||
| 35 | /** 跳转到登录页(navigateTo 失败时 reLaunch,避免页面栈异常) */ | 33 | /** 跳转到登录页(navigateTo 失败时 reLaunch,避免页面栈异常) */ |
| 36 | function navigateToLogin() { | 34 | function navigateToLogin() { |
| 37 | uni.navigateTo({ | 35 | uni.navigateTo({ |
| 38 | - url: LOGIN_PAGE, | 36 | + url: '/pages7/pages/index/login', |
| 39 | fail: () => { | 37 | fail: () => { |
| 40 | uni.reLaunch({ url: '/pages/xunji/xunji' }); | 38 | uni.reLaunch({ url: '/pages/xunji/xunji' }); |
| 41 | }, | 39 | }, |
| @@ -8,7 +8,7 @@ import uniReadPagesV3Plugin from './sheep/router/utils/uni-read-pages-v3'; | @@ -8,7 +8,7 @@ import uniReadPagesV3Plugin from './sheep/router/utils/uni-read-pages-v3'; | ||
| 8 | import mpliveMainfestPlugin from './sheep/libs/mplive-manifest-plugin'; | 8 | import mpliveMainfestPlugin from './sheep/libs/mplive-manifest-plugin'; |
| 9 | 9 | ||
| 10 | // https://vitejs.dev/config/ | 10 | // https://vitejs.dev/config/ |
| 11 | -export default (command, mode) => { | 11 | +export default ({ command, mode }) => { |
| 12 | const env = loadEnv(mode, __dirname, 'SHOPRO_'); | 12 | const env = loadEnv(mode, __dirname, 'SHOPRO_'); |
| 13 | return { | 13 | return { |
| 14 | envPrefix: 'SHOPRO_', | 14 | envPrefix: 'SHOPRO_', |
-
Please register or login to post a comment