From 14e71fda171a8438dadf6be68a2fdfd1252008b1 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 09 九月 2025 14:30:08 +0800 Subject: [PATCH] fix: bug --- apps/cMiniApp/auto-imports.d.ts | 2 ++ apps/cMiniApp/project.config.json | 4 ++-- apps/cMiniApp/src/constants/app.ts | 2 ++ apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue | 6 ++---- apps/cMiniApp/.eslintrc-auto-import.json | 3 ++- apps/cMiniApp/config/dev.js | 1 + apps/cMiniApp/config/prod.js | 1 + apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue | 5 ++--- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/apps/cMiniApp/.eslintrc-auto-import.json b/apps/cMiniApp/.eslintrc-auto-import.json index a8acf55..4ef9371 100644 --- a/apps/cMiniApp/.eslintrc-auto-import.json +++ b/apps/cMiniApp/.eslintrc-auto-import.json @@ -105,6 +105,7 @@ "watchSyncEffect": true, "useUpdateResume": true, "useAccessReal": true, - "useLaunchOptions": true + "useLaunchOptions": true, + "APP_ENV": true } } diff --git a/apps/cMiniApp/auto-imports.d.ts b/apps/cMiniApp/auto-imports.d.ts index 6ec898a..6ba5ad4 100644 --- a/apps/cMiniApp/auto-imports.d.ts +++ b/apps/cMiniApp/auto-imports.d.ts @@ -5,6 +5,7 @@ // Generated by unplugin-auto-import export {} declare global { + const APP_ENV: typeof import('./src/constants/app')['APP_ENV'] const AppLocalConfig: typeof import('./src/constants/app')['AppLocalConfig'] const BackType: typeof import('./src/constants/enum')['BackType'] const EffectScope: typeof import('vue')['EffectScope'] @@ -119,6 +120,7 @@ import { UnwrapRef } from 'vue' declare module 'vue' { interface ComponentCustomProperties { + readonly APP_ENV: UnwrapRef<typeof import('./src/constants/app')['APP_ENV']> readonly AppLocalConfig: UnwrapRef<typeof import('./src/constants/app')['AppLocalConfig']> readonly BackType: UnwrapRef<typeof import('./src/constants/enum')['BackType']> readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']> diff --git a/apps/cMiniApp/config/dev.js b/apps/cMiniApp/config/dev.js index 90b4816..bf3e92a 100644 --- a/apps/cMiniApp/config/dev.js +++ b/apps/cMiniApp/config/dev.js @@ -5,6 +5,7 @@ NODE_ENV: '"development"', BASE_URL: '"http://localhost:53780"', BASE_URL_JX: '"https://api.jx818.com"', + APP_ENV: '"development"', OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"', WEMAP_KEY: 'T2UBZ-N563J-ZCHFF-XDOXN-VCH7S-CJB2T', diff --git a/apps/cMiniApp/config/prod.js b/apps/cMiniApp/config/prod.js index 58c9cd5..53a2a6c 100644 --- a/apps/cMiniApp/config/prod.js +++ b/apps/cMiniApp/config/prod.js @@ -3,6 +3,7 @@ NODE_ENV: '"production"', BASE_URL: '"https://lgdapi.81812333.com"', BASE_URL_JX: '"https://lgdapi.jx818.com"', + APP_ENV: '"production"', OSS_URL: '"https://parkmanagement.oss-cn-hangzhou.aliyuncs.com"', diff --git a/apps/cMiniApp/project.config.json b/apps/cMiniApp/project.config.json index 1d057ff..cc53dd5 100644 --- a/apps/cMiniApp/project.config.json +++ b/apps/cMiniApp/project.config.json @@ -3,8 +3,8 @@ "description": "", "setting": { "urlCheck": false, - "es6": true, - "enhance": true, + "es6": false, + "enhance": false, "postcss": false, "preloadBackgroundData": false, "minified": false, diff --git a/apps/cMiniApp/src/constants/app.ts b/apps/cMiniApp/src/constants/app.ts index 0d00408..fb95289 100644 --- a/apps/cMiniApp/src/constants/app.ts +++ b/apps/cMiniApp/src/constants/app.ts @@ -4,3 +4,5 @@ userType: EnumUserType.Personal, clientType: EnumClientType.Wxmp, }; + +export const APP_ENV = process.env.APP_ENV; diff --git a/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue b/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue index 0a234f5..6c4c260 100644 --- a/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue +++ b/apps/cMiniApp/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue @@ -40,6 +40,7 @@ import { useUserStore } from '@/stores/modules/user'; import Taro from '@tarojs/taro'; import * as authServices from '@12333/services/apiV2/auth'; +import { APP_ENV } from '@/constants'; defineOptions({ name: 'verificationCodeLoginForm', @@ -78,13 +79,10 @@ }, { showLoading: false, getResponse: true } ); - - if (res && process.env.APP_ENV === 'staging') { + if (res && APP_ENV === 'staging') { // @ts-ignore form.verificationCode = res?.data?.extras?.code ?? ''; } - // @ts-ignore - return res?.data?.data; } async function handleLogin() { diff --git a/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue b/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue index f2e14fb..d30a855 100644 --- a/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue +++ b/apps/cMiniApp/src/subpackages/login/registerForm/registerForm.vue @@ -62,6 +62,7 @@ import Taro from '@tarojs/taro'; import { ResponseCode } from '@12333/constants'; import * as authServices from '@12333/services/apiV2/auth'; +import { APP_ENV } from '@/constants'; defineOptions({ name: 'registerForm', @@ -109,12 +110,10 @@ } ); - if (res && process.env.APP_ENV === 'staging') { + if (res && APP_ENV === 'staging') { // @ts-ignore form.verificationCode = res?.data?.extras?.code ?? ''; } - // @ts-ignore - return res?.data?.data; } async function handleRegister() { -- Gitblit v1.9.1