提交一下调整

This commit is contained in:
daihh
2022-12-17 15:29:48 +08:00
parent 96b6f06596
commit 284de8043f
3 changed files with 74 additions and 39 deletions

View File

@@ -1,10 +1,10 @@
import ajax from '@/utils/xajax.js' import ajax from '@/utils/xajax.js'
const list=function (query){ const userList=function (){
return ajax.post('/xboe/m/popup/list',query); return ajax.get('/xboe/m/popup/user');
} }
export default { export default {
list userList
} }

View File

@@ -1,5 +1,6 @@
<template> <template>
<!--弹出窗口设置--> <!--弹出窗口设置-->
<div>
<div> <div>
<el-dialog :close-on-press-escape="false" :close-on-click-modal="false" class="medalbox" :visible.sync="showGonggao" :append-to-body="true" > <el-dialog :close-on-press-escape="false" :close-on-click-modal="false" class="medalbox" :visible.sync="showGonggao" :append-to-body="true" >
<div class="dlg-box" :style="`width:${config.width};height:${config.height}; background: url(${webBaseUrl}/images/gonggao/${config.bgImage}.png) no-repeat;`"> <div class="dlg-box" :style="`width:${config.width};height:${config.height}; background: url(${webBaseUrl}/images/gonggao/${config.bgImage}.png) no-repeat;`">
@@ -13,9 +14,10 @@
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</div>
</template> </template>
<script> <script>
import apiPopup from '@/api/modules/popup.js';
export default{ export default{
props:{ props:{
config: { config: {
@@ -42,33 +44,66 @@
data() { data() {
return { return {
showGonggao:false, showGonggao:false,
popupList:[],//需要弹出的窗口
sessionKey:'alertpopup', sessionKey:'alertpopup',
}; };
}, },
mounted() { mounted() {
let loadNum = localStorage.getItem(this.sessionKey); //获取用户需要弱出的窗口信息,放在状态中
let hasFlag = sessionStorage.getItem(this.sessionKey); let has = sessionStorage.getItem(this.sessionKey);
let $this=this; if(!has){
if(!hasFlag){ apiPopup.userList().then(rs=>{
let times=0; if(rs.status==200){
if(loadNum){ this.popupList=rs.result;
times=Number(loadNum); if(rs.result.length>0){
sessionStorage.setItem(this.sessionKey,JSON.stringify(rs.result));
this.countPopup();
}else{
sessionStorage.setItem(this.sessionKey,'[]');
} }
if(times<3){
let now=new Date();
let min=new Date(2022,10,9,0,0,0);
let max=new Date(2022,11,1,0,0,0);
//console.log(now,min,max);
//console.log(now.getTime(),min.getTime(),max.getTime());
if(now.getTime()>min.getTime() && now.getTime()<max.getTime()){
//console.log('open')
this.showGonggao=true;
times++;
localStorage.setItem(this.sessionKey,times);
sessionStorage.setItem(this.sessionKey,1);
} }
});
}else{
this.popupList=JSON.parse(has);
this.countPopup();
} }
// let loadNum = localStorage.getItem(this.sessionKey);
// let hasFlag = sessionStorage.getItem(this.sessionKey);
// let $this=this;
// if(!hasFlag){
// let times=0;
// if(loadNum){
// times=Number(loadNum);
// }
// if(times<3){
// let now=new Date();
// let min=new Date(2022,10,9,0,0,0);
// let max=new Date(2022,11,1,0,0,0);
// //console.log(now,min,max);
// //console.log(now.getTime(),min.getTime(),max.getTime());
// if(now.getTime()>min.getTime() && now.getTime()<max.getTime()){
// //console.log('open')
// this.showGonggao=true;
// times++;
// localStorage.setItem(this.sessionKey,times);
// sessionStorage.setItem(this.sessionKey,1);
// }
// }
// }
},
methods:{
countPopup(){
let newLogin = localStorage.getItem(this.$xpage.constants.newLoginKey);
this.popupList.forEach(item=>{
if(item.loginEd && newLogin && newLogin==1){
}
})
} }
} }
} }

View File

@@ -181,7 +181,7 @@ export default {
this.sex = this.userInfo.sex; this.sex = this.userInfo.sex;
this.$store.dispatch('refrashMsg'); this.$store.dispatch('refrashMsg');
this.loadBoeData(); this.loadBoeData();
this.loadPopupConfig(); //this.loadPopupConfig();
}, },
methods: { methods: {
loadPopupConfig(){ loadPopupConfig(){