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

src/pages/course/learn/item.vue

@@ -15,7 +15,7 @@ export default {
   components: { CourseChapter },
   metaInfo() {
     return {
-      title: this.curriculum.curriculum_name
+      title: this.title
     }
   },
   data() {
@@ -28,8 +28,8 @@ export default {
     courseId() {
       return this.$route.params.id
     },
-    curriculum() {
-      return this.detail.curriculum || {}
+    title() {
+      return this.detail.curriculum ? this.detail.curriculum.curriculum_name : ''
     }
   },
   methods: {

src/pages/course/tag/courseTagMessage.vue

@@ -72,9 +72,7 @@ export default {
       this.showMore = !this.showMore
     },
     viewMore() {
-      const path = `/course/learn/${this.courseId}/tag/${
-        this.data.id
-      }?is_test=${this.isTest ? '1' : '0'}`
+      const path = `/course/learn/${this.courseId}/tag/${this.data.id}?is_test=${this.isTest ? '1' : '0'}`
       if (this.isWeapp) {
         const src = encodeURIComponent(`${window.location.origin}${path}`)
         wx.miniProgram.navigateTo({
@@ -86,9 +84,7 @@ export default {
     }
   },
   mounted() {
-    this.contentHeight = this.$refs.content
-      ? this.$refs.content.offsetHeight
-      : 0
+    this.contentHeight = this.$refs.content ? this.$refs.content.offsetHeight : 0
   }
 }
 </script>
@@ -114,7 +110,7 @@ export default {
   // height: 24px;
   margin: 0 10px 10px 0;
   padding: 0 15px;
-  background: #67a8ff;
+  background: #f47885;
   border-radius: 12px;
   cursor: pointer;
   p {

src/pages/course/tag/index.vue

@@ -43,7 +43,6 @@ export default {
     courseId: {
       type: String,
       default() {
-        console.log(this)
         return this.$route.params.id
       }
     },

src/pages/course/tag/messageCard.vue

@@ -75,7 +75,7 @@ export default {
     height: 0;
     border-top: 4px solid transparent;
     border-bottom: 4px solid transparent;
-    border-left: 5px solid #67a8ff;
+    border-left: 5px solid #f47885;
   }
   .message-card-content {
     text-align: right;
@@ -83,7 +83,7 @@ export default {
   .message-card-text {
     text-align: left;
     color: #fff;
-    background-color: #67a8ff;
+    background-color: #f47885;
   }
 }
 .message-card-content {

src/pages/course/tag/tagMessage.vue

@@ -140,7 +140,7 @@ export default {
     font-size: 13px;
     color: #fff;
     line-height: 24px;
-    background: #67a8ff;
+    background: #f47885;
     border-radius: 12px;
     white-space: nowrap;
     text-overflow: ellipsis;

src/pages/courseExam/index.vue

@@ -482,7 +482,7 @@ export default {
                   color: #fff;
                   padding: 0 0.3rem;
                   margin-left: 0.2rem;
-                  background: #67a8ff;
+                  background: #f47885;
                   border-radius: 0.25rem;
                   white-space: nowrap;
                 }

src/pages/my/alarm/components/update.vue

@@ -15,7 +15,7 @@
       <div class="alarm-form-item">
         <div class="alarm-form-item-hd">
           <div class="alarm-form-item-hd__lable">重复</div>
-          <div class="alarm-form-item-hd__aside">{{selectedResultText}}</div>
+          <div class="alarm-form-item-hd__aside">每周重复</div>
         </div>
         <div class="alarm-form-item-content">
           <van-checkbox-group v-model="ruleForm.week_json" direction="horizontal">