From d7908397decf600c26c1828a01a2486c6e3263ca Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 19 八月 2025 14:59:39 +0800
Subject: [PATCH] fix: bug
---
packages/components/src/Calendar/Calendar.vue | 27 ++++++++++++++++++++-------
packages/components/src/Avatar/Avatar.vue | 10 +++++++++-
packages/hooks/task.ts | 2 +-
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/packages/components/src/Avatar/Avatar.vue b/packages/components/src/Avatar/Avatar.vue
index eb688a1..7cca849 100644
--- a/packages/components/src/Avatar/Avatar.vue
+++ b/packages/components/src/Avatar/Avatar.vue
@@ -1,6 +1,7 @@
<template>
<nut-avatar class="pro-avatar">
- <img :class="['avatar-img', imgClass]" :src="_src" />
+ <!-- <img :class="['avatar-img', imgClass]" :src="_src" /> -->
+ <div class="avatar-img-div" :style="{ backgroundImage: `url(${_src})` }"></div>
</nut-avatar>
</template>
@@ -32,4 +33,11 @@
.pro-avatar {
overflow: hidden;
}
+
+.avatar-img-div {
+ width: 100%;
+ height: 100%;
+ background-size: cover;
+ background-position: center;
+}
</style>
diff --git a/packages/components/src/Calendar/Calendar.vue b/packages/components/src/Calendar/Calendar.vue
index 8a6df76..bb1db00 100644
--- a/packages/components/src/Calendar/Calendar.vue
+++ b/packages/components/src/Calendar/Calendar.vue
@@ -1,11 +1,8 @@
<template>
<div class="bole-calendar-wrapper">
- <div :class="['bole-calendar-inner', { isCollapse }]">
- <nut-calendar-card
- v-model="model"
- class="bole-calendar"
- ></nut-calendar-card>
- </div>
+ <scroll-view :enhanced="true" :scroll-y="true" :class="['bole-calendar-inner', { isCollapse }]">
+ <nut-calendar-card v-model="model" class="bole-calendar"></nut-calendar-card>
+ </scroll-view>
<div :class="['bole-calendar-arrow', { active: !isCollapse }]" @click="toggle">
<DownArrow :size="12" :class="['bole-calendar-arrow-icon']" />
</div>
@@ -14,8 +11,9 @@
<script setup lang="ts">
import { DownArrow } from '@nutui/icons-vue-taro';
+import Taro from '@tarojs/taro';
import { useToggle } from 'senin-mini/hooks';
-import { ref, watch } from 'vue';
+import { onMounted, ref, watch } from 'vue';
defineOptions({
name: 'Calendar',
@@ -27,6 +25,21 @@
const model = defineModel<Date | Date[]>();
const { isCollapse, toggle } = useToggle(true);
+
+onMounted(() => {
+ const query = Taro.createSelectorQuery();
+ query.select('.nut-calendarcard-day.current.active').boundingClientRect();
+ query.select('.bole-calendar-inner').boundingClientRect();
+ query.select('.bole-calendar-inner').node();
+ query.exec(function (res) {
+ const calendarWindowHeight = res[1].height + res[1].top;
+ const currentDayWindowHeight = res[0].height + res[0].top;
+ if (currentDayWindowHeight > calendarWindowHeight) {
+ const scrollView = res[2].node;
+ scrollView?.scrollIntoView?.('.nut-calendarcard-day.current.active');
+ }
+ });
+});
</script>
<style lang="scss">
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index 8257f5f..2397387 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -73,7 +73,7 @@
page: pageParam,
orderInput: [
queryState.orderType === HomeOrderType.Recommend && {
- property: 'recommendStatus',
+ property: 'recommendTime',
order: EnumPagedListOrder.Desc,
},
{ property: 'createdTime', order: EnumPagedListOrder.Desc },
--
Gitblit v1.9.1