From c4ec3df6de18c72b9b9cdb177effb7a2053283c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 25 Nov 2025 14:13:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9pk=E7=9A=84=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E9=80=89=E6=8B=A9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/components/points-and-badge/check-in.vue | 2 ++ .../selection-institutions/index.vue | 11 ++++++- .../selection-institutions/treeSelector.vue | 13 +++----- src/pages/competition/matching.vue | 32 ++++++++----------- src/pages/pointsRedemption/index.vue | 3 +- 6 files changed, 33 insertions(+), 30 deletions(-) diff --git a/.env.development b/.env.development index ea92cff2..8fffb5bf 100644 --- a/.env.development +++ b/.env.development @@ -32,4 +32,4 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' \ No newline at end of file +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' \ No newline at end of file diff --git a/src/components/points-and-badge/check-in.vue b/src/components/points-and-badge/check-in.vue index 0bd0b94d..4e52663d 100644 --- a/src/components/points-and-badge/check-in.vue +++ b/src/components/points-and-badge/check-in.vue @@ -234,6 +234,7 @@ text-align: center; // 隐藏展开时超过30天的样式 &.hide.expand { + .calendar-day-title { width: 70rpx; color: #fff; @@ -367,6 +368,7 @@ display: flex; flex-direction: column; height: 130rpx; + // overflow: hidden; transition: height 0.3s ease; &.expand { height: 650rpx; diff --git a/src/components/selection-institutions/index.vue b/src/components/selection-institutions/index.vue index 77a1c5dd..64a51500 100644 --- a/src/components/selection-institutions/index.vue +++ b/src/components/selection-institutions/index.vue @@ -114,8 +114,17 @@ }); const emit = defineEmits(['submit']); + const open = (status, inPaths) => { + console.log('传入的数据', inPaths); + if (Array.isArray(inPaths) && inPaths.length > 0) { + selectedPaths.value = inPaths; + } else { + selectedPaths.value = [{ orgName: '全部', orgId: 'A', parentId: '' }]; + } + openDialog(true); + }; defineExpose({ - open: () => openDialog(true), + open, close: () => openDialog(false) }); diff --git a/src/components/selection-institutions/treeSelector.vue b/src/components/selection-institutions/treeSelector.vue index ef10a915..2e65b6fb 100644 --- a/src/components/selection-institutions/treeSelector.vue +++ b/src/components/selection-institutions/treeSelector.vue @@ -1,6 +1,6 @@