diff --git a/jero-web/src/components/jero/JImageUpload.vue b/jero-web/src/components/jero/JImageUpload.vue index d9915af8..352bd148 100644 --- a/jero-web/src/components/jero/JImageUpload.vue +++ b/jero-web/src/components/jero/JImageUpload.vue @@ -24,7 +24,12 @@ - +
+
+ +
+
+ @@ -32,7 +37,7 @@ import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' import { getFileAccessHttpUrl } from '@/api/manage' -import JImagePreviewModal from './modal/JImagePreviewModal' +// import JImagePreviewModal from './modal/JImagePreviewModal' // const Base64 = require('js-base64').Base64 const uidGenerator = () => { @@ -40,16 +45,18 @@ const uidGenerator = () => { } export default { name: 'JImageUpload', - components: { JImagePreviewModal }, + // components: { JImagePreviewModal }, data () { return { uploadAction: window._CONFIG.domianURL + '/sys/common/upload', uploadLoading: false, + image: false, picUrl: false, headers: {}, fileList: [], accept: 'image/png, image/jpeg', - previewImage: '' + previewImage: '', + imageUrl: null } }, props: { @@ -184,7 +191,12 @@ export default { // const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/${file.url}` // const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` // window.open(url) - this.$refs.JImagePreviewModal.open(file) + // this.$refs.JImagePreviewModal.open(file) + this.imageUrl = getFileAccessHttpUrl(file.name) + // 获取viewer实例 + const viewer = this.$el.querySelector('.image').$viewer + // 调用show方法进行显示预览图 + viewer.show() } }, getAvatarView () { diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index dcf0b9e5..35f6926a 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -36,7 +36,7 @@ - + 欢迎您,{{ nickname() }}