Merge remote-tracking branch 'origin/main' into gitee

This commit is contained in:
xiaoxian521 2024-01-16 00:50:22 +08:00
commit dd647eb3b2
3 changed files with 30 additions and 2 deletions

View File

@ -1,9 +1,9 @@
import "./circled.css"; import "./circled.css";
import Cropper from "cropperjs"; import Cropper from "cropperjs";
import { useTippy } from "vue-tippy";
import { ElUpload } from "element-plus"; import { ElUpload } from "element-plus";
import type { CSSProperties } from "vue"; import type { CSSProperties } from "vue";
import { longpress } from "@/directives/longpress"; import { longpress } from "@/directives/longpress";
import { useTippy, directive as tippy } from "vue-tippy";
import { import {
ref, ref,
unref, unref,
@ -236,6 +236,7 @@ export default defineComponent({
const menuContent = defineComponent({ const menuContent = defineComponent({
directives: { directives: {
tippy,
longpress longpress
}, },
setup() { setup() {

View File

@ -196,6 +196,13 @@ const layoutHeader = defineComponent({
</div> </div>
<!-- 系统设置 --> <!-- 系统设置 -->
<setting /> <setting />
<a
target="_blank"
href="https://www.bilibili.com/video/BV1He411m7Qs/"
class="absolute top-[53px] right-[50px] text-lg z-[9999] cursor-pointer review"
>
回顾2023
</a>
</div> </div>
</template> </template>
@ -230,4 +237,24 @@ const layoutHeader = defineComponent({
.re-screen { .re-screen {
margin-top: 12px; margin-top: 12px;
} }
@keyframes pulse {
0%,
100% {
transform: scale(1);
}
50% {
transform: scale(1.3);
}
}
.review {
font-size: 18px;
animation: pulse 2s 3;
&:hover {
opacity: 0.75;
}
}
</style> </style>

View File

@ -186,7 +186,7 @@ function addDanmu() {
</div> </div>
</el-card> </el-card>
</template> </template>
<style lang="scss"> <style lang="scss" scoped>
.demo { .demo {
flex: 1; flex: 1;
height: 600px; height: 600px;