From 3633cf70a3d835da15d27a91e7f8f8fd15dbcb35 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 20 三月 2025 10:59:21 +0800
Subject: [PATCH] fix: 三期需求
---
packages/components/vite.config.ts | 2 +-
apps/taro/src/hooks/user.ts | 1 -
apps/taro/types/global.d.ts | 8 ++++----
packages/components/src/utils/env.ts | 9 +--------
tsconfig.base.json | 3 ++-
apps/taro/config/dev.js | 5 +++--
packages/components/src/hooks/selectPayType.ts | 2 --
packages/constants/oss.ts | 2 +-
packages/components/types/global.d.ts | 4 ++++
apps/taro/config/staging.js | 5 +++--
apps/taro/config/prod.js | 6 +++---
11 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/apps/taro/config/dev.js b/apps/taro/config/dev.js
index 11f732c..61b01a0 100644
--- a/apps/taro/config/dev.js
+++ b/apps/taro/config/dev.js
@@ -5,11 +5,12 @@
BASE_URL_H5: '"/"',
BASE_URL_JX: '"https://api.jx818.com"',
- OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"',
WEMAP_KEY: 'T2UBZ-N563J-ZCHFF-XDOXN-VCH7S-CJB2T',
WXPayAppId: '"wxf940ff1d35a98493"',
},
- defineConstants: {},
+ defineConstants: {
+ OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"',
+ },
mini: {},
h5: {},
};
diff --git a/apps/taro/config/prod.js b/apps/taro/config/prod.js
index bd2e8a3..02b1b29 100644
--- a/apps/taro/config/prod.js
+++ b/apps/taro/config/prod.js
@@ -7,12 +7,12 @@
BASE_URL_H5: '"https://api.81812333.com"',
BASE_URL_JX: '"https://api.jx818.com"',
- OSS_URL: '"https://parkmanagement.oss-cn-hangzhou.aliyuncs.com"',
-
WEMAP_KEY: 'DYRBZ-ZGPCF-X3OJN-N2AA3-JWUCE-HEBXJ',
WXPayAppId: '"wxf940ff1d35a98493"',
},
- defineConstants: {},
+ defineConstants: {
+ OSS_URL: '"https://parkmanagement.oss-cn-hangzhou.aliyuncs.com"',
+ },
mini: {},
h5: {
output: {
diff --git a/apps/taro/config/staging.js b/apps/taro/config/staging.js
index 8046c5f..5c87719 100644
--- a/apps/taro/config/staging.js
+++ b/apps/taro/config/staging.js
@@ -7,13 +7,14 @@
BASE_URL_H5: '"https://testrlywx.boleyuma.com"',
BASE_URL_JX: '"https://api.jx818.com"',
- OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"',
-
APP_ENV: '"staging"',
WEMAP_KEY: 'T2UBZ-N563J-ZCHFF-XDOXN-VCH7S-CJB2T',
WXPayAppId: '"wxf940ff1d35a98493"',
},
+ defineConstants: {
+ OSS_URL: '"https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/"',
+ },
h5: {
output: {
path: path.resolve(__dirname, '..', `dist/h5-staging`),
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index 67a64fe..f76e73d 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -1,7 +1,6 @@
import { useUserStore } from '@/stores/modules/user';
import Taro from '@tarojs/taro';
import { object2query } from '@life-payment/utils';
-import * as userServices from '@life-payment/services/api/User';
import { useQuery } from '@tanstack/vue-query';
import { MaybeRef } from 'vue';
import { useRefeshDidShow } from './infiniteLoading';
diff --git a/apps/taro/types/global.d.ts b/apps/taro/types/global.d.ts
index 6c54fae..a19b70a 100644
--- a/apps/taro/types/global.d.ts
+++ b/apps/taro/types/global.d.ts
@@ -31,12 +31,12 @@
[elem: string]: any;
}
}
-
- interface Window {
- WeixinJSBridge: any
- }
+
}
+declare const OSS_URL: string
+declare const WeixinJSBridge: any
+
declare namespace NodeJS {
interface ProcessEnv {
TARO_ENV: 'weapp' | 'swan' | 'alipay' | 'h5' | 'rn' | 'tt' | 'quickapp' | 'qq' | 'jd'
diff --git a/packages/components/src/hooks/selectPayType.ts b/packages/components/src/hooks/selectPayType.ts
index f7b7c04..aa8e486 100644
--- a/packages/components/src/hooks/selectPayType.ts
+++ b/packages/components/src/hooks/selectPayType.ts
@@ -117,9 +117,7 @@
let res = await getPayOrderForJsAPI(orderNo);
if (res) {
- //@ts-ignore
if (WeixinJSBridge) {
- //@ts-ignore
WeixinJSBridge.invoke(
'getBrandWCPayRequest',
{
diff --git a/packages/components/src/utils/env.ts b/packages/components/src/utils/env.ts
index 7b51f4e..b660941 100644
--- a/packages/components/src/utils/env.ts
+++ b/packages/components/src/utils/env.ts
@@ -1,11 +1,4 @@
-type NODE_ENV = 'development' | 'production';
-
-export const env = process.env.NODE_ENV as NODE_ENV;
-
-export const OSSBaseURL =
- env === 'development'
- ? 'https://waterdroptest2.oss-cn-hangzhou.aliyuncs.com/'
- : 'https://parkmanagement.oss-cn-hangzhou.aliyuncs.com/';
+export const OSSBaseURL = OSS_URL;
export const combineURLs = (baseURL: string, relativeURL: string) => {
return relativeURL
diff --git a/packages/components/types/global.d.ts b/packages/components/types/global.d.ts
index b2ecf73..01439b8 100644
--- a/packages/components/types/global.d.ts
+++ b/packages/components/types/global.d.ts
@@ -17,3 +17,7 @@
const componentOptions: ComponentOptions
export default componentOptions
}
+
+
+declare const OSS_URL: string
+declare const WeixinJSBridge: any
\ No newline at end of file
diff --git a/packages/components/vite.config.ts b/packages/components/vite.config.ts
index 5d5ee98..16ea1f7 100644
--- a/packages/components/vite.config.ts
+++ b/packages/components/vite.config.ts
@@ -21,7 +21,7 @@
},
},
define: {
- 'process.env.NODE_ENV': JSON.stringify('production'),
+ OSS_URL: '"https://parkmanagement.oss-cn-hangzhou.aliyuncs.com"',
},
plugins: [
vue(),
diff --git a/packages/constants/oss.ts b/packages/constants/oss.ts
index 449953b..6cbd926 100644
--- a/packages/constants/oss.ts
+++ b/packages/constants/oss.ts
@@ -1,4 +1,4 @@
-export const OSSBaseURL = process.env.OSS_URL;
+export const OSSBaseURL = OSS_URL;
const _basicPath = 'life-payment/MiniApp/';
export const OssResource = _basicPath + 'Resource/';
diff --git a/tsconfig.base.json b/tsconfig.base.json
index adc7638..ce4b581 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -19,5 +19,6 @@
"incremental": true,
"jsxImportSource": "vue"
},
- "compileOnSave": false
+ "compileOnSave": false,
+ "include": ["types/*.d.ts"]
}
--
Gitblit v1.9.1