diff --git a/.env.development b/.env.development index 103a9dce..138b6142 100644 --- a/.env.development +++ b/.env.development @@ -16,7 +16,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # 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..1b3872d1 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 });