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

src/components/Course/myNote.vue

@@ -9,8 +9,8 @@
             <div class="newcote-content" v-if="notetab == 1">
                 <div class="newcote-time" v-if="play_Time != 0">
                     <img :src="`${webBaseUrl}/images/coteplay.png`" />
-                    {{formatSeconds(play_Time)}}
+                    {{formatSeconds(play_Time)}}1
-                    <img :src="`${webBaseUrl}/images/cotedetel.png`" @click="timeDel()" />
+                    <img :src="`${webBaseUrl}/images/cotedetel.png`" @click="play_Time = 0" />
                 </div>
                 <div class="newcote-text">
                     <el-input type="textarea" :autofocus="true" :style="`min-height:${inputHeight}px`" placeholder="好记性不如烂笔头，记录些什么吧～"

src/components/Portal/guideBox.vue

@@ -25,7 +25,7 @@
             </div>
             <p class="gui-text">{{description}}</p>
             <!-- <el-button type="primary" class="btn-one" @click="goHome()">进入首页</el-button> -->
-            <el-button type="primary" class="btn-one" @click="guideCollection = false">进入首页</el-button>
+            <el-button type="primary" class="btn-one"  @click="goHome()">进入首页</el-button>
          </div>
       </div>
     </el-dialog>
@@ -117,7 +117,8 @@
            this.$emit('close');
         },
         goHome() {
-           this.$router.push('/index')
+          this.guideCollection = false;
+          this.$router.push('/index')
         },
         getlist() {
             apiGuide.list().then(res=>{

src/views/Index.vue

@@ -5,7 +5,7 @@
        <div id="container" style="z-index:99;" v-if="resonimg.length ==  1">
          <!-- 当轮播图等于一张时 -->
         <swiper :options="swiperOptiontwo" >
-          <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimg" :key="'a'+idx" class="swiper-slide games" @click.native="banJump(item)">
+          <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimg" :key="'a'+idx" class="swiper-slide games pointer" @click.native="banJump(item)">
             <div class="bannbox" :style="{ 'background': `url(${fileBaseUrl + item.image}) no-repeat 100% / 100%`}">
             </div>
             <img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.image" alt="">
@@ -14,7 +14,7 @@
         </div>
       <div id="container" style="z-index:99;" v-else>
         <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
-          <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimg" :key="'b'+idx" class="swiper-slide games" @click.native="banJump(item)">
+          <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimg" :key="'b'+idx" class="swiper-slide games pointer" @click.native="banJump(item)">
             <div class="bannbox" :style="{ 'background': `url(${fileBaseUrl + item.image}) no-repeat 100% / 100%`}">
             </div>
             <img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.image" alt="">

src/views/portal/course/Index.vue

@@ -489,9 +489,9 @@ export default {
         //console.log(this.course.pageIndex,'this.course.pageIndex');
         //加此判断，是为了没有数据时的闪动问题
         //if(this.course.pageIndex >1){
-          if (scrollTop > 830) {
+          if (scrollTop > 1176) {
             document.querySelector("#fixd-box").style.cssText =
-              "position: fixed;top: -885px;width:"+outerWidth+"px";
+              "position: fixed;top: -882px;width:"+outerWidth+"px";
           } else {
               document.querySelector("#fixd-box").style.cssText = "position: static";
           }

src/views/user/Mynotes.vue

@@ -35,10 +35,10 @@
                 end-placeholder="结束">
                 </el-date-picker>
             <el-dropdown  @command="handleCommand">
-                    <el-button>全部课程<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+                    <el-button class="one-line-ellipsis">{{courseName ? courseName: '全部课程'}}<i class="el-icon-arrow-down el-icon--right"></i></el-button>
                     <el-dropdown-menu slot="dropdown" style="height: 150px;overflow-y: auto !important;">
                         <el-dropdown-item command="">全部</el-dropdown-item>
-                        <el-dropdown-item v-for="(cou,couidx) in couresna" :key="couidx" :command="cou.courseId">{{cou.courseName}}</el-dropdown-item>
+                        <el-dropdown-item v-for="(cou,couidx) in couresna" :key="couidx" :command="cou">{{cou.courseName}}</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
             <el-button @click="publish" class="el-buttons">
@@ -442,7 +442,9 @@ export default {
         }
     },
     handleCommand(e) {
-      this.courseId = e;
+      this.courseId = e.courseId;
+      this.courseName = e.courseName;
+      console.log(e,'e');
       this.noteData(this.num);
     },
       Time(val){

src/views/user/Noteedit.vue

@@ -7,7 +7,7 @@
             <span class="his-info pointer" @click="isShowList = true">历史记录</span>
          </div>
          <div :class="editContent">
-            <div  v-if="editdata.playTime != '' " class="note-tit">
+            <div  v-if="editdata.playTime" class="note-tit">
                 <div :style="{cursor:editdata.type==1? 'pointer':''}">
 					<img :src="`${webBaseUrl}/images/coteplay.png`" @click="toCoursePage()" alt="">
 					<span @click="toCoursePage()">{{getHMS(editdata.playTime)}}</span>