Merge remote-tracking branch 'origin/master'

ui/smarttrade-platform/src/components/layout/TopBar.vue

@@ -632,12 +632,13 @@
 
 <script setup>
 import { ref, computed, onMounted } from 'vue'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import AddMarketing from '../addMarketing.vue'
 import { getNoReadCount, getMessageList, updateRead, updateReadAll, listPageBuUserSet } from '@/api/layout'
 import moment from 'moment'
 
 const route = useRoute()
+const router = useRouter()
 const showQuickActions = ref(false)
 const showNotifications = ref(false)
 const showHelp = ref(false)
@@ -855,7 +856,8 @@ const getIconColor = (type) => {
 
 const handleNotificationClick = (notification) => {
   setRead(notification)
-  selectedNotification.value = notification
+  // selectedNotification.value = notification
+  window.open(notification.callbackUrl, '_blank')
   // if(notification.callbackUrl){
   //     window.open(item.callbackUrl, '_blank')
   // }