From 287d63930c74a63146b1c1a44009f5ed81965105 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 27 十月 2025 17:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
pages/ActivityPopup/ActivityPopup.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pages/ActivityPopup/ActivityPopup.vue b/pages/ActivityPopup/ActivityPopup.vue
index ab6db3a..aea94a1 100644
--- a/pages/ActivityPopup/ActivityPopup.vue
+++ b/pages/ActivityPopup/ActivityPopup.vue
@@ -76,6 +76,7 @@
<script>
import {getPopupAcitivty,hideActivityPopupToday} from '@/api/popup.js'
+import storage from "../../utils/storage";
export default {
name: 'ActivityPopup',
props: {
@@ -140,7 +141,7 @@
},
watch: {
show(newVal) {
- console.log("寮圭獥鐩戝惉鍙樺寲",newVal)
+ console.log("寮圭獥鐩戝惉鍙樺寲",newVal)
if (newVal) {
// 寮圭獥鏄剧ず鏃堕噸鏂拌幏鍙栧鍣ㄥ搴﹀苟璁＄畻鍥剧墖灏哄
this.$nextTick(() => {
@@ -275,16 +276,16 @@
// 鍏抽棴寮圭獥
onClose() {
console.log("鐐瑰嚮鍏抽棴鎸夐挳")
- this.hideActivityPopupToday();
+ // this.hideActivityPopupToday();
this.$emit('close');
},
- hideActivityPopupToday(){
- //寮圭獥鍏抽棴
- console.log("淇敼浠婃棩涓嶆樉绀哄脊绐�")
- hideActivityPopupToday().then(res =>{
-
- })
- },
+ // hideActivityPopupToday(){
+ // //寮圭獥鍏抽棴
+ // console.log("淇敼浠婃棩涓嶆樉绀哄脊绐�")
+ // hideActivityPopupToday().then(res =>{
+ //
+ // })
+ // },
// 鐐瑰嚮閬僵灞傚叧闂�
onMaskClick() {
console.log("鐐瑰嚮閬僵灞傚叧闂�")
--
Gitblit v1.8.0