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

src/app.vue

 <template>
   <div style="width: 100%;" id="app">
-    <router-view :key="$route.fullPath"></router-view>
+    <keep-alive :max="5">
+      <router-view :key="$route.fullPath"></router-view>
+    </keep-alive>
   </div>
 </template>
 

src/pages/course/learn/item.vue

@@ -41,7 +41,7 @@ export default {
     $route: {
       immediate: true,
       handler(route) {
-        this.tabActive = route.query.tab || '0'
+        // this.tabActive = route.query.tab || '0'
       }
     }
   },
@@ -84,7 +84,7 @@ export default {
   font-size: 15px;
   font-weight: 600;
   color: #222;
-  padding: 20px 20px 10px;
+  padding: 20px 0 10px;
 }
 .tab-content {
   margin-left: -0.4rem;

src/pages/course/tag/courseTagMessage.vue

@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       showMore: false,
-      maxHeight: 76,
+      maxHeight: 102,
       contentHeight: 0
     }
   },
@@ -97,7 +97,7 @@ export default {
   color: #222;
 }
 .has-more .course-tag-message-bd {
-  height: 76px;
+  height: 102px;
   overflow: hidden;
 }
 .course-tag-item {

src/pages/course/tag/item.vue

@@ -15,6 +15,11 @@
 import * as api from '@/api/course.js'
 export default {
   name: 'CourseTagItem',
+  metaInfo() {
+    return {
+      title: '知识点速学'
+    }
+  },
   data() {
     return {
       loaded: false,

src/pages/course/tag/list.vue

@@ -20,6 +20,11 @@
 import * as api from '@/api/course.js'
 export default {
   name: 'CourseTagList',
+  metaInfo() {
+    return {
+      title: this.isTest ? '知识点小测' : '知识点速学'
+    }
+  },
   data() {
     return {
       loaded: false,

src/pages/courseExam/courseNode.vue

@@ -13,6 +13,9 @@
 import CourseTag from '@/pages/course/tag/index.vue'
 export default {
   components: { CourseTag },
+  metaInfo: {
+    title: '知识点小测'
+  },
   data() {
     return {
       detail: {}

src/pages/home/index.vue

@@ -76,6 +76,7 @@ export default {
       const map = {
         courseLearn: `/pages/web/index?src=${window.location.origin}/course/learn`,
         examIndex: `/pages/web/index?src=${window.location.origin}/exam/index?isBack=1`,
+        mockIndex: `/pages/web/index?src=${window.location.origin}/mock/index`,
         pay: `/pages/web/index?src=${window.location.origin}/pay`
       }
       const isLogin = requireLogin

src/pages/login/login.vue

 <template>
-  <div class="login">
+  <div class="login" v-show="showPage">
     <h1 class="title">
       全国道路运输企业主要负责人和
       <br />安全生产管理人员安全考核管理
@@ -60,6 +60,9 @@ export default {
     redirectURI() {
       const { query } = this.$route
       return query.redirect_uri ? decodeURIComponent(query.redirect_uri) : ''
+    },
+    showPage() {
+      return this.isWechat ? this.checkWechatLogin() : true
     }
   },
   methods: {
@@ -137,7 +140,7 @@ export default {
       )
     }
   },
-  beforeMount() {
+  created() {
     this.$store.dispatch('checkLogin').then(isLogin => {
       if (isLogin) {
         this.loginSuccess({ code: 0, data: { TGC: Cookies.get('TGC') } }, 1)

src/pages/search/courseList.vue

 <template>
-  <div class="main-list">
+  <div class="main-list" v-show="loaded">
     <ul v-if="list.length">
       <li v-for="item in list" :key="item.course_id" @click="onClick(item)">{{item.course_name}}</li>
     </ul>
@@ -25,6 +25,7 @@ export default {
   },
   data() {
     return {
+      loaded: false,
       list: [],
       requestParams: {}
     }
@@ -39,7 +40,9 @@ export default {
   },
   methods: {
     getList() {
+      this.loaded = false
       api.getSearchCourseList(this.requestParams).then(response => {
+        this.loaded = true
         this.list = response
       })
     },

src/pages/search/index.vue

@@ -63,8 +63,10 @@ export default {
     return {
       tabActive: '0',
       searchValue: '',
-      featureList: [], // 搜索发现
-      historyList: [] // 搜索记录
+      detail: {
+        base_tips: [],
+        tips: []
+      }
     }
   },
   watch: {
@@ -77,12 +79,23 @@ export default {
       }
     }
   },
+  computed: {
+    // 搜索发现
+    featureList() {
+      // 最多显示10条
+      return this.detail.base_tips.filter((item, index) => index < 10)
+    },
+    // 搜索记录
+    historyList() {
+      // 最多显示10条
+      return this.detail.tips.filter((item, index) => index < 10)
+    }
+  },
   methods: {
     // 获取所搜记录
     getSearchTips() {
       api.getSearchTips().then(response => {
-        this.featureList = response.base_tips
-        this.historyList = response.tips
+        this.detail = response
       })
     },
     changeSearchValue(value) {

src/pages/search/tagList.vue

 <template>
-  <div class="main-list">
+  <div class="main-list" v-show="loaded">
     <ul v-if="list.length">
       <li v-for="item in list" :key="item.id" @click="onClick(item)">{{item.title}}</li>
     </ul>
@@ -25,6 +25,7 @@ export default {
   },
   data() {
     return {
+      loaded: false,
       list: [],
       requestParams: {}
     }
@@ -39,8 +40,10 @@ export default {
   },
   methods: {
     getList() {
+      this.loaded = false
       api.getSearchTagList(this.requestParams).then(response => {
         this.list = response
+        this.loaded = true
       })
     },
     // 刷新

src/pages/search/videoList.vue

 <template>
-  <div class="main-list">
+  <div class="main-list" v-show="loaded">
     <template v-if="list.length">
       <ul>
-        <li v-for="item in list" :key="item.id" @click="onClick(item)">{{item.chapter_name}}</li>
+        <li v-for="item in list" :key="item.id" @click="onClick(item)">
+          <div class="pic">
+            <img />
+            <div class="cover"></div>
+          </div>
+          <div class="text">{{item.chapter_name}}</div>
+        </li>
       </ul>
     </template>
     <template v-else>
@@ -27,6 +33,7 @@ export default {
   },
   data() {
     return {
+      loaded: false,
       list: [],
       requestParams: {}
     }
@@ -46,7 +53,9 @@ export default {
   },
   methods: {
     getList() {
+      this.loaded = false
       api.getSearchCourseVideoList(this.requestParams).then(response => {
+        this.loaded = true
         this.list = response
       })
     },
@@ -71,10 +80,41 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.main-list ul {
+  margin-top: 0.58rem;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
 .main-list li {
-  padding: 0.3rem 0;
-  font-size: 0.3rem;
-  color: #222;
-  border-bottom: 1px solid #f1f1f1;
+  width: 3rem;
+  margin-bottom: 0.4rem;
+  .pic {
+    position: relative;
+    width: 3rem;
+    height: 1.7rem;
+    border-radius: 6px;
+  }
+  .cover {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(1, 1, 1, 0.2) url(../../assets/images/icon_play.png)
+      no-repeat center center;
+    background-size: 0.56rem 0.7rem;
+    z-index: 10;
+  }
+  .text {
+    margin: 0.1rem 0;
+    font-size: 0.3rem;
+    color: #222;
+    line-height: 0.4rem;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+  }
 }
 </style>