diff --git a/dist.zip b/dist.zip index 8fd3999..f67436a 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/dist07-28.zip b/dist07-28.zip deleted file mode 100644 index cd89f81..0000000 Binary files a/dist07-28.zip and /dev/null differ diff --git a/src/api/index.ts b/src/api/index.ts index e6836e1..1dfce33 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -89,7 +89,6 @@ class RequestHttp { // 可以在这里更新用户的 token 信息 const userStore = useUserStore(); userStore.setToken(authorization); - console.log("123232323"); return data; } diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 94ef1fe..c3a6d8d 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -177,7 +177,7 @@ const currentEditingTabsRef = ref(null); const props = defineProps({ content: { type: String, default: "" }, readOnly: { type: Boolean, default: false }, - fileSizeLimit: { type: Number, default: 10 } + fileSizeLimit: { type: Number, default: 5 } }); // 主编辑器内容双向绑定 @@ -456,13 +456,14 @@ const handleVideoUpload = async evt => { const file = evt.target.files[0]; // 1. 校验视频文件 - const maxSize = props.fileSizeLimit * 1024 * 1024 * 15; + const maxSize = 150 * 1024 * 1024; if (file.size > maxSize) { ElNotification({ title: "文件过大", - message: `视频大小不能超过 ${props.fileSizeLimit}MB`, + message: `视频大小不能超过 ${150}MB`, type: "warning" }); + evt.target.value = ""; return; } diff --git a/src/components/Upload/UploadVideo.vue b/src/components/Upload/UploadVideo.vue index 9a0419c..60972e5 100644 --- a/src/components/Upload/UploadVideo.vue +++ b/src/components/Upload/UploadVideo.vue @@ -53,7 +53,7 @@ const videoShowUrl = ref(null); const props = withDefaults(defineProps(), { videoUrl: "", disabled: false, - fileSize: 200, + fileSize: 150, width: "400px", fileType: () => [".mp4", ".avi", ".mov", "video/mp4", "video/mov", "video/avi"], borderRadius: "8px" diff --git a/src/layouts/components/Header/components/Avatar.vue b/src/layouts/components/Header/components/Avatar.vue index a06528d..2e236d5 100644 --- a/src/layouts/components/Header/components/Avatar.vue +++ b/src/layouts/components/Header/components/Avatar.vue @@ -46,13 +46,13 @@ import { ElMessageBox } from "element-plus"; import { outLogin } from "@/utils/outLogin"; import { useKeepAliveStore } from "@/stores/modules/keepAlive"; import { getLanguageListApi, getLanguageCutoverApi } from "@/api/modules/global"; -// import { HOME_URL } from "@/config"; -// import { useRouter } from "vue-router"; +import { HOME_URL } from "@/config"; +import { useRouter } from "vue-router"; import { useTabsStore } from "@/stores/modules/tabs"; const tabStore = useTabsStore(); const userStore = useUserStore(); -// const router = useRouter(); +const router = useRouter(); const keepAliveStore = useKeepAliveStore(); document.cookie = `lang=zh_cn`; const langs = ref([]); @@ -80,9 +80,19 @@ const getLanguageCutover = async (id: any, type: any) => { }); name.value = names[0]?.country_name; if (type === "click") { - tabStore.closeMultipleTab("/admin/index"); + tabStore.setTabs([ + { + icon: "", + title: "首页", + path: "/admin/index", + name: "home", + close: true + } + ]); keepAliveStore.setKeepAliveName(); - router.push(HOME_URL); + setTimeout(() => { + router.push(HOME_URL); + }, 500); } } }; @@ -97,14 +107,6 @@ const handleCommand = (val: string) => { type: "warning" }).then(async () => { await getLanguageCutover(val, "click"); - // // // 1. 退出登录 - // // const result: any = await logoutApi(); - // // if (result?.code === 0) { - // // getLanguageCutover(val); - // // // outLogin(); - // // } else { - // // useMsg("error", result.message); - // // } }); }; diff --git a/src/layouts/components/Tabs/components/MoreButton.vue b/src/layouts/components/Tabs/components/MoreButton.vue index 3d4ef0b..caa18b9 100644 --- a/src/layouts/components/Tabs/components/MoreButton.vue +++ b/src/layouts/components/Tabs/components/MoreButton.vue @@ -86,9 +86,23 @@ const closeOtherTab = () => { // Close All const closeAllTab = () => { - tabStore.closeMultipleTab(); + tabStore.setTabs([ + { + icon: "", + title: "首页", + path: "/admin/index", + name: "home", + close: true + } + ]); keepAliveStore.setKeepAliveName(); - router.push(HOME_URL); + setTimeout(() => { + router.push(HOME_URL); + }, 500); + + // tabStore.closeMultipleTab(); + // keepAliveStore.setKeepAliveName(); + // router.push(HOME_URL); }; diff --git a/src/layouts/components/Tabs/index.vue b/src/layouts/components/Tabs/index.vue index a875b84..5b47dd9 100644 --- a/src/layouts/components/Tabs/index.vue +++ b/src/layouts/components/Tabs/index.vue @@ -45,7 +45,7 @@ const keepAliveStore = useKeepAliveStore(); const tabsMenuValue = ref(route.fullPath); const tabsMenuList = computed(() => tabStore.tabsMenuList); - +console.log(tabStore.tabsMenuList, "===============value================"); onMounted(() => { tabsDrop(); initTabs();