From e38275a81dc528a681e734907706d7092926d0a9 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 20 Oct 2022 17:57:12 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=AC=94=E8=AE=B0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NoteUpload/index.vue | 2 +-
 src/views/ucurrency/Index.vue       | 2 +-
 src/views/user/Mynotes.vue          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/NoteUpload/index.vue b/src/components/NoteUpload/index.vue
index 8052f9b8..8460c8ad 100644
--- a/src/components/NoteUpload/index.vue
+++ b/src/components/NoteUpload/index.vue
@@ -40,7 +40,7 @@
         :limit="limit">
         <svg-icon style="font-size:52px;margin-right:5px;margin-top:20px" icon-class="up-char"></svg-icon>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip" slot="tip">支持拓展名：支持扩展名：<span v-for="ty in fileType">{{ty}},</span> 图片支持批量上传，最多9张</div>
+        <div class="el-upload__tip" slot="tip">支持拓展名：支持扩展名：<span v-for="ty in fileType">{{ty}}  </span> <span v-if="limit > 1">图片支持批量上传，最多9张</span></div>
     </el-upload>
   
       <!-- 文件列表 -->
diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index b813fcef..cb49fbff 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -310,7 +310,7 @@
       }
     },
     updated() {
-       this.chart.resize();
+      this.chart && this.chart.resize();
     },
     methods: {
 
diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
index 27b1f37a..d2fc15b8 100644
--- a/src/views/user/Mynotes.vue
+++ b/src/views/user/Mynotes.vue
@@ -393,7 +393,7 @@ export default {
       this.upNoteFile.content = [];
       if(e == '3') {
          this.upNoteFile.limit = 9;
-         this.upNoteFile.fileType = ["png","jpg"];
+         this.upNoteFile.fileType = ["png","jpg","jpeg","bmp"];
       } else if(e == '1'){
         this.upNoteFile.fileType = ["txt"];
       } else {

From ec03b77ccdb92d8760ac004585ac105befe9080c Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 20 Oct 2022 18:16:09 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index f58c8c0c..bb0afc1d 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -26,8 +26,11 @@
         <p class="personal-info">{{cutOrgNamePath(userInfo.departFullName)}}</p>
         <a href="uc/study/task">
           <div  class="personal-box">
-            <span>待办</span>
-            <span>{{studyTaskCount? studyTaskCount:0 }} 个待处理 <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt=""> </span>
+            <span>待&nbsp办</span>
+            <span style="display:flex;">{{studyTaskCount? studyTaskCount:0 }} 个待处理
+               <div class="tobe-icon">
+                 <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt=""> </div>
+               </span>
             <img class="personal-box-img" :src="`${webBaseUrl}/images/homeWu/agency.png`" alt="" srcset="">
           </div>
         </a>
@@ -908,6 +911,12 @@
 </script>
 
 <style scoped lang="scss">
+.tobe-icon{
+  width: 8px;
+  height: 14px;
+  margin-top: 1.5px;
+  margin-left: 8px;
+}
 .grade{
   width: 70px;
   height: 30px;

From 0f8928d757ca951d33e8adc70e2ef15448b23c85 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 20 Oct 2022 19:11:24 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal-index.scss | 12 ++++++++++++
 src/components/PortalHeader.vue     |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss
index 1cff2059..2f54b449 100644
--- a/src/assets/styles/portal-index.scss
+++ b/src/assets/styles/portal-index.scss
@@ -444,6 +444,9 @@
 }
 // boe-index
 @media screen and (max-width: 1366px){
+  .portal-input{
+    width: 260px;
+  }
   .btn-user{
     width: 70px;
   }
@@ -726,6 +729,9 @@
  }
 }
 @media screen and (max-width: 1680px) and (min-width:1367px){
+  .portal-input{
+    width: 280px;
+  }
   .btn-user{
     width: 75px;
   }
@@ -1014,6 +1020,9 @@
 }
 
 @media screen and (max-width: 1920px) and (min-width: 1681px){
+  .portal-input{
+    width: 290px;
+  }
   .btn-user{
     width: 80px;
   }
@@ -1289,6 +1298,9 @@
   .btn-user{
     width: 80px;
   }
+  .portal-input{
+    width: 300px;
+  }
   .course-banner {// 首页banner导航条样式
     .swiper-button-prev{
       left: 44%;
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 7c747e16..24d76a4e 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -55,8 +55,8 @@
           </div>
         </div>
         <div class="portal-top-right">
-          <div v-if="goSearch !=10" style="position: relative;">
-            <el-input v-show="!hideSearch" placeholder="搜索全部" style="width: 260px;border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
+          <div  v-if="goSearch !=10" style="position: relative;">
+            <el-input class="portal-input" v-show="!hideSearch" placeholder="搜索全部" style="border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
               <el-select  v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
                 <el-option label="课程" value="1"></el-option>
                 <el-option label="案例" value="2"></el-option>
@@ -303,6 +303,7 @@ export default {
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
+
 ::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
     background-color: #fff !important;
     color: #0059FF !important;

From 9f5c8760a0d8c13c80efc777439ed0a6169ab131 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 20 Oct 2022 19:14:52 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BA=A6=E9=99=8D=E4=BD=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index bb0afc1d..78c5dd9f 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -988,7 +988,7 @@
     right: 8%;
     top: 105px;
     // background: url('/images/homeWu/personal-bgimg.png');
-    background: rgba($color: #fff, $alpha: 0.46);
+    background: rgba($color: #fff, $alpha: 0.2);
     border-radius: 8px;
     z-index: 999;
     backdrop-filter: blur(10px);

From f652a1d4500cbc54e6fb83fa8feba45a9bd2c325 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Thu, 20 Oct 2022 19:55:41 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=BC=95=E5=AF=BC?=
 =?UTF-8?q?=E9=A1=B5=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index 78c5dd9f..ea0b0b75 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -391,7 +391,7 @@
     <portal-footer></portal-footer>
     <portalFloatTools></portalFloatTools>
     <interest-Collection></interest-Collection> <!-- 兴趣偏好 -->
-    <guide-box></guide-box> <!-- 引导页 -->
+    <guide-box ref="guide"></guide-box> <!-- 引导页 -->
   </div>
 </template>
 
@@ -405,6 +405,7 @@
   import apiCase from '@/api/modules/cases.js';
   import apiArticle from '@/api/modules/article.js';
   import apiQa from '@/api/modules/qa.js';
+  import apiGuide from "@/api/phase2/guide.js";
   import apiUser from '@/api/system/user.js';
   import apiCoursePortal from '@/api/modules/coursePortal.js';
   import interactBar from '@/components/Portal/interactBar.vue';
@@ -530,6 +531,15 @@
       this.getLevel();
       this.getQaAnswers();
 
+      // 控制引导页弹框显示
+      apiGuide.hasUser().then(res=>{
+         if(res.result) {
+          this.$refs.guide.guideCollection = false;
+         } else {
+          this.$refs.guide.guideCollection = true;
+         }
+      });
+
     },
     computed: {
        ...mapGetters(['userInfo','studyTaskCount']),

From a2984ca9739c9a6312e6af6cdd78549b22189eed Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Thu, 20 Oct 2022 19:56:57 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E9=A1=B5=E5=BC=B9=E6=A1=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=8E=A7=E5=88=B6=E6=94=BE=E5=88=B0=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=A4=84=E7=90=86=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=8E?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/guideBox.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue
index 6d717b72..11bb4366 100644
--- a/src/components/Portal/guideBox.vue
+++ b/src/components/Portal/guideBox.vue
@@ -86,16 +86,17 @@
       if(width < 1366) {
         this.clientWidth = '688px';
       }
+
       //这里必须放在当前的Session存储中，不能每次都调用
-      apiGuide.hasUser().then(res=>{
-         if(res.result) {
-          this.guideCollection = false;
-         } else {
-          this.guideCollection = true;
-          
-         }
-      });
-      
+      // apiGuide.hasUser().then(res=>{
+      //    if(res.result) {
+      //     this.guideCollection = false;
+      //    } else {
+      //     this.guideCollection = true;
+
+      //    }
+      // });
+
       //只是在显示时才调用
       this.getlist();
 

From 215ce72186a877bd79f9738a0282caba149885d0 Mon Sep 17 00:00:00 2001
From: weinan2087 <weinan2087@163.com>
Date: Thu, 20 Oct 2022 20:01:09 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=BC=95?=
 =?UTF-8?q?=E5=AF=BC=E9=A1=B5=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index ea0b0b75..225638fc 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -518,8 +518,6 @@
       };
     },
     mounted() {
-      //this.userInfo = this.$store.getters.userInfo;
-      //console.log(this.userInfo,'userInfo');
       this.getCourseData(1);
       this.getCaseData();
       this.getArticleData();
@@ -533,11 +531,7 @@
 
       // 控制引导页弹框显示
       apiGuide.hasUser().then(res=>{
-         if(res.result) {
-          this.$refs.guide.guideCollection = false;
-         } else {
-          this.$refs.guide.guideCollection = true;
-         }
+        this.$refs.guide.guideCollection = res.result ? false : true;
       });
 
     },