From 575040f1c374812edcd40c19eb2887412c04280e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 2 Dec 2025 12:18:50 +0800 Subject: [PATCH 1/2] x --- .env.development | 4 ++-- src/components/points-and-badge/check-in.vue | 24 ++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index 54851017..a46809fc 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' @@ -16,7 +16,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://192.168.108.129' # dev -# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' diff --git a/src/components/points-and-badge/check-in.vue b/src/components/points-and-badge/check-in.vue index d573a771..de3823cf 100644 --- a/src/components/points-and-badge/check-in.vue +++ b/src/components/points-and-badge/check-in.vue @@ -133,7 +133,9 @@ checkInLoading.value = false; isSigned.value = true; continuousDay.value = days; + generate() // 签到完重新计算日历样式 checkInSuccessCallback(true, days, res.body.points, res.body.pointsBadges); + }, failCb: (res) => { checkInLoading.value = false; @@ -214,15 +216,8 @@ return groupedList; } - - const open = (isSignedStatus, days, onCheckInClick = () => {}, onCheckInSuccess = () => {}) => { - isSigned.value = isSignedStatus; // 今日签到状态 - continuousDay.value = days; // 连续签到 - // isSigned.value = false; // 今日签到状态 - // continuousDay.value = 30; // 连续签到 - checkInClickCallback = onCheckInClick; - checkInSuccessCallback = onCheckInSuccess; - // 示例：X=10时，以"10天前"为第1天，生成35天列表 + // 计算日历显示的日子 + const generate = () => { try { const subtractNum = isSigned.value ? 1 : 0; const X = Math.max(continuousDay30.value - subtractNum, 0); @@ -231,6 +226,17 @@ } catch (err) { console.error(err.message); } + } + const open = (isSignedStatus, days, onCheckInClick = () => {}, onCheckInSuccess = () => {}) => { + isSigned.value = isSignedStatus; // 今日签到状态 + continuousDay.value = days; // 连续签到 + isSigned.value = false; // 今日签到状态 + continuousDay.value = 30; // 连续签到 + checkInClickCallback = onCheckInClick; + checkInSuccessCallback = onCheckInSuccess; + // 示例：X=10时，以"10天前"为第1天，生成35天列表 + generate() + popup.value.open(); }; defineExpose({ open, close }); From df3f948d549625b2bb14e9a615daca926f3094d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 2 Dec 2025 12:19:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B630=E5=A4=A9=E7=AD=BE=E5=88=B0=E5=90=8E?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E6=97=A5=E6=9C=9F=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/points-and-badge/check-in.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/points-and-badge/check-in.vue b/src/components/points-and-badge/check-in.vue index de3823cf..1b3872d1 100644 --- a/src/components/points-and-badge/check-in.vue +++ b/src/components/points-and-badge/check-in.vue @@ -230,8 +230,8 @@ const open = (isSignedStatus, days, onCheckInClick = () => {}, onCheckInSuccess = () => {}) => { isSigned.value = isSignedStatus; // 今日签到状态 continuousDay.value = days; // 连续签到 - isSigned.value = false; // 今日签到状态 - continuousDay.value = 30; // 连续签到 + // isSigned.value = false; // 今日签到状态 + // continuousDay.value = 30; // 连续签到 checkInClickCallback = onCheckInClick; checkInSuccessCallback = onCheckInSuccess; // 示例：X=10时，以"10天前"为第1天，生成35天列表