diff --git a/src/assets/icons/cart.svg b/src/assets/icons/cart.svg deleted file mode 100644 index f531623..0000000 --- a/src/assets/icons/cart.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/icons/message.svg b/src/assets/icons/message.svg index c7ba231..993522a 100644 --- a/src/assets/icons/message.svg +++ b/src/assets/icons/message.svg @@ -1 +1 @@ - + diff --git a/src/assets/icons/money.svg b/src/assets/icons/money.svg index 84b4e0c..6547fe9 100644 --- a/src/assets/icons/money.svg +++ b/src/assets/icons/money.svg @@ -1 +1 @@ - + diff --git a/src/assets/icons/order.svg b/src/assets/icons/order.svg new file mode 100644 index 0000000..15c9fb1 --- /dev/null +++ b/src/assets/icons/order.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/project.svg b/src/assets/icons/project.svg new file mode 100644 index 0000000..19d016d --- /dev/null +++ b/src/assets/icons/project.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/todolist.svg b/src/assets/icons/todolist.svg new file mode 100644 index 0000000..3924839 --- /dev/null +++ b/src/assets/icons/todolist.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/visit.svg b/src/assets/icons/visit.svg index 76c5b82..cbdd63d 100644 --- a/src/assets/icons/visit.svg +++ b/src/assets/icons/visit.svg @@ -1 +1 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 986da7e..87e9213 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -15,11 +15,11 @@ const greetings = computed(() => { if (hours >= 6 && hours < 8) { return "晨起披衣出草堂，轩窗已自喜微凉🌅！"; } else if (hours >= 8 && hours < 12) { - return "上午好🌞！"; + return "上午好，" + useUserStore().user.nickname + "！"; } else if (hours >= 12 && hours < 18) { - return "下午好☕！"; + return "下午好，" + useUserStore().user.nickname + "！"; } else if (hours >= 18 && hours < 24) { - return "晚上好🌃！"; + return "晚上好，" + useUserStore().user.nickname + "！"; } else if (hours >= 0 && hours < 6) { return "偷偷向银河要了一把碎星，只等你闭上眼睛撒入你的梦中，晚安🌛！"; } @@ -27,7 +27,7 @@ const greetings = computed(() => { const duration = 5000; -// 收入金额 +// 销售额 const amount = ref(0); const amountOutput = useTransition(amount, { duration: duration, @@ -35,7 +35,7 @@ const amountOutput = useTransition(amount, { }); amount.value = 2000; -// 访问数 +// 访问量 const visitCount = ref(0); const visitCountOutput = useTransition(visitCount, { duration: duration, @@ -43,15 +43,15 @@ const visitCountOutput = useTransition(visitCount, { }); visitCount.value = 2000; -//消息数 -const messageCount = ref(0); -const messageCountOutput = useTransition(messageCount, { +// 留资数 +const dauCount = ref(0); +const dauCountOutput = useTransition(dauCount, { duration: duration, transition: TransitionPresets.easeOutExpo, }); -messageCount.value = 2000; +dauCount.value = 2000; -// 订单数 +// 订单量 const orderCount = ref(0); const orderCountOutput = useTransition(orderCount, { duration: duration, @@ -65,57 +65,64 @@ orderCount.value = 2000; - - - -
-
+ + + +
- - {{ userStore.user.nickname }} - +
+

{{ greetings }}

+

+ 今日天气晴朗，气温在15℃至25℃之间，东南风。 +

+
+ -
- {{ greetings }} -
+ +
+ + + -
- 💥官方从零到一文档 - - Gitee - - GitHub - + + + + + + + +
-
- - + + + - - + + @@ -131,24 +138,24 @@ orderCount.value = 2000; class="flex items-center justify-between mt-5 text-sm text-[var(--el-text-color-secondary)]" > 总访问数 - {{ Math.round(visitCountOutput) }} + {{ Math.round(visitCountOutput * 15) }}
- +
- {{ Math.round(messageCountOutput) }} + {{ Math.round(dauCountOutput) }}
@@ -156,21 +163,19 @@ orderCount.value = 2000;
- 总消息数 - {{ Math.round(messageCountOutput) }} + 总留资数 + {{ Math.round(dauCountOutput) }}
- - + + @@ -184,20 +189,19 @@ orderCount.value = 2000;
- 总收入金额 - {{ Math.round(amountOutput) }} + 总销售额 + {{ Math.round(amountOutput * 15) }}
- - - + + @@ -205,21 +209,21 @@ orderCount.value = 2000;
{{ Math.round(orderCountOutput) }}
- +
- 总订单数 - {{ Math.round(orderCountOutput) }} + 总订单量 + {{ Math.round(orderCountOutput * 15) }}
- + { "element-plus/es/components/date-picker/style/css", "element-plus/es/components/notification/style/css", "element-plus/es/components/image/style/css", + "element-plus/es/components/statistic/style/css", "@vueuse/core", "sortablejs", "path-to-regexp",