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

src/components/SearchBar.vue

@@ -39,7 +39,7 @@ export default {
   },
   methods: {
     bindFocus() {
-      this.formInput.focus()
+      this.focus && this.formInput.focus()
     },
     onChange() {
       this.$emit('input', this.currentValue)

src/pages/home/index.vue

@@ -21,7 +21,7 @@
         </li>
       </ul>
     </div>
-    <card title="课程试听" style="padding-bottom:40px;">
+    <card title="课程试听" style="padding-bottom:50px;">
       <free-course-item v-for="item in courseList" :data="item" :key="item.course_id"></free-course-item>
     </card>
   </div>
@@ -101,6 +101,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.main-container {
+  padding-bottom: env(safe-area-inset-bottom);
+}
 .banner {
   height: 2.4rem;
   img {
@@ -126,4 +129,7 @@ export default {
     height: 100%;
   }
 }
+::v-deep .course-item:last-child {
+  border-bottom: 0;
+}
 </style>

src/pages/search/courseList.vue

 <template>
   <div class="main-list">
     <ul v-if="list.length">
-      <li v-for="item in list" :key="item.course_id">{{item.chapter_name}}</li>
+      <li v-for="item in list" :key="item.course_id" @click="onClick(item)">{{item.course_name}}</li>
     </ul>
     <template v-else>
       <slot name="empty">
@@ -46,6 +46,9 @@ export default {
     // 刷新
     refresh() {
       this.getList()
+    },
+    onClick(data) {
+      this.$router.push({ name: 'courseLearnItem', params: { id: data.id } })
     }
   },
   beforeMount() {

src/pages/search/tagList.vue

 <template>
   <div class="main-list">
     <ul v-if="list.length">
-      <li v-for="item in list" :key="item.id">{{item.title}}</li>
+      <li v-for="item in list" :key="item.id" @click="onClick">{{item.title}}</li>
     </ul>
     <template v-else>
       <slot name="empty">
@@ -46,6 +46,10 @@ export default {
     // 刷新
     refresh() {
       this.getList()
+    },
+    onClick() {
+      window.alert('开发中')
+      // this.$router.push({ name: 'courseLearnItem', params: { id } })
     }
   },
   beforeMount() {

src/pages/search/videoList.vue

@@ -2,7 +2,7 @@
   <div class="main-list">
     <template v-if="list.length">
       <ul>
-        <li v-for="item in list" :key="item.id">{{item.chapter_name}}</li>
+        <li v-for="item in list" :key="item.id" @click="onClick(item)">{{item.chapter_name}}</li>
       </ul>
     </template>
     <template v-else>
@@ -39,6 +39,11 @@ export default {
       }
     }
   },
+  computed: {
+    isWeapp() {
+      return this.$store.state.isWeapp
+    }
+  },
   methods: {
     getList() {
       api.getCourseVideoSearchList(this.requestParams).then(response => {
@@ -48,6 +53,15 @@ export default {
     // 刷新
     refresh() {
       this.getList()
+    },
+    onClick(data) {
+      if (this.isWeapp) {
+        wx.miniProgram.navigateTo({
+          url: `/pages/course/item?id=${data.course_id}&chapter_id=${data.id}`
+        })
+      } else {
+        window.alert('请在微信小程序中打开')
+      }
     }
   },
   beforeMount() {