Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-09-06 21:10:44 +08:00

View File

@@ -9,12 +9,12 @@
</n-statistic>
</n-card> -->
<n-card ml-10 w-200 rounded-5>
<n-statistic label="总豆子" tabular-nums>
<n-statistic label="用户豆子(留存)" tabular-nums>
<n-number-animation :from="0" :to="cardData.pulse" />
</n-statistic>
</n-card>
<n-card ml-10 w-200 rounded-5>
<n-statistic label="用户赢(积分)" tabular-nums>
<n-statistic label="用户积分(留存)" tabular-nums>
<n-number-animation :from="0" :to="cardData.win" />
</n-statistic>
</n-card>
@@ -162,12 +162,8 @@
<script setup>
import api from './api'
import {
// NDropdown,
NButton,
NEllipsis,
} from 'naive-ui'
// import TheIcon from '@/components/icon/TheIcon.vue'
import { NDropdown, NButton, NEllipsis } from 'naive-ui'
import TheIcon from '@/components/icon/TheIcon.vue'
const loading = ref(false)
@@ -252,65 +248,65 @@ const columns = ref([
sorter: true,
sortOrder: false,
},
{
title: '赢积分',
align: 'center',
key: 'win',
sorter: true,
sortOrder: false,
},
{
title: '用户豆子',
align: 'center',
key: 'pulse',
sorter: true,
sortOrder: false,
},
// {
// title: '操作',
// title: '赢积分',
// align: 'center',
// slot: 'action',
// render(row) {
// return [
// h(
// NDropdown,
// {
// trigger: 'click',
// options: [
// {
// label: '用户详情',
// key: 1,
// },
// ],
// onSelect: (key) => {
// switch (key) {
// case 1:
// openDrawer(row)
// break
// }
// },
// key: 'win',
// sorter: true,
// sortOrder: false,
// },
// {
// default: () =>
// h(
// NButton,
// {
// text: true,
// iconPlacement: 'right',
// },
// {
// default: () => '更多',
// icon: () =>
// h(TheIcon, {
// icon: 'ant-design:down-outlined',
// }),
// }
// ),
// }
// ),
// ]
// },
// title: '用户豆子',
// align: 'center',
// key: 'pulse',
// sorter: true,
// sortOrder: false,
// },
{
title: '操作',
align: 'center',
slot: 'action',
render(row) {
return [
h(
NDropdown,
{
trigger: 'click',
options: [
{
label: '用户详情',
key: 1,
},
],
onSelect: (key) => {
switch (key) {
case 1:
openDrawer(row)
break
}
},
},
{
default: () =>
h(
NButton,
{
text: true,
iconPlacement: 'right',
},
{
default: () => '更多',
icon: () =>
h(TheIcon, {
icon: 'ant-design:down-outlined',
}),
}
),
}
),
]
},
},
])
const data = ref([])