From 57bb5bba0d7cafbf1ed1099820c75b5839291a0b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 26 九月 2025 11:08:31 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1.1
---
.eslintrc-auto-import.json | 1 +
auto-imports.d.ts | 2 ++
src/constants/enterpriseWallet.ts | 9 +++++++++
src/views/TraceIdLogManage/TraceIdLogManageList.vue | 4 ++--
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 651a1ab..e20962f 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -1,5 +1,6 @@
{
"globals": {
+ "AlipayExpandindirectSceneList": true,
"AppLocalConfig": true,
"AppType": true,
"AreaType": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index f51352d..3399137 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -6,6 +6,7 @@
// biome-ignore lint: disable
export {}
declare global {
+ const AlipayExpandindirectSceneList: typeof import('./src/constants/enterpriseWallet')['AlipayExpandindirectSceneList']
const AppLocalConfig: typeof import('./src/constants/app')['AppLocalConfig']
const AppType: typeof import('./src/constants/app')['AppType']
const AreaType: typeof import('./src/constants/enum')['AreaType']
@@ -315,6 +316,7 @@
declare module 'vue' {
interface GlobalComponents {}
interface ComponentCustomProperties {
+ readonly AlipayExpandindirectSceneList: UnwrapRef<typeof import('./src/constants/enterpriseWallet')['AlipayExpandindirectSceneList']>
readonly AppLocalConfig: UnwrapRef<typeof import('./src/constants/app')['AppLocalConfig']>
readonly AppType: UnwrapRef<typeof import('./src/constants/app')['AppType']>
readonly AreaType: UnwrapRef<typeof import('./src/constants/enum')['AreaType']>
diff --git a/src/constants/enterpriseWallet.ts b/src/constants/enterpriseWallet.ts
index bb4247c..338f3b7 100644
--- a/src/constants/enterpriseWallet.ts
+++ b/src/constants/enterpriseWallet.ts
@@ -1,4 +1,5 @@
import { EnumEnterpriseWalletExpandindirectOrderScene } from './apiEnum';
+import { TempFolderPath } from './enum';
export const EnumEnterpriseWalletExpandindirectOrderSceneText = {
[EnumEnterpriseWalletExpandindirectOrderScene.XIANJIN_YINGXIAO]: '鐜伴噾钀ラ攢',
@@ -11,3 +12,11 @@
[EnumEnterpriseWalletExpandindirectOrderScene.GONGYI_BUZHU]: '鍏泭琛ュ姪',
[EnumEnterpriseWalletExpandindirectOrderScene.ZHUANZHANG_QITA]: '鍏朵粬鍦烘櫙',
};
+
+export const AlipayExpandindirectSceneList = [
+ `${TempFolderPath}/alipayExpandindirectScene/scene1.jpg`,
+ `${TempFolderPath}/alipayExpandindirectScene/scene2.png`,
+ `${TempFolderPath}/alipayExpandindirectScene/scene3.png`,
+ `${TempFolderPath}/alipayExpandindirectScene/scene4.png`,
+ `${TempFolderPath}/alipayExpandindirectScene/scene5.png`,
+];
diff --git a/src/views/TraceIdLogManage/TraceIdLogManageList.vue b/src/views/TraceIdLogManage/TraceIdLogManageList.vue
index 6083990..c8c9390 100644
--- a/src/views/TraceIdLogManage/TraceIdLogManageList.vue
+++ b/src/views/TraceIdLogManage/TraceIdLogManageList.vue
@@ -8,7 +8,7 @@
v-model="state.traceId"
style="width: 260px"
placeholder="traceID"
- @on-click-search="refetch"
+ @on-click-search="refetch()"
>
</SearchInput>
</QueryFilterItem>
@@ -67,7 +67,7 @@
data: detail,
refetch,
} = useQuery({
- queryKey: ['logRecordsServices/getTraceIdLog', state.traceId],
+ queryKey: ['logRecordsServices/getTraceIdLog', state],
queryFn: async () => {
return await logRecordsServices.getTraceIdLog({ traceId: state.traceId });
},
--
Gitblit v1.9.1