From 284de8043ffc33f5fb5714f5831df76827be7789 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Sat, 17 Dec 2022 15:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=B8=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/popup.js        |   6 +-
 src/components/AlertPopup.vue   | 105 +++++++++++++++++++++-----------
 src/components/PortalHeader.vue |   2 +-
 3 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/src/api/modules/popup.js b/src/api/modules/popup.js
index f06fbf46..6047d17a 100644
--- a/src/api/modules/popup.js
+++ b/src/api/modules/popup.js
@@ -1,10 +1,10 @@
 
 import ajax from '@/utils/xajax.js'
 
-const list=function (query){
-  return ajax.post('/xboe/m/popup/list',query);
+const userList=function (){
+  return ajax.get('/xboe/m/popup/user');
 }
 
 export default {
-  list
+  userList
 }
diff --git a/src/components/AlertPopup.vue b/src/components/AlertPopup.vue
index c3bfb8de..f4ea360e 100644
--- a/src/components/AlertPopup.vue
+++ b/src/components/AlertPopup.vue
@@ -1,21 +1,23 @@
 <template>
   <!--弹出窗口设置-->
   <div>
-    <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;`">
-            <span class="dlg-close" @click="showGonggao = false"><i style="font-size: 28px;color: #999;" class="el-icon-close"></i></span>
-            <div style="text-align:left;">
-              <div class="dlg-title" v-html="config.title"></div>
-              <div class="dlg-content" v-html="config.content"></div>
-            </div>
-            <div v-if="config.btnText"><a :href="config.pcUrl" @click="showGonggao = false" target="_blank" :style="{'background-color':config.btnColor}" class="dlg-button">{{config.btnText}}</a> </div>
-            <div v-if="config.author" style="text-align: right;padding-top: 20px;"><span>{{config.author}}</span> </div>
-        </div>
-    </el-dialog>
+    <div>
+      <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;`">
+              <span class="dlg-close" @click="showGonggao = false"><i style="font-size: 28px;color: #999;" class="el-icon-close"></i></span>
+              <div style="text-align:left;">
+                <div class="dlg-title" v-html="config.title"></div>
+                <div class="dlg-content" v-html="config.content"></div>
+              </div>
+              <div v-if="config.btnText"><a :href="config.pcUrl" @click="showGonggao = false" target="_blank" :style="{'background-color':config.btnColor}" class="dlg-button">{{config.btnText}}</a> </div>
+              <div v-if="config.author" style="text-align: right;padding-top: 20px;"><span>{{config.author}}</span> </div>
+          </div>
+      </el-dialog>
+    </div>
   </div>
 </template>
-
 <script>
+  import apiPopup from '@/api/modules/popup.js';
   export default{
     props:{
       config: {
@@ -42,34 +44,67 @@
     data() {
       return {
         showGonggao:false,
+        popupList:[],//需要弹出的窗口
         sessionKey:'alertpopup',
       };
     },
     mounted() {
-       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);
-           }
-         }
+      //获取用户需要弱出的窗口信息，放在状态中
+      let has =  sessionStorage.getItem(this.sessionKey);
+      if(!has){
+        apiPopup.userList().then(rs=>{
+          if(rs.status==200){
+              this.popupList=rs.result;
+              if(rs.result.length>0){
+                sessionStorage.setItem(this.sessionKey,JSON.stringify(rs.result));
+                this.countPopup();
+              }else{
+                sessionStorage.setItem(this.sessionKey,'[]');
+              }
 
-       }
+          }
+        });
+      }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){
+
+            }
+          })
+
+        }
     }
   }
 </script>
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index cb383614..72f226bc 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -181,7 +181,7 @@ export default {
     this.sex = this.userInfo.sex;
     this.$store.dispatch('refrashMsg');
     this.loadBoeData();
-    this.loadPopupConfig();
+    //this.loadPopupConfig();
   },
   methods: {
     loadPopupConfig(){