diff --git a/src/views/modules/volunteer/mall/category.vue b/src/views/modules/volunteer/mall/category.vue
index 8728dcb27..a0bb79e6f 100644
--- a/src/views/modules/volunteer/mall/category.vue
+++ b/src/views/modules/volunteer/mall/category.vue
@@ -26,46 +26,53 @@ export default {
created() {
// 此处请求后端,获取一个ticket票据
http.get("/auth/sso/getTicket")
- .then(({data: res}) => {
- let ticket = res.data
- console.log('ticket:', ticket)
- this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/productCategory?target=_blank&ticket=" + ticket
- })
+ .then(({ data: res }) => {
+ let ticket = res.data;
+ console.log('ticket:', ticket);
+ this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/productCategory?ticket=" + ticket;
+ });
},
methods: {
// 监听 iframe 加载完成事件
onIframeLoad() {
- // 获取 iframe 的内容窗口
- const iframe = this.$refs.childIframe;
- const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+
+ if(this.iframeSrc==''){
+ return;
+ }
- if (iframeDocument) {
- const styleElement = iframeDocument.createElement('style');
- styleElement.type = 'text/css';
-
- const newStyles = `
- #app .main-container {
- margin-left: 0px !important;
- }
- #app .sidebar-container {
- display: none !important;
- }
- .navbar {
- display: none !important;
- }
- `;
-
- styleElement.appendChild(iframeDocument.createTextNode(newStyles));
-
- iframeDocument.head.appendChild(styleElement);
+ const iframe = this.$refs.childIframe;
+
+ if (this.iframeSrc.indexOf("ticket")!== -1) {
+ // 将 iframeSrc 设置为新的 URL(去掉了 ticket 参数)
+ this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/productCategory";
+ }else{
+ const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
- // 显示 iframe
- iframe.style.display = 'block';
+ if (iframeDocument) {
+ const styleElement = iframeDocument.createElement('style');
+ styleElement.type = 'text/css';
+
+ const newStyles = `
+ #app .main-container {
+ margin-left: 0px !important;
+ }
+ #app .sidebar-container {
+ display: none !important;
+ }
+ .navbar {
+ display: none !important;
+ }
+ `;
+
+ styleElement.appendChild(iframeDocument.createTextNode(newStyles));
+ iframeDocument.head.appendChild(styleElement);
+
+ // 显示 iframe
+ iframe.style.display = 'block';
+ }
}
+
}
}
};
-
-
diff --git a/src/views/modules/volunteer/mall/index.vue b/src/views/modules/volunteer/mall/index.vue
index 8ef16ac3d..76fe73744 100644
--- a/src/views/modules/volunteer/mall/index.vue
+++ b/src/views/modules/volunteer/mall/index.vue
@@ -26,46 +26,53 @@ export default {
created() {
// 此处请求后端,获取一个ticket票据
http.get("/auth/sso/getTicket")
- .then(({data: res}) => {
- let ticket = res.data
- console.log('ticket:', ticket)
- this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/product?target=_blank&ticket=" + ticket
- })
+ .then(({ data: res }) => {
+ let ticket = res.data;
+ console.log('ticket:', ticket);
+ this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/product?ticket=" + ticket;
+ });
},
methods: {
// 监听 iframe 加载完成事件
onIframeLoad() {
- // 获取 iframe 的内容窗口
- const iframe = this.$refs.childIframe;
- const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
+
+ if(this.iframeSrc==''){
+ return;
+ }
- if (iframeDocument) {
- const styleElement = iframeDocument.createElement('style');
- styleElement.type = 'text/css';
-
- const newStyles = `
- #app .main-container {
- margin-left: 0px !important;
- }
- #app .sidebar-container {
- display: none !important;
- }
- .navbar {
- display: none !important;
- }
- `;
-
- styleElement.appendChild(iframeDocument.createTextNode(newStyles));
-
- iframeDocument.head.appendChild(styleElement);
+ const iframe = this.$refs.childIframe;
+
+ if (this.iframeSrc.indexOf("ticket")!== -1) {
+ // 将 iframeSrc 设置为新的 URL(去掉了 ticket 参数)
+ this.iframeSrc = "../../../epmet-voluntary-mall-admin/pms/product";
+ }else{
+ const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
- // 显示 iframe
- iframe.style.display = 'block';
+ if (iframeDocument) {
+ const styleElement = iframeDocument.createElement('style');
+ styleElement.type = 'text/css';
+
+ const newStyles = `
+ #app .main-container {
+ margin-left: 0px !important;
+ }
+ #app .sidebar-container {
+ display: none !important;
+ }
+ .navbar {
+ display: none !important;
+ }
+ `;
+
+ styleElement.appendChild(iframeDocument.createTextNode(newStyles));
+ iframeDocument.head.appendChild(styleElement);
+
+ // 显示 iframe
+ iframe.style.display = 'block';
+ }
}
+
}
}
};
-
-