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

package-lock.json

@@ -465,13 +465,13 @@
     },
     "@vant/icons": {
       "version": "1.2.3",
-      "resolved": "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.2.3.tgz?cache=0&sync_timestamp=1593673299776&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vant%2Ficons%2Fdownload%2F%40vant%2Ficons-1.2.3.tgz",
-      "integrity": "sha1-xGt93TI2P3kJRMOvl0tzvagN96E="
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.2.3.tgz",
+      "integrity": "sha512-LMu1JGGgZqLYXVFRcuNRDCOWE7AX0vt/gFBkd9xMI7H9uMdNx2oO3YujgNVvVrrF8iufHwfwUv41HiwYMvU3zQ=="
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
-      "integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA="
+      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
+      "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw=="
     },
     "@vue/component-compiler-utils": {
       "version": "3.1.2",
@@ -10120,9 +10120,9 @@
       }
     },
     "vant": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npm.taobao.org/vant/download/vant-2.9.0.tgz",
-      "integrity": "sha1-+Llfg2CNPmsBw4TyLkIiTkUBzns=",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.9.1.tgz",
+      "integrity": "sha512-ftkJItiFMyBjkk98goR7/65TCtCf5VziBNXBwV4x1N11k5UzYpfwWMA0TJgRES6EGZS6P785ddkaMg1xZYq98Q==",
       "requires": {
         "@babel/runtime": "7.x",
         "@vant/icons": "1.2.3",
@@ -10200,8 +10200,8 @@
     },
     "vue-lazyload": {
       "version": "1.2.3",
-      "resolved": "https://registry.npm.taobao.org/vue-lazyload/download/vue-lazyload-1.2.3.tgz",
-      "integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw="
+      "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
+      "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
     },
     "vue-loader": {
       "version": "15.9.2",

package.json

@@ -70,7 +70,7 @@
     "promise.prototype.finally": "^3.1.2",
     "regenerator": "^0.14.4",
     "swiper": "^5.4.5",
-    "vant": "^2.9.0",
+    "vant": "^2.9.1",
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^4.1.1",
     "vue-i18n": "^8.16.0",

src/api/base_api.js

@@ -8,7 +8,7 @@ export default class API {
     // 让ajax携带cookie
     axios.defaults.withCredentials = true
     this._axios = axios.create({
-      timeout: config.timeout || 5 * 1000,
+      timeout: config.timeout || 60 * 1000,
       /* 表示服务器响应的数据类型，可以是 'arraybuffer', 'blob', 'document', 'json', 'text', 'stream' */
       responseType: config.resType || 'json',
       /* 将自动加在 `url` 前面，除非 `url` 是一个绝对 URL */

src/components/CourseItem.vue

@@ -43,7 +43,7 @@ export default {
 <style lang="scss" scoped>
 .course-item {
   display: flex;
-  padding: 0.2rem 0;
+  padding: 0.4rem 0;
   border-bottom: 1px solid #f1f1f1;
 }
 .course-item-content {
@@ -71,17 +71,22 @@ export default {
   font-size: 0.3rem;
   font-weight: 400;
   color: #222;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
   overflow: hidden;
 }
 .course-item__text {
   max-height: 0.68rem;
   font-size: 0.26rem;
   color: #999;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   overflow: hidden;
+  ::v-deep p {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
 }
 </style>

src/components/FreeCourseItem.vue

@@ -65,17 +65,17 @@ export default {
   font-size: 0.3rem;
   font-weight: 400;
   color: #222;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
   overflow: hidden;
 }
 .course-item__text {
   font-size: 0.26rem;
   line-height: 0.42rem;
   color: #999;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   overflow: hidden;
 }
 </style>

src/pages/course/learn/item.vue

 <template>
-  <div class="main-container" v-show="loaded">
+  <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"
-      @click="onTabClick"
-    >
-      <van-tab title="课程学习" name="0">
+    <van-tabs class="main-tabs" v-model="tabActive" color="#2b7ce9" :line-height="2">
+      <van-tab title="课程学习">
         <course-chapter :courseId="courseId" :data="detail.chapters"></course-chapter>
       </van-tab>
-      <van-tab title="知识点速学" name="1">
+      <van-tab title="知识点速学">
         <div class="tab-content">
           <course-tag :courseId="courseId"></course-tag>
         </div>
@@ -32,28 +26,17 @@ export default {
   },
   data() {
     return {
-      tabActive: '0',
+      tabActive: 0,
       loaded: false,
       detail: {}
     }
   },
-  watch: {
-    $route: {
-      immediate: true,
-      handler(route) {
-        // this.tabActive = route.query.tab || '0'
-      }
-    }
-  },
   computed: {
     courseId() {
       return this.$route.params.id
     }
   },
   methods: {
-    onTabClick(name) {
-      // this.$router.replace({ query: { tab: name } })
-    },
     // 课程学习
     getCourse() {
       this.$toast.loading({

src/pages/course/tag/courseTagMessage.vue

@@ -113,7 +113,7 @@ export default {
 .course-tag-item {
   display: inline-block;
   max-width: 100%;
-  height: 24px;
+  // height: 24px;
   margin: 0 10px 10px 0;
   padding: 0 15px;
   background: #67a8ff;
@@ -123,9 +123,9 @@ export default {
     font-size: 13px;
     color: #fff;
     line-height: 24px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
+    // white-space: nowrap;
+    // text-overflow: ellipsis;
+    // overflow: hidden;
   }
 }
 .more {

src/pages/course/tag/index.vue

@@ -109,23 +109,25 @@ export default {
       this.searchTag(data.name)
     },
     searchTag(keywords) {
-      api.getSearchTagList({ keywords }).then(response => {
-        if (response.length) {
-          this.messageList.push({
-            id: this.genId(),
-            type: 2,
-            from: 'system',
-            payload: response
-          })
-        } else {
-          this.messageList.push({
-            id: this.genId(),
-            type: 0,
-            from: 'system',
-            payload: { text: '找不到相关内容' }
-          })
-        }
-      })
+      api
+        .getSearchTagList({ keywords, course_id: this.courseId })
+        .then(response => {
+          if (response.length) {
+            this.messageList.push({
+              id: this.genId(),
+              type: 2,
+              from: 'system',
+              payload: response
+            })
+          } else {
+            this.messageList.push({
+              id: this.genId(),
+              type: 0,
+              from: 'system',
+              payload: { text: '找不到相关内容' }
+            })
+          }
+        })
     },
     onChangeTag(data) {
       this.messageList.push({

src/pages/course/tag/item.vue

@@ -40,9 +40,13 @@ export default {
       return this.$route.params.id
     },
     html() {
-      return this.detail.contents
-        ? this.detail.contents.replace(/\n/g, '<br/>')
-        : ''
+      if (this.detail.contents) {
+        return this.detail.contents
+          .replace(/\n/g, '<br/>')
+          .replace(/---------- start ----------/gi, '')
+          .replace(/---------- end ----------/gi, '')
+      }
+      return ''
     },
     isWeapp() {
       return this.$store.state.isWeapp

src/pages/course/tag/messageCard.vue

@@ -65,13 +65,12 @@ export default {
   background-color: #fff;
   border-radius: 6px;
 }
-.is-system {
+.is-my {
   .message-card-content {
-    text-align: left;
+    text-align: right;
   }
-}
-.is-my {
   .message-card-text {
+    text-align: left;
     color: #fff;
     background-color: #67a8ff;
   }

src/pages/course/tag/tagMessage.vue

@@ -46,9 +46,13 @@ export default {
       }
     },
     html() {
-      return this.data.contents
-        ? this.data.contents.replace(/\n/g, '<br/>')
-        : ''
+      if (this.data.contents) {
+        return this.data.contents
+          .replace(/\n/g, '<br/>')
+          .replace(/---------- start ----------/gi, '')
+          .replace(/---------- end ----------/gi, '')
+      }
+      return ''
     },
     isWeapp() {
       return this.$store.state.isWeapp

src/pages/home/index.vue

@@ -7,7 +7,7 @@
           <img src="../../assets/images/banner.png" @click="onClickNav('pay')" />
         </van-swipe-item>
         <van-swipe-item>
-          <img src="../../assets/images/banner.png" @click="onClickNav('examIndex')" />
+          <img src="../../assets/images/banner2.png" @click="onClickNav('examIndex')" />
         </van-swipe-item>
       </van-swipe>
     </div>
@@ -24,8 +24,8 @@
         </li>
       </ul>
     </div>
-    <card title="课程试听" style="padding-bottom:60px;">
-      <free-course-item v-for="item in courseList" :data="item" :key="item.course_id"></free-course-item>
+    <card title="课程试听" style="padding-bottom:1.2rem;">
+      <free-course-item v-for="(item, index) in courseList" :data="item" :key="index"></free-course-item>
     </card>
   </div>
 </template>
@@ -122,7 +122,7 @@ export default {
 
 <style lang="scss" scoped>
 .banner {
-  height: 2.4rem;
+  height: 2.9rem;
   img {
     width: 100%;
     height: 100%;