diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 674dcbd..718c033 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -2656,7 +2656,7 @@ export default {
isFolder: row.isFolder
}).then(res => {
if (res.data) {
- this.shareLink = 'http://' + window.location.host + '/s?s=' + res.data
+ this.shareLink = window.location.origin + '/s?s=' + res.data
this.generateShareLinkLoading = false
}
})
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 92f3eb5..a3375ae 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -671,6 +671,7 @@
.files-title {
margin-left: 3%;
font-size: 20px;
+ line-height: 3.5rem;
}
.operate {
flex: 1;
diff --git a/src/components/input/UploadImageInput.vue b/src/components/input/UploadImageInput.vue
index de6d01f..7e468fc 100644
--- a/src/components/input/UploadImageInput.vue
+++ b/src/components/input/UploadImageInput.vue
@@ -24,7 +24,7 @@
图片上传中{{uploadPercentage}}%
图片上传成功
-
该图片不支持自动上传,请下载后手动上传
+
该图片不支持自动上传
图片加载中
-
-
-
+
+
diff --git a/src/utils/number.js b/src/utils/number.js
index 4a7a4f9..0ab74ec 100644
--- a/src/utils/number.js
+++ b/src/utils/number.js
@@ -132,11 +132,11 @@ export function formatSize(size) {
} else if (size < 1024) {
return size + 'B'
} else if (size < 1024 * 1024) {
- return (size/1024).toFixed(2) + 'k'
+ return (size/1024).toFixed(1) + 'k'
} else if (size < 1024 * 1024 * 1024) {
- return (size/(1024 * 1024)).toFixed(2) + 'M'
+ return (size/(1024 * 1024)).toFixed(1) + 'M'
} else {
- return (size/(1024 * 1024 * 1024)).toFixed(2) + 'G'
+ return (size/(1024 * 1024 * 1024)).toFixed(1) + 'G'
}
}
@@ -146,14 +146,14 @@ export function formatSize(size) {
*/
export function formatNetSpeed(size) {
if (size === 0) {
- return '0 B/s'
+ return '0B/s'
} else if (size < 1024) {
- return size + ' B/s'
+ return size + 'B/s'
} else if (size < 1024 * 1024) {
- return (size/1024).toFixed(2) + ' KB/s'
+ return (size/1024).toFixed(2) + 'KB/s'
} else if (size < 1024 * 1024 * 1024) {
- return (size/(1024 * 1024)).toFixed(2) + ' MB/s'
+ return (size/(1024 * 1024)).toFixed(2) + 'MB/s'
} else {
- return (size/(1024 * 1024 * 1024)).toFixed(2) + ' GB/s'
+ return (size/(1024 * 1024 * 1024)).toFixed(2) + 'GB/s'
}
}
diff --git a/src/views/share/index.vue b/src/views/share/index.vue
index cdbf381..a6818a7 100644
--- a/src/views/share/index.vue
+++ b/src/views/share/index.vue
@@ -474,7 +474,7 @@
fileClick(row) {
this.shareDialog = true
this.shareFileName = row.fileName
- this.shareLink = 'http://'+window.location.host+'/s?s='+row.id
+ this.shareLink = window.location.origin+'/s?s='+row.id
this.generateShareLinkLoading = false
},
// 复制分享链接