From 2096ac6f7379d75001b610c2de1fa380abd09519 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 16:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/components/upload/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/admin-web/src/components/upload/index.vue b/admin-web/src/components/upload/index.vue
index f54212b..ae445bd 100644
--- a/admin-web/src/components/upload/index.vue
+++ b/admin-web/src/components/upload/index.vue
@@ -44,7 +44,7 @@
<img
v-if="checkImg(src.name)"
class="v-img"
- :src="src.url"
+ :src="getUrl(src.path)"
:alt="src.name"
style="width: 100px;height: 100px;"
>
@@ -54,9 +54,9 @@
</template>
<script>
-import { getToken } from '@/utils/auth'
-import { sessionToken } from '@/settings'
-import { getDownUrl } from '@/utils/base'
+import {getToken} from '@/utils/auth'
+import {sessionToken} from '@/settings'
+import {getDownUrl} from '@/utils/base'
import Viewer from 'viewerjs'
import 'viewerjs/dist/viewer.css'
@@ -85,12 +85,13 @@
title: '闄勪欢涓婁紶',
max: 100, // 鏈�澶уぇ灏忥紝鍗曚綅M
num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
- accept: '.jpg,.jpeg,.png,.bmp,.pdf,.doc,.docx,.xls,.xlsx,.apk,.zip', // 闄愬埗鏍煎紡
+ // accept: '.jpg,.jpeg,.png,.pdf,.doc,.docx,.xls,.xlsx', // 闄愬埗鏍煎紡
+ accept: '.jpg,.jpeg,.png,.webp,.bmp', // 闄愬埗鏍煎紡
tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
uploadUrl: '', // 涓婁紶璺緞
multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
disabled: false, // 鏄惁绂佺敤
- type: 'text' // text/picture
+ type: 'picture' // text/picture
}
}
},
--
Gitblit v1.9.1