From c80299bdc03c6e5a390303fb50a7c618bba5ef3e Mon Sep 17 00:00:00 2001 From: "1960116313@qq.com" <1960116313@qq.com> Date: Sun, 21 Jan 2024 16:30:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 3 + src/components/AppRecharge/index.vue | 8 +- src/views/task/components/BasicTask/index.vue | 15 +- src/views/task/components/HisTory/index.ts | 5 + src/views/task/components/HisTory/index.vue | 257 ++++++++++++++++++ .../task/components/InviteForm/index.vue | 17 +- 7 files changed, 289 insertions(+), 17 deletions(-) create mode 100644 src/views/task/components/HisTory/index.ts create mode 100644 src/views/task/components/HisTory/index.vue diff --git a/package.json b/package.json index 692cfc6..c16f472 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "axios": "^1.6.5", "clipboard-copy": "^4.0.1", "crypto-js": "^4.2.0", + "dayjs": "^1.11.10", "lodash-es": "^4.17.21", "md-editor-v3": "^4.11.0", "mqtt": "^5.3.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f86dee7..e524664 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,6 +23,9 @@ dependencies: crypto-js: specifier: ^4.2.0 version: 4.2.0 + dayjs: + specifier: ^1.11.10 + version: 1.11.10 lodash-es: specifier: ^4.17.21 version: 4.17.21 diff --git a/src/components/AppRecharge/index.vue b/src/components/AppRecharge/index.vue index 23e091b..0fc6aa9 100644 --- a/src/components/AppRecharge/index.vue +++ b/src/components/AppRecharge/index.vue @@ -10,6 +10,8 @@ import { useRechargeStore } from '@/store/moules/rechareStore' const rechargeStore = useRechargeStore() const carouselRef = ref() +// 选项卡索引 +const activeTab = ref(0) function getType() { goodsType().then((res) => { console.log(res) @@ -19,6 +21,7 @@ getType() // 关闭充值弹窗 function handleClose() { rechargeStore.rechargeClose() + activeTab.value = 0 } // 选项卡目录 const tabs = ref([ @@ -28,8 +31,7 @@ const tabs = ref([ { title: '年套餐', active: false }, { title: '至尊礼遇卡', active: false }, ]) -// 选项卡索引 -const activeTab = ref(0) + const items = ref(['item1', 'item2', 'item3', 'item4', 'item5', 'item6', 'item7', 'item8']) // 选中选项卡 @@ -632,7 +634,7 @@ function onNextClick() { border-top-left-radius: 12px; border-top-right-radius: 12px; position: relative; - transition: all 0.3s ease; + transition: all 0.3s ease-out; } .tab:not(:last-child)::after { content: ''; diff --git a/src/views/task/components/BasicTask/index.vue b/src/views/task/components/BasicTask/index.vue index a1efe3f..8a2e1c1 100644 --- a/src/views/task/components/BasicTask/index.vue +++ b/src/views/task/components/BasicTask/index.vue @@ -1,7 +1,8 @@ + + + + diff --git a/src/views/task/components/InviteForm/index.vue b/src/views/task/components/InviteForm/index.vue index 675710b..edd3a4d 100644 --- a/src/views/task/components/InviteForm/index.vue +++ b/src/views/task/components/InviteForm/index.vue @@ -38,13 +38,9 @@ function copyText() { message.success({ content: () => '复制成功', class: 'message-class', + }) - // 复制成功后的操作 }) - // .catch(() => { - // console.log('Failed to copy!') - // // 复制失败后的操作 - // }) } @@ -88,9 +84,13 @@ function copyText() {