diff --git a/open-isle-cli/src/App.vue b/open-isle-cli/src/App.vue
index 89aeb5dac..4e3c7abf3 100644
--- a/open-isle-cli/src/App.vue
+++ b/open-isle-cli/src/App.vue
@@ -1,5 +1,12 @@
 <template>
   <div id="app">
+    <Popup
+      v-if="showPopup"
+      :icon="popupInfo.icon"
+      :message="popupInfo.message"
+      :link="popupInfo.link"
+      @close="showPopup = false"
+    />
     <HeaderComponent
       @toggle-menu="menuVisible = !menuVisible"
       :show-menu-btn="!hideMenu"
@@ -20,17 +27,45 @@
 <script>
 import HeaderComponent from './components/HeaderComponent.vue'
 import MenuComponent from './components/MenuComponent.vue'
+import Popup from './components/Popup.vue'
+import { API_BASE_URL } from './main'
 
 export default {
   name: 'App',
-  components: { HeaderComponent, MenuComponent },
+  components: { HeaderComponent, MenuComponent, Popup },
   data() {
-    return { menuVisible: window.innerWidth > 768 }
+    return {
+      menuVisible: window.innerWidth > 768,
+      showPopup: false,
+      popupInfo: {}
+    }
   },
   computed: {
     hideMenu() {
       return ['/login', '/signup', '/404', '/signup-reason', '/github-callback', '/twitter-callback', '/discord-callback', '/forgot-password'].includes(this.$route.path)
     }
+  },
+  async mounted() {
+    try {
+      const res = await fetch(`${API_BASE_URL}/api/activities`)
+      if (!res.ok) return
+      const activities = await res.json()
+      const act = activities.find(a => !a.ended && a.type === 'MILK_TEA')
+      if (act) {
+        const key = `activity-popup-${act.id}`
+        if (!localStorage.getItem(key)) {
+          this.popupInfo = {
+            icon: act.icon || 'fas fa-gift',
+            message: `${act.title} 正在进行中，点击前往活动页面`,
+            link: '/activities'
+          }
+          this.showPopup = true
+          localStorage.setItem(key, 'shown')
+        }
+      }
+    } catch (e) {
+      // ignore errors
+    }
   }
 }
 </script>
diff --git a/open-isle-cli/src/components/Popup.vue b/open-isle-cli/src/components/Popup.vue
new file mode 100644
index 000000000..7632706dc
--- /dev/null
+++ b/open-isle-cli/src/components/Popup.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="popup" v-if="visible">
+    <div class="popup-overlay" @click="close"></div>
+    <div class="popup-container">
+      <template v-if="icon">
+        <img v-if="isImage(icon)" :src="icon" class="popup-icon-img" />
+        <i v-else :class="['popup-icon', icon]"></i>
+      </template>
+      <div class="popup-message">{{ message }}</div>
+      <div class="popup-actions">
+        <div class="popup-button" @click="confirm">{{ buttonText }}</div>
+        <div class="popup-close" @click="close">{{ closeText }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { useRouter } from 'vue-router'
+
+export default {
+  name: 'BasePopup',
+  props: {
+    visible: { type: Boolean, default: false },
+    icon: { type: String, default: '' },
+    message: { type: String, default: '' },
+    buttonText: { type: String, default: '前往' },
+    closeText: { type: String, default: '关闭' },
+    link: { type: String, default: '' }
+  },
+  emits: ['close'],
+  setup (props, { emit }) {
+    const router = useRouter()
+    const close = () => emit('close')
+    const confirm = () => {
+      if (props.link) router.push(props.link)
+      close()
+    }
+    const isImage = (i) => i.startsWith('http') || i.startsWith('data:image') || i.match(/\.(png|jpe?g|gif|svg)$/)
+    return { close, confirm, isImage }
+  }
+}
+</script>
+
+<style scoped>
+.popup {
+  position: fixed;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 30;
+}
+
+.popup-overlay {
+  position: absolute;
+  inset: 0;
+  backdrop-filter: blur(4px);
+  -webkit-backdrop-filter: blur(4px);
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.popup-container {
+  position: relative;
+  z-index: 2;
+  background: var(--background-color);
+  padding: 20px 30px;
+  border-radius: 10px;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  align-items: center;
+  max-width: 80%;
+}
+
+.popup-icon {
+  font-size: 48px;
+  color: var(--primary-color);
+}
+
+.popup-icon-img {
+  width: 64px;
+  height: 64px;
+  border-radius: 50%;
+  object-fit: cover;
+}
+
+.popup-button {
+  background-color: var(--primary-color);
+  color: #fff;
+  padding: 6px 20px;
+  border-radius: 6px;
+  cursor: pointer;
+}
+.popup-button:hover {
+  background-color: var(--primary-color-hover);
+}
+
+.popup-close {
+  margin-top: 5px;
+  font-size: 12px;
+  color: var(--primary-color);
+  cursor: pointer;
+}
+.popup-close:hover {
+  text-decoration: underline;
+}
+</style>
+