Merge branch 'dev-2.0' into master-2.0.1

# Conflicts:
#	src/views/Home/index.vue
#	src/views/classification/classificationResult.vue

src/assets/style/global.less

@@ -130,28 +130,19 @@
 }
 .dotNumKindGreen{
   position: absolute;
-  margin-left: 77px;
   .van-info--dot{
-    top: auto;
-    left: auto;
     background-color: #00d95a;
   }
 }
 .dotNumKindYellow{
   position: absolute;
-  margin-left: 77px;
   .van-info--dot{
-    top: auto;
-    left:auto;
     background-color:#eae30bfa;
   }
 }
 .dotNumKindRed{
   position: absolute;
-  margin-left: 77px;
   .van-info--dot{
-    top: auto;
-    left: auto;
     background-color: #f56c6c;
   }
 }

src/assets/style/resetui.less

@@ -22,7 +22,7 @@
   }
 }
 .v-tab{
-  width: 100%;
+  width: auto;
   height: 49px;
   padding-top: 0;
   border-bottom: 1px solid #f2f2f2;

src/views/CourseDetail/index.vue

@@ -936,6 +936,12 @@ export default {
         const res = response.data
         that.loadData = true
         // 课程信息存在，请求接口“添加我学习的课程”
+        console.log(response, '进入')
+        if (response.data.data.code === 132) {
+          console.log('退出')
+          this.noAuthTip = true
+          return
+        }
         if (!this.isOutLine) {
           addLearnLesson({
             lessonId: that.$route.query.id

src/views/Home/index.vue

@@ -751,7 +751,22 @@ export default {
         requireId: '',
         num: 100
       })
-      res.data.data.splice(0, 0, {title: '全部分类', key: '', children: '', newCount: 0})
+      const res1 = await get.getHomeBLessons({
+        courseLevelOne: '',
+        requireId: '',
+        departs: [],
+        viewParam: '',
+        page: 1,
+        rows: this.pageNum
+      })
+      console.log(res1, '测试？？？？？？？？？？？？？？？？？？？？？？？')
+      let sum = 0
+      for (const items of res1.data.data.rows) {
+        if (items.isNew === '1') {
+          sum += 1
+        }
+      }
+      res.data.data.splice(0, 0, {title: '全部分类', key: '', children: '', newCount: sum})
       this.tabsList = res.data.data
       let isKindNew = 0
       for (var i = 0; i < this.tabsList.length; i++) {
@@ -814,7 +829,7 @@ export default {
       for (var i = 0; i < this.tabsContentList.length; i++) {
         isNewCount += Number(this.tabsContentList[i].isNew)
       }
-      this.isNewCountAll = isNewCount
+      //   this.isNewCountAll = isNewCount
       this.tabsContentList.length > 0 ? this.isShow = false : this.isShow = true
       // 加载状态结束
       this.loading = false
@@ -831,7 +846,7 @@ export default {
       this.lineWidth = (title.length > 5 ? 5 : title.length) * 15 + 'px'
       this.finished = false // 重置 数据加载状态
       this.tabsName = name
-      this.pageNum = 4
+      this.pageNum = 1000
       this.tabsContentList = []
       this.$nextTick(() => {
         this.HomeBLessons(name)

src/views/classification/classificationResult.vue

@@ -17,10 +17,11 @@
         <!--列表展示-->
         <div class="list-box">
           <div class="tabs-box-sizing">
-            <tabs class="v-tab" background="#ffffff" title-active-color="#4099f0" title-inactive-color="#333333" color="#4099f0"  @click="tabsClick" v-model="key">
-              <tab v-for="(item,index) in tabsList" :title="item.title" :key="index" :name="item.key">
+            <tabs class="v-tab" background="#ffffff" title-active-color="#4099f0" title-inactive-color="#333333" color="#4099f0"  @click="tabsClick" v-model="key" :line-width="200">
+              <tab v-for="(item,index) in tabsList" :title="item.title" :key="index" :name="item.key" >
                 <template #title>
-                  <span>{{item.title}}</span>
+                  <span class="tabTitleClass" v-if="item.title.search(/[0-9a-zA-Z]/) === -1">{{item.title}}</span>
+                  <span class="tabTitleClass1" v-else>{{item.title}}</span>
                   <span>
                     <van-icon  dot :class="item.newCount> 0 && item.newCount <= 3 ? 'homeSortDotGreen' : (item.newCount > 3 && item.newCount <= 10? 'homeSortDotYellow':item.newCount > 10 ? 'homeSortDotRed': 'homeSortDotNone')" />
                   </span>
@@ -478,7 +479,7 @@ export default {
   }
   .list-box .v-tab .van-tab, .v-tab .van-tab--active {
     min-width: auto;
-    width: auto;
+    width: 1000px;
     padding-left: 0px;
     /*flex-basis: 24%;*/
   }
@@ -617,6 +618,14 @@ export default {
         /*top: @nav-bar-height;*/
         z-index: 999;
         .v-tab{
+          .tabTitleClass{
+            display: inline-flex;
+            max-width: 56px;
+            white-space: nowrap;
+            overflow: hidden;
+          }
+          .tabTitleClass1{
+          }
           .homeSortDotGreen{
             .van-info--dot{
               top: -10px;

src/views/classification/index.vue

@@ -11,9 +11,10 @@
       <div class="classification-box">
         <div class="box-left">
           <ul>
-            <li v-for="(item1,index) in ClassList" :key="index" :class="{active:index==current}" @click="addClass(index,$event,item1.key)">
-              <van-icon name="item1.title" dot :class="item1.newCount > 0 && item1.newCount <= 3 ? 'dotNumKindGreen' : (item1.newCount > 3 && item1.newCount <= 10 ? 'dotNumKindYellow':item1.newCount > 10 ? 'dotNumKindRed': 'dotNumKindNone')" />
+            <li v-for="(item1,index) in ClassList" :key="index" :class="{active:index == current}" @click="addClass(index,$event,item1.key)">
               <span>{{ item1.title }}</span>
+                <van-icon name="item1.title" dot :class="item1.newCount > 0 && item1.newCount <= 3 ? 'dotNumKindGreen' :
+                (item1.newCount > 3 && item1.newCount <= 10 ? 'dotNumKindYellow':item1.newCount > 10 ? 'dotNumKindRed': 'dotNumKindNone')" />
             </li>
           </ul>
         </div>