Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

src/pages/course/learn/index.vue

@@ -21,19 +21,9 @@ export default {
   },
   methods: {
     getCourseList() {
-      this.$toast.loading({
-        duration: 0,
-        message: '加载中...',
-        forbidClick: true
+      api.getCourseList().then(response => {
+        this.courseList = response
       })
-      api
-        .getCourseList()
-        .then(response => {
-          this.courseList = response
-        })
-        .finally(() => {
-          this.$toast.clear()
-        })
     }
   },
   beforeMount() {

src/pages/course/learn/item.vue

 <template>
   <div class="main-container" v-if="loaded">
     <div class="course-title">{{detail.course_name}}</div>
-    <van-tabs class="main-tabs" v-model="tabActive" color="#2b7ce9" :line-height="2">
+    <van-tabs
+      class="main-tabs"
+      v-model="tabActive"
+      color="#2b7ce9"
+      :line-height="2"
+      :swipeable="true"
+    >
       <van-tab title="课程学习">
         <course-chapter :courseId="courseId" :data="detail.chapters"></course-chapter>
       </van-tab>
@@ -39,30 +45,20 @@ export default {
   methods: {
     // 课程学习
     getCourse() {
-      this.$toast.loading({
-        duration: 0,
-        message: '加载中...',
-        forbidClick: true
-      })
       this.loaded = false
-      api
-        .getCourse(this.courseId)
-        .then(response => {
-          this.loaded = true
-          response.chapters = response.chapters.filter(item => {
-            item.children = item.children.filter(
-              child =>
-                child.type === 2 &&
-                child.resource_id &&
-                child.resource_id !== '6684350363920760832'
-            )
-            return item.children.length
-          })
-          this.detail = response
-        })
-        .finally(() => {
-          this.$toast.clear()
+      api.getCourse(this.courseId).then(response => {
+        this.loaded = true
+        response.chapters = response.chapters.filter(item => {
+          item.children = item.children.filter(
+            child =>
+              child.type === 2 &&
+              child.resource_id &&
+              child.resource_id !== '6684350363920760832'
+          )
+          return item.children.length
         })
+        this.detail = response
+      })
     }
   },
   beforeMount() {

src/pages/course/tag/index.vue

@@ -61,28 +61,18 @@ export default {
   methods: {
     // 获取知识点列表
     getCourseTagList() {
-      this.$toast.loading({
-        duration: 0,
-        message: '加载中...',
-        forbidClick: true
-      })
-      api
-        .getCourseTagList(this.courseId)
-        .then(response => {
-          this.$emit('ready', response)
-          this.detail = response
-          this.messageList = response.chapters.map((item, index) => {
-            return {
-              id: this.genId(index),
-              type: 1,
-              from: 'system',
-              payload: item
-            }
-          })
-        })
-        .finally(() => {
-          this.$toast.clear()
+      api.getCourseTagList(this.courseId).then(response => {
+        this.$emit('ready', response)
+        this.detail = response
+        this.messageList = response.chapters.map((item, index) => {
+          return {
+            id: this.genId(index),
+            type: 1,
+            from: 'system',
+            payload: item
+          }
         })
+      })
     },
     // 输入搜索
     onSearch() {

src/pages/course/tag/item.vue

@@ -57,21 +57,11 @@ export default {
   methods: {
     // 获取知识点详情
     getCourseTag(tagId) {
-      this.$toast.loading({
-        duration: 0,
-        message: '加载中...',
-        forbidClick: true
-      })
       this.loaded = false
-      api
-        .getCourseTag(tagId || this.tagId)
-        .then(response => {
-          this.loaded = true
-          this.detail = response
-        })
-        .finally(() => {
-          this.$toast.clear()
-        })
+      api.getCourseTag(tagId || this.tagId).then(response => {
+        this.loaded = true
+        this.detail = response
+      })
     },
     // 去知识点考试页面
     toExamPage() {

src/pages/course/tag/list.vue

@@ -57,21 +57,11 @@ export default {
   methods: {
     // 获取知识点列表
     getCourseTagList() {
-      this.$toast.loading({
-        duration: 0,
-        message: '加载中...',
-        forbidClick: true
-      })
       this.loaded = false
-      api
-        .getCourseTagList(this.courseId)
-        .then(response => {
-          this.loaded = true
-          this.detail = response
-        })
-        .finally(() => {
-          this.$toast.clear()
-        })
+      api.getCourseTagList(this.courseId).then(response => {
+        this.loaded = true
+        this.detail = response
+      })
     },
     onClick({ id }) {
       const path = `/exam/answer?type=2&tag_id=${id}&papersUrl=zy/v2/examination/course-papers`

src/pages/course/tag/tagMessage.vue

@@ -104,6 +104,12 @@ export default {
 .tag-message-content {
   font-size: 13px;
   line-height: 30px;
+  ::v-deep img {
+    max-width: 100%;
+  }
+  ::v-deep b {
+    font-weight: bold;
+  }
 }
 .more {
   padding-top: 10px;

src/pages/home/index.vue

@@ -75,19 +75,9 @@ export default {
   methods: {
     // 获取课程试听列表
     getCourseList() {
-      this.$toast.loading({
-        duration: 0,
-        message: '加载中...',
-        forbidClick: true
+      api.getFreeCourseList().then(response => {
+        this.courseList = response
       })
-      api
-        .getFreeCourseList()
-        .then(response => {
-          this.courseList = response
-        })
-        .finally(() => {
-          this.$toast.clear()
-        })
     },
     // 搜索
     toSearch() {

src/pages/search/index.vue

@@ -29,6 +29,8 @@
         v-model="tabActive"
         color="#2b7ce9"
         :line-height="2"
+        :animated="true"
+        :swipeable="true"
         @click="onTabClick"
       >
         <van-tab title="知识点" name="0">

src/pages/search/videoList.vue

 <template>
   <div class="main-list" v-show="loaded">
-    <template v-if="list.length">
+    <template v-if="dataList.length">
       <ul>
-        <li v-for="item in list" :key="item.id" @click="onClick(item)">
+        <li v-for="item in dataList" :key="item.id" @click="onClick(item)">
           <div class="pic">
             <img :src="item.url" />
             <div class="cover"></div>
@@ -49,6 +49,12 @@ export default {
   computed: {
     isWeapp() {
       return this.$store.state.isWeapp
+    },
+    // 过滤空视频
+    dataList() {
+      return this.list.filter(
+        item => item.resource_id !== '6684350363920760832'
+      )
     }
   },
   methods: {