From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/components/myUpload/index.vue | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/components/myUpload/index.vue b/src/components/myUpload/index.vue
index ee70d8f..cae960e 100644
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@@ -3,12 +3,15 @@
<div v-if="pictureList.length > 0" class="image-box">
<div v-for="image in pictureList" :class="{ 'image-box-item': true, 'image-box-item-cover': isShowUpload }">
<span v-if="isShowUpload" @click="handleDeletePicture(image)" class="image-delete-icon el-icon-delete"></span>
- <el-image :key="image" class="image-content" :src="image"></el-image>
+ <el-image :key="image" class="image-content" :src="image" :preview-src-list="[image]"></el-image>
</div>
</div>
<el-upload
v-if="isShowUpload && pictureList.length < limit"
:file-list="fileList"
+ v-loading="loading"
+ element-loading-spinner="el-icon-loading"
+ element-loading-background="rgba(0, 0, 0, 0.8)"
action=""
:multiple="multiple"
:show-file-list="flag"
@@ -79,18 +82,12 @@
.then(({ url1, url2, url3, url4 }) => {
const url = url1 ?? url2 ?? url3 ?? url4;
this.$emit('setPictureUrl', { url: url });
+ this.loading = false;
})
.catch(err => {
+ this.loading = false;
this.$message.error(err);
})
- },
- // 鑾峰彇token
- getToken() {
- const token = sessionStorage.getItem("token");
- const tokenHead = sessionStorage.getItem("tokenHead");
- if (token && tokenHead) {
- return { Authorization: tokenHead + token };
- }
},
handleDeletePicture(imageUrl) {
--
Gitblit v1.8.0