Merge branch 'main' into secondStage

# Conflicts:
#	src/views/dashboard/Analysis.vue
#	src/views/dashboard/modules/FriendLinkCard.vue
#	src/views/dashboard/modules/QuickEnterCard.vue
#	src/views/dashboard/modules/SearchAndWarningCard.vue
#	src/views/dashboard/modules/ToDoTaskCard.vue
This commit is contained in:
赵霄
2023-11-28 09:54:08 +08:00
18 changed files with 18 additions and 18 deletions
+1 -1
View File
@@ -203,7 +203,7 @@ export function getFileAccessHttpUrl (avatar, subStr) {
} else {
if (avatar && avatar.length > 0 && avatar.indexOf('[') === -1) {
const token = Vue.ls.get(ACCESS_TOKEN)
return window._CONFIG.staticDomainURL + '/' + avatar + '?token=' + token
return window._CONFIG.domianURL + '/sys/common/view' + '/' + avatar + '?token=' + token
}
}
} catch (err) {