Merge branch 'master' into dev-v1.1.1

wupengfei

2025-09-26 57bb5bba0d7cafbf1ed1099820c75b5839291a0b

Merge branch 'master' into dev-v1.1.1

 .eslintrc-auto-import.json

@@ -1,5 +1,6 @@
{
  "globals": {
    "AlipayExpandindirectSceneList": true,
    "AppLocalConfig": true,
    "AppType": true,
    "AreaType": true,

 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']>

 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`,
];

 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 });
  },