Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

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%;

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>
   
       <!-- 文件列表 -->

src/components/Portal/guideBox.vue

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

src/components/PortalHeader.vue

@@ -55,8 +55,8 @@
           </div>
         </div>
         <div class="portal-top-right">
-          <div v-if="goSearch !=10" style="position: relative;">
+          <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" >
+            <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;

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>待&nbsp办</span>
-            <span>{{studyTaskCount? studyTaskCount:0 }} 个待处理 <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt=""> </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>
@@ -388,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>
 
@@ -402,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';
@@ -514,8 +518,6 @@
       };
     },
     mounted() {
-      //this.userInfo = this.$store.getters.userInfo;
-      //console.log(this.userInfo,'userInfo');
       this.getCourseData(1);
       this.getCaseData();
       this.getArticleData();
@@ -527,6 +529,11 @@
       this.getLevel();
       this.getQaAnswers();
 
+      // 控制引导页弹框显示
+      apiGuide.hasUser().then(res=>{
+        this.$refs.guide.guideCollection = res.result ? false : true;
+      });
+
     },
     computed: {
        ...mapGetters(['userInfo','studyTaskCount']),
@@ -908,6 +915,12 @@
 </script>
 
 <style scoped lang="scss">
+.tobe-icon{
+  width: 8px;
+  height: 14px;
+  margin-top: 1.5px;
+  margin-left: 8px;
+}
 .grade{
   width: 70px;
   height: 30px;
@@ -979,7 +992,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);

src/views/ucurrency/Index.vue

@@ -310,7 +310,7 @@
       }
     },
     updated() {
-       this.chart.resize();
+      this.chart && this.chart.resize();
     },
     methods: {
 

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 {