From 57f5bb94d818edfc797d1c7476b3ee7d0748e980 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 15 四月 2025 10:47:16 +0800
Subject: [PATCH] fix: bug
---
src/services/api/typings.d.ts | 20 +++++++++++++++-----
src/views/Reward/RewardDeclareDetail.vue | 4 +---
src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue | 1 -
pnpm-lock.yaml | 20 ++++++++++----------
src/views/MaterialReview/MaterialReviewAudit.vue | 4 +---
5 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 317e4c6..e6973ab 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,13 +21,13 @@
version: 1.0.3(@bole-12333/chat-kit@1.0.1)(@tiptap/core@2.11.7)(@tiptap/extension-document@2.11.7)(@tiptap/extension-image@2.11.7)(@tiptap/extension-mention@2.11.7)(@tiptap/extension-paragraph@2.11.7)(@tiptap/extension-placeholder@2.11.7)(@tiptap/extension-text@2.11.7)(@tiptap/pm@2.11.7)(@tiptap/suggestion@2.11.7)(dayjs@1.11.13)(vue@3.5.11)
'@bole-core/components':
specifier: ^1.3.8
- version: 1.3.8(@bole-core/core@1.0.2)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@13.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11)
+ version: 1.3.9(@bole-core/core@1.0.3)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@13.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11)
'@bole-core/core':
specifier: latest
- version: 1.0.2(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
+ version: 1.0.3(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
'@bole-core/pretty-layout':
specifier: latest
- version: 1.2.0(@bole-core/core@1.0.2)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11)
+ version: 1.2.0(@bole-core/core@1.0.3)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11)
'@bole-core/sass-utils':
specifier: latest
version: 0.0.1(element-plus@2.9.7)
@@ -1562,8 +1562,8 @@
vue: 3.5.11(typescript@4.9.5)
dev: false
- /@bole-core/components@1.3.8(@bole-core/core@1.0.2)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@13.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11):
- resolution: {integrity: sha512-lpzYXCKgZbdu+BDFv5j6KjgHI1DCb/N3Ctcp7Hivh5eACO9J+AaDngWo94uzsf3X7Hb8rdqrQTZ7vef9xPxXag==}
+ /@bole-core/components@1.3.9(@bole-core/core@1.0.3)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@13.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11):
+ resolution: {integrity: sha512-9lCPb9fKp0fUnC6YzMaGxDXiqcgYLMg/TuLNFOuClW1uuggEQfNPQxwSdWS4C/SynXuLVPPRArQUy08AheVNRw==}
peerDependencies:
'@bole-core/core': '*'
'@bole-core/sass-utils': '*'
@@ -1582,7 +1582,7 @@
vue: 3.5.11
vue-component-type-helpers: ^2.1.6
dependencies:
- '@bole-core/core': 1.0.2(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
+ '@bole-core/core': 1.0.3(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
'@bole-core/sass-utils': 0.0.1(element-plus@2.9.7)
'@element-plus/icons-vue': 2.3.1(vue@3.5.11)
'@tanstack/vue-query': 4.37.1(vue@3.5.11)
@@ -1600,8 +1600,8 @@
vue-component-type-helpers: 2.2.8
dev: false
- /@bole-core/core@1.0.2(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5):
- resolution: {integrity: sha512-v5XqgmuaFe1l5tBe9CHytW8UhqI8rh2m8R2J7F2F46XZy5wh7vGfiHshuaooTbfK6ex9A06jcepIWwDOklLs+A==}
+ /@bole-core/core@1.0.3(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5):
+ resolution: {integrity: sha512-nqcu2gcKN2+raP8N0uhstWUPVYvQ8jbDpbki+cczy7WqYhrVDulV4b+u1J/tcnTCxDYG+uRMNLucCMUo6WWHrA==}
peerDependencies:
'@ywwlmm/openapi': '*'
ali-oss: '*'
@@ -1632,7 +1632,7 @@
xlsx-style: 0.8.13(patch_hash=6ixwdxwh5a3amidwu6vee22jpi)
dev: false
- /@bole-core/pretty-layout@1.2.0(@bole-core/core@1.0.2)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11):
+ /@bole-core/pretty-layout@1.2.0(@bole-core/core@1.0.3)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11):
resolution: {integrity: sha512-LvneMdMfGj6dpFR7voQd2F+v02P4zYHGP3BAWKcrTj8BMeWXRt08Sz7qBrhq1F8lidjqi7TCttQbx2cEV1qBEA==}
peerDependencies:
'@bole-core/core': '*'
@@ -1648,7 +1648,7 @@
vue: 3.5.11
vue-router: '*'
dependencies:
- '@bole-core/core': 1.0.2(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
+ '@bole-core/core': 1.0.3(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
'@bole-core/sass-utils': 0.0.1(element-plus@2.9.7)
'@element-plus/icons-vue': 2.3.1(vue@3.5.11)
'@vueuse/core': 11.1.0(vue@3.5.11)
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 0baf8f4..7548f5e 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -4493,7 +4493,7 @@
description?: string;
parkCustomersCount?: ParkCustomersCountTypeEnum;
/** 鎴愮珛骞翠唤 */
- setUpDate: number;
+ setUpDate?: number;
serveSetting?: string[];
workOfType?: string[];
parkStyle?: ParkStyleDto[];
@@ -7968,6 +7968,7 @@
}
interface GetParkBountyTradeDetailOutput {
+ id?: string;
/** 鏈�杩戝嚭璐﹂噾棰� */
tradeAmount?: number;
/** 鍑鸿处鍑瘉 */
@@ -8001,6 +8002,7 @@
}
interface GetParkBountyTradeOutput {
+ enterpriseId?: string;
/** 璐﹀彿 */
userName?: string;
/** 浼佷笟鍚嶇О */
@@ -8054,7 +8056,8 @@
payDateTime?: string;
/** 娑堣垂閲戦 */
amount?: number;
- payType?: EnterpriseBountyPayTypeEnum;
+ /** 娑堣垂绫诲瀷 */
+ payRemark?: string;
/** 濂栧姳閲戜綑棰� */
remianAmount?: number;
/** 鍑瘉 */
@@ -8076,7 +8079,7 @@
settleTime?: string;
/** 鍏ヨ处鏃堕棿 */
incomeTime?: string;
- incomeStatus?: IncomeStatusEnum;
+ incomeStatus?: TransferToStatusEnum;
/** 鍙戞斁閲戦 */
applySumAmount?: number;
/** 鍏ヨ处鍑瘉 */
@@ -8135,6 +8138,10 @@
licenseIsVerify?: boolean;
/** 浼佷笟淇℃伅鏄惁宸插畬鍠� */
enterpriseIsVerify?: boolean;
+ bankName?: string;
+ bankBranchName?: string;
+ bankCardNumber?: string;
+ bankIsVerify?: boolean;
/** 鐢虫姤娆℃暟 */
applyCount?: number;
/** 鏈�杩戠敵鎶� */
@@ -14292,6 +14299,7 @@
interface ParkBountyApplyDetailInfo {
parkBountyApplyId?: string;
+ parkBountyApplyDetailId?: string;
enterpriseId?: string;
userName?: string;
/** 浼佷笟鍚嶇О */
@@ -14364,13 +14372,13 @@
enterRelateUrl?: string;
/** C绔釜绋庡畬绋庢儏鍐佃鏄� */
personTaxRatePayUrl?: string;
- /** 浼佷笟绫诲瀷 10浜哄姏璧勬簮鍏徃 20鐢叉柟浼佷笟 30琛屼笟閰嶅 40琛屼笟鏈烘瀯 */
- type?: number;
+ authType?: EnterpriseTypeEnum;
transferToStatus?: TransferToStatusEnum;
/** 鍏ヨ处閲戦 */
transferToAmount?: number;
/** 鍏ヨ处鏃堕棿 */
transferToTime?: string;
+ parkBountyApplyDetailId?: string;
/** 鍏ヨ处鍑瘉 */
transferToFileUrl?: string;
}
@@ -16584,6 +16592,8 @@
licenseIsVerify?: boolean;
/** 浼佷笟淇℃伅鏄惁宸插畬鍠� */
enterpriseIsVerify?: boolean;
+ /** 閾惰璐︽埛鏄惁瀹屽杽 */
+ bankIsVerify?: boolean;
/** 鎵�灞炲洯鍖� */
industrialParkId?: string;
/** 鏈�杩戠敵鎶ュ紑濮嬫棩鏈� */
diff --git a/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue b/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue
index afef034..5766fec 100644
--- a/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue
+++ b/src/views/EnterpriseInfo/components/RewardConsumeRecordView.vue
@@ -103,7 +103,6 @@
payDateTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
amount: { type: 'money' },
remianAmount: { type: 'money' },
- payType: { type: 'enum', valueEnum: EnterpriseBountyPayTypeEnumText },
},
}
);
diff --git a/src/views/MaterialReview/MaterialReviewAudit.vue b/src/views/MaterialReview/MaterialReviewAudit.vue
index c13c80d..a48ba49 100644
--- a/src/views/MaterialReview/MaterialReviewAudit.vue
+++ b/src/views/MaterialReview/MaterialReviewAudit.vue
@@ -164,10 +164,8 @@
columnsRenderProps: {
authType: { type: 'enum', valueEnum: EnterpriseTypeText },
licenseUrl: {
- type: 'url',
+ type: 'urlV2',
formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl),
- modal: true,
- showDownloadBtn: false,
},
},
}
diff --git a/src/views/Reward/RewardDeclareDetail.vue b/src/views/Reward/RewardDeclareDetail.vue
index 43e85bb..5c3463e 100644
--- a/src/views/Reward/RewardDeclareDetail.vue
+++ b/src/views/Reward/RewardDeclareDetail.vue
@@ -126,10 +126,8 @@
columnsRenderProps: {
authType: { type: 'enum', valueEnum: EnterpriseTypeText },
licenseUrl: {
- type: 'url',
+ type: 'urlV2',
formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl),
- modal: true,
- showDownloadBtn: true,
},
},
}
--
Gitblit v1.9.1