diff --git a/src/components/common/modal/ModalPanel.vue b/src/components/common/modal/ModalPanel.vue index 213a90b..12afecb 100644 --- a/src/components/common/modal/ModalPanel.vue +++ b/src/components/common/modal/ModalPanel.vue @@ -4,7 +4,7 @@ :visible="show_modal" :dialogClass="(className!==''?className:'')+ ' dialog-style'" :maskClosable="false" :width="width !== ''?width:'30%'" @cancel.stop="optionClick($event,'cancel')" :zIndex="modalZIndex" :bodyStyle="{maxHeight:'calc(95vh - 33px)',overflow:'auto'}" - + :class="{'party-dialog-style':isPartyCenter}" > @@ -79,20 +79,32 @@ callback: null, width: this.modalWidth, className: this.modalClassName, - modalZIndex: this.zIndex + modalZIndex: this.zIndex, + isPartyCenter: false, } }, + watch: { + $route: { + handler(val, oldval){ + if (val.path === '/partyCenter/party') { + this.isPartyCenter = true + } else { + this.isPartyCenter = false + } + }, + }, + }, computed: { childDom: function () { return this.dom_url === "" ? null : () => import(`@/${this.dom_url}`); } }, mounted() { + this.getHref() if (this.addChildType === 'event') { this.$bus.on(EventConfig.MODAL_SHOW, this.showModal); this.$bus.on(EventConfig.MODAL_CLOSE, this.closeModal); } - }, beforeDestroy(){ if (this.addChildType === 'event') { @@ -101,6 +113,14 @@ } }, methods: { + getHref(){ + this.href = window.location.hash + if (this.href === '#/partyCenter/party') { + this.isPartyCenter = true + } else { + this.isPartyCenter = false + } + }, showModal: function (arys) { this.title = arys[0].title; this.dom_url = arys[0].dom_url; @@ -145,6 +165,11 @@ }, modalClassName: function (newData) { this.className = newData; + }, + $route(val, oldval){ + if (val.path === '/partyCenter/party') { + + } } } } @@ -160,36 +185,53 @@ border: 1px solid #31a8fa; box-shadow: 0 4px 12px rgba(49, 168, 250, 0.5); background: #01123E; - .ant-modal-header { - padding: 36px 24px !important; - background: #01123E; + } + .ant-modal-header { + padding: 36px 24px !important; + background: #01123E; + color: #fff; + border-bottom: 1px solid #1067B0; + .ant-modal-title { + line-height: 2rem !important; + font-size: 1.6rem !important; color: #fff; - border-bottom: 1px solid #1067B0; - .ant-modal-title { - line-height: 2rem !important; - font-size: 1.6rem !important; - color: #fff; - } } - .ant-modal-close-x { - height: 2rem !important; - width: 2rem !important; - line-height: 2rem !important; - .anticon { - color: #fff !important; - font-size: 2.5rem !important; - position: absolute !important; - top: 13px !important; - right: 20px !important; - } + } + .ant-modal-close-x { + height: 2rem !important; + width: 2rem !important; + line-height: 2rem !important; + .anticon { + color: #fff !important; + font-size: 2.5rem !important; + position: absolute !important; + top: 13px !important; + right: 20px !important; } - .ok-style { - position: absolute; - font-size: 1rem; - color: #31a8fa; - top: 0.5rem; - right: 2rem; - cursor: pointer; + } + .ok-style { + position: absolute; + font-size: 1rem; + color: #31a8fa; + top: 0.5rem; + right: 2rem; + cursor: pointer; + } + } + + .party-dialog-style { + /deep/ .dialog-style { + .ant-modal-content { + border: 1px solid #FFFE00 !important; + box-shadow: 0 4px 12px rgba(178, 34, 34, 0.5) !important; + background: #961E03 !important; + .ant-modal-header { + background: #961E03 !important; + border-bottom: 1px solid #FFFE00 !important; + } + .info-content-style { + background: none !important; + } } } } diff --git a/src/views/screenAdaptation/assets/images/home/partyBuildSlideBgImg.png b/src/views/screenAdaptation/assets/images/home/partyBuildSlideBgImg.png index a94f6df..618cec1 100644 Binary files a/src/views/screenAdaptation/assets/images/home/partyBuildSlideBgImg.png and b/src/views/screenAdaptation/assets/images/home/partyBuildSlideBgImg.png differ diff --git a/src/views/screenAdaptation/common/commonInfo.vue b/src/views/screenAdaptation/common/commonInfo.vue index a95e6ba..688d0a2 100644 --- a/src/views/screenAdaptation/common/commonInfo.vue +++ b/src/views/screenAdaptation/common/commonInfo.vue @@ -23,7 +23,8 @@
- + + @@ -77,6 +78,7 @@ contentHtml: this.$props.infoObj && this.$props.infoObj.content ? this.$props.infoObj.content : "", // uploadPerson:"", // contentHtml:"", + isPartyCenter: false, } }, watch: { @@ -95,14 +97,32 @@ this.infoTitle = newData.title; this.infoArr = newData.infoArr; this.contentHtml = newData.content; - } + }, + $route: { + handler(val, oldval){ + if (val.path === '/partyCenter/party') { + this.isPartyCenter = true + } else { + this.isPartyCenter = false + } + }, + }, }, mounted(){ + this.getHref() // if (this.infoId && this.infoId !== "") { // this.getDataInfo(); // } }, methods: { + getHref(){ + this.href = window.location.hash + if (this.href === '#/partyCenter/party') { + this.isPartyCenter = true + } else { + this.isPartyCenter = false + } + }, //获取数据明细数据 getDataInfo: function () { if (!this.infoId || this.infoId === "") { diff --git a/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue b/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue index b94c5e2..faaf851 100644 --- a/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue +++ b/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue @@ -2,11 +2,12 @@