diff --git a/src/assets/logo.png b/src/assets/logo.png index 84023e9..c92dbdd 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts index f0b0da2..efab43d 100644 --- a/src/stores/themeConfig.ts +++ b/src/stores/themeConfig.ts @@ -151,7 +151,7 @@ export const useThemeConfig = defineStore('themeConfig', { // 默认全局组件大小,可选值"",默认 'large' globalComponentSize: 'large', // 网站logo - logoMini: '@/assets/logo.png', + logoMini: '', }, }), actions: { diff --git a/src/views/article/content.vue b/src/views/article/content.vue index 3a3febb..cc46f69 100644 --- a/src/views/article/content.vue +++ b/src/views/article/content.vue @@ -35,6 +35,7 @@ const getArticleDetailById = async(id:number) => { let res = await artApi.getArticleDetail(id); if(res?.success) { state.data = res.data; + if(res.data.title) document.title = res.data.title; } } catch (error) { ElMessage.error('获取文章详情失败'); diff --git a/src/views/photos/index.vue b/src/views/photos/index.vue index f6ee4ce..ca9b368 100644 --- a/src/views/photos/index.vue +++ b/src/views/photos/index.vue @@ -300,7 +300,6 @@ const getTableData = async() => { } } catch (error) { } finally { - state.tableData.param.moduleName = ''; state.tableData.loading = false; } }; @@ -328,9 +327,11 @@ const jpgFormatter = (row: any) => { // } else { // newPath = row.path.replaceAll('\\\\', '/') // } - newPath = newPath.includes('://')?newPath : newPath; - - return `${newPath}`; + // newPath = newPath?.includes('://')?newPath : newPath; + if(!newPath) return; + let index = newPath?.indexOf('?'); + return newPath?.includes('://') ? newPath.substring(0,(!index||index===-1) ? newPath.length : index) : encodeURI(newPath.startsWith('/') ? newPath : ('/'+newPath)); + // return `${newPath}`; } // 日期格式化 @@ -382,7 +383,7 @@ const getPhotoDetail = async (id: number) => { if (res?.success) { state.formData.fileList.push({ url: jpgFormatter(res) }); Object.assign(state.formData, res.data); - state.formData.path = res.data.path; + state.formData.path = res.data?.path; uploadDisabled.value = true; state.formData.loading = false; } else { diff --git a/src/views/service/recommend/index.vue b/src/views/service/recommend/index.vue index a70cade..64cdab3 100644 --- a/src/views/service/recommend/index.vue +++ b/src/views/service/recommend/index.vue @@ -44,6 +44,7 @@ +