Merge branch 'wsw' into 'master'

# Conflicts:
#   conflict src/api/jyh/index.ts
#   conflict src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue
This commit is contained in:
yfzmpj
2025-03-19 12:09:50 +08:00
13 changed files with 199 additions and 71 deletions

View File

@@ -56,7 +56,7 @@ const handleFileUpload = async (event) => {
const file = event.target.files[0]; // 获取选择的文件
if (file) {
// 检查文件类型
if (file.type === 'text/xml' || file.name.endsWith('.xml')) {
if (file.type === 'text/xml' || file.name.endsWith('.xml') || file.name.endsWith('.xlsx')) {
loading.value = true; // 显示加载状态
try {
await props.onFileUpload(file); // 调用父组件传递的上传方法

View File

@@ -24,7 +24,7 @@ const getCounts = () => {
};
onMounted(() => {
getCounts();
// getCounts();
addEventListener('updateNotice', debounce((count: number) => {
counts.value = count;
}, 500));