From dd58c214195b36ab61820ad4c76cbc1cd15f1394 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 19 Jan 2023 21:54:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=A5=E8=8A=82?=
 =?UTF-8?q?=E5=8B=8B=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Popup/China2023.vue | 74 ++++++++++++++++++++++++++++++
 src/components/PortalHeader.vue    |  2 +-
 src/views/medal/Index.vue          |  5 ++
 src/views/user/Setting.vue         |  2 -
 4 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 src/components/Popup/China2023.vue

diff --git a/src/components/Popup/China2023.vue b/src/components/Popup/China2023.vue
new file mode 100644
index 00000000..ee5e01d4
--- /dev/null
+++ b/src/components/Popup/China2023.vue
@@ -0,0 +1,74 @@
+<template>
+  <div>
+    <el-dialog :close-on-press-escape="false" :close-on-click-modal="false"  class="medalbox"  :visible.sync="show"  :append-to-body="true" >
+        <div style="text-align: center;position: relative;">
+          <el-image :src="`${webBaseUrl}/images/medal/china2023.png`"></el-image>
+          <div class="dlg-boot">
+            <span  class="dlg-close" @click="show = false"><i style="font-size: 28px;color: #999;" class="el-icon-close"></i></span>
+          </div>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  export default{
+    data() {
+      return {
+        show:false,
+        baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+        localKey:'local-china-2023'
+      };
+    },
+    mounted() {
+       let now=new Date();
+       let min=new Date(2022,11,1,0,0,0);
+       let max=new Date(2023,2,5,0,0,0);
+       //console.log(now,min,max);
+       //console.log(now.getTime(),min.getTime(),max.getTime());
+       if(now.getTime()<max.getTime()){
+         //console.log('open')
+         var localData=localStorage.getItem(this.localKey);
+         if(!localData){
+            this.show=true;
+            var localData=localStorage.setItem(this.localKey,'has');
+         }
+       }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+.dlg-boot{
+  height: 50px;
+  margin-top: 30px;
+}
+.dlg-close{
+    //float: right;
+    //margin-top: -90px;
+    border: 1px solid #cccccc;
+    border-radius: 50%;
+
+    padding: 20px 10px 10px 10px;
+    cursor: pointer;
+  }
+  .jinian-medal-img{
+    text-align: center;
+    padding-top: 10px;
+  }
+  .medalbox {
+    background: transparent !important;
+    ::v-deep .el-dialog{
+      background: transparent !important;
+      box-shadow:none !important;
+      .el-dialog__header{
+         display: none !important;
+      }
+      .el-dialog__body{
+        //  width: 320px !important;
+        //  height: 420px !important;
+        background: transparent !important;
+      }
+    }
+  }
+</style>
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 59a6bd31..8132c72e 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -131,7 +131,7 @@
 import { mapGetters, mapActions } from 'vuex';
 import apiMessage from '@/api/system/message.js';
 import popup from '@/components/AlertPopup.vue';
-import yearMedal from '@/components/Popup/Medal2023.vue';
+import yearMedal from '@/components/Popup/China2023.vue';
 import apiBoeCourse from '@/api/boe/course.js';
 import {userAvatarText} from "@/utils/tools.js";
 export default {
diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue
index 252e1ab1..4ca4b2ad 100644
--- a/src/views/medal/Index.vue
+++ b/src/views/medal/Index.vue
@@ -27,6 +27,11 @@
                 <p class="index-title" style="padding-top: 10px;">元旦勋章</p>
                 <!-- <p class="index-text">您已超过{{item.exceed}}人</p> -->
             </div>
+            <div class="medal-index">
+                <img style="width:138px;height:151px" :src="`${webBaseUrl}/images/medal/china2023m.png`" alt="">
+                <p class="index-title" style="padding-top: 10px;">春节勋章</p>
+                <!-- <p class="index-text">您已超过{{item.exceed}}人</p> -->
+            </div>
       </div>
       <div v-else class="home-no-list">
             <img class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset="">
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index 610a8aa3..4b4419bf 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -438,8 +438,6 @@
                }
             })
 
-
-
             // this.teachform.expertise.forEach(item =>{
             //   this.childData.forEach(it =>{
             //     if(item == it.id){

From 02992eac6609b2fb077773ae58ca454919380bbc Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 20 Jan 2023 09:42:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=98=A5=E8=8A=82=E5=8B=8B=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Popup/China2023.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Popup/China2023.vue b/src/components/Popup/China2023.vue
index ee5e01d4..d8066530 100644
--- a/src/components/Popup/China2023.vue
+++ b/src/components/Popup/China2023.vue
@@ -22,17 +22,19 @@
     },
     mounted() {
        let now=new Date();
-       let min=new Date(2022,11,1,0,0,0);
-       let max=new Date(2023,2,5,0,0,0);
+       let min=new Date('2023/01/20 00:00:00');
+       let max=new Date('2023/02/05 00:00:00');
        //console.log(now,min,max);
        //console.log(now.getTime(),min.getTime(),max.getTime());
-       if(now.getTime()<max.getTime()){
+       if(now.getTime()>min.getTime() && now.getTime()<max.getTime()){
          //console.log('open')
          var localData=localStorage.getItem(this.localKey);
          if(!localData){
             this.show=true;
             var localData=localStorage.setItem(this.localKey,'has');
          }
+       }else{
+         //console.log('no open')
        }
     }
   }

From c6cee0ca6a68a67f57cca4c73c155c2a55a6fbba Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 20 Jan 2023 13:53:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Popup/China2023.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Popup/China2023.vue b/src/components/Popup/China2023.vue
index d8066530..3af21f55 100644
--- a/src/components/Popup/China2023.vue
+++ b/src/components/Popup/China2023.vue
@@ -22,7 +22,7 @@
     },
     mounted() {
        let now=new Date();
-       let min=new Date('2023/01/20 00:00:00');
+       let min=new Date('2023/01/22 00:00:00');
        let max=new Date('2023/02/05 00:00:00');
        //console.log(now,min,max);
        //console.log(now.getTime(),min.getTime(),max.getTime());