Merge remote-tracking branch 'origin/master'

ui/smarttrade-platform/src/components/addMarketing.vue

@@ -633,7 +633,7 @@
                     下一步 <i class="fas fa-arrow-right"></i>
                 </button>
                 <button v-else class="btn btn-primary" @click="createCampaign">
-                    <i class="fas fa-rocket"></i> {{ isEditMode ? "编辑活动" : "创建活动" }}
+                    <i class="fas fa-rocket"></i> {{ isEditMode ? "保存活动" : "创建活动" }}
                 </button>
             </div>
         </div>

ui/smarttrade-platform/src/components/marketing/marketingDetail.vue

@@ -213,7 +213,7 @@
       </div>
     </div>
 
-    <AddMarketing ref="addMarketingRef" @refresh="getData(selectedCampaign.id)" />
+    <AddMarketing ref="addMarketingRef" @refresh="refresh" />
 </template>
 
 <script setup>
@@ -226,6 +226,8 @@
     const getPriorityLabel = (priority) => ({ 1: '紧急', 2: '高优先', 3: '中等', 4: '低优先' }[priority] || priority)
     const formatNumber = (n) => n >= 1000 ? (n / 1000).toFixed(1) + 'K' : n.toLocaleString()
 
+    const emits = defineEmits(['refresh'])
+
     const showCampaignDetailModal = ref(false)
     const selectedCampaign = ref()
     const sopDetails = ref([])
@@ -254,6 +256,11 @@
         addMarketingRef.value.open(campaign)
     }
 
+    const refresh = () => {
+      getData(selectedCampaign.value.id)
+      emits('refresh')
+    }
+
     defineExpose({
         open
     })

ui/smarttrade-platform/src/views/MarketingView.vue

@@ -144,7 +144,7 @@
     <div v-else class="no-data">暂无数据</div>
 
     <!-- Campaign Detail Modal -->
-    <MarketingDetail ref="marketingDetailRef" />
+    <MarketingDetail ref="marketingDetailRef" @refresh="getData()" />
 
     <!-- All Interactions Modal -->
     <div v-if="showInteractionsModal" class="modal-overlay" @click.self="showInteractionsModal = false">