diff --git a/src/stores/springFestival.js b/src/stores/springFestival.js index 6bbc29f..3e699df 100644 --- a/src/stores/springFestival.js +++ b/src/stores/springFestival.js @@ -36,6 +36,8 @@ export const useSpringFestival = defineStore('springFestival', { receiveRecordShow: false, receiveRecord: [], // 领取抽奖券记录 + taskListShow: false, + helpShow: false, // 帮助展示 }), actions: {}, diff --git a/src/views/Activities/SpringFestival/Task.vue b/src/views/Activities/SpringFestival/Task.vue index ce008ef..851fbb4 100644 --- a/src/views/Activities/SpringFestival/Task.vue +++ b/src/views/Activities/SpringFestival/Task.vue @@ -87,7 +87,7 @@
Remaining lottery tickets: {{ tickets }}
-
How to get a ticket
+
How to get a ticket
@@ -672,6 +672,8 @@ const { receiveRecordShow, receiveRecord, // 领取抽奖券记录 + taskListShow, // 任务列表展示 + helpShow, // 帮助展示 } = storeToRefs(springFestivalStore) @@ -865,6 +867,11 @@ const getDrawRecords = async () => { } } +// 打开任务列表 +const showTaskList = () => { + taskListShow.value = true +} + // 前往搜索代理页 const searchPayee = () => { router.push({ diff --git a/src/views/Activities/SpringFestival/index.vue b/src/views/Activities/SpringFestival/index.vue index d7ecf82..7adcace 100644 --- a/src/views/Activities/SpringFestival/index.vue +++ b/src/views/Activities/SpringFestival/index.vue @@ -473,6 +473,14 @@ + + + - - -
-
-
- {{ t('not_enough_pieces') }} -
-
-
@@ -595,6 +577,8 @@ const { receiveRecordShow, receiveRecord, // 领取抽奖券记录 + taskListShow, // 任务列表展示 + helpShow, // 帮助展示 } = storeToRefs(springFestivalStore) @@ -737,11 +721,24 @@ const resultShowIndex = ref(0) // 抽奖结果索引 // 遮罩层 const maskLayerShow = computed(() => { - return resultShow.value || drawRecordShow.value || receiveRecordShow.value || helpShow.value + return ( + resultShow.value || + drawRecordShow.value || + receiveRecordShow.value || + taskListShow.value || + helpShow.value + ) }) + // 居中弹窗 const centerPopupShow = computed(() => { - return resultShow.value || drawRecordShow.value || receiveRecordShow.value || helpShow.value + return ( + resultShow.value || + drawRecordShow.value || + receiveRecordShow.value || + taskListShow.value || + helpShow.value + ) }) // 打开遮罩层 @@ -760,9 +757,13 @@ const showPopup = (type) => { receiveRecordShow.value = true break case 'help': - cancelSend() // 取消发送 + closedPopup() // 关闭弹窗 helpShow.value = true break + case 'taskList': + closedPopup() // 关闭弹窗 + taskListShow.value = true + break default: closedPopup() // 关闭弹窗 @@ -775,6 +776,7 @@ const closedPopup = () => { resultShow.value = false drawRecordShow.value = false receiveRecordShow.value = false + taskListShow.value = false helpShow.value = false }