Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
jmal 2023-04-13 18:05:41 +08:00
commit 9698aa2bc0
3 changed files with 3 additions and 3 deletions

View File

@ -56,7 +56,7 @@
<el-image v-if="grid || grid === 'details'" :style="{'height':details?'110px':(gridWidth-35) + 'px'}" <el-image v-if="grid || grid === 'details'" :style="{'height':details?'110px':(gridWidth-35) + 'px'}"
fit="contain" :src="item.fileId ? (imageUrl+item.fileId) : (imageUrl+item.id)"> fit="contain" :src="item.fileId ? (imageUrl+item.fileId) : (imageUrl+item.id)">
<div slot="error" class="image-slot"> <div slot="error" class="image-slot">
<svg-icon icon-class="loading-image-error"/> <svg-icon icon-class="image"/>
</div> </div>
</el-image> </el-image>

View File

@ -76,7 +76,7 @@ export default {
if (!shareToken) { if (!shareToken) {
shareToken = "none" shareToken = "none"
} }
return window.location.origin + `${this.baseUrl}/public/s/downloadfileId=${file.id}&shareId=${shareId}&shareToken=${shareToken}` return window.location.origin + `${this.baseUrl}/public/s/download?fileId=${file.id}&shareId=${shareId}&shareToken=${shareToken}`
}, },
// 共享文件打包下载Url // 共享文件打包下载Url
publicPackageDownloadUrl: function(shareId, fileIds, shareToken) { publicPackageDownloadUrl: function(shareId, fileIds, shareToken) {

View File

@ -1159,7 +1159,7 @@ export default {
} }
.share-icon-font > > > .svg-icon { .share-icon-font > > > .svg-icon {
font-size: 8rem; font-size: 7.6rem;
} }
} }