Merge remote-tracking branch 'origin/master'

src/components/CourseDiscuss/Coursediscuss.vue

@@ -545,7 +545,7 @@ export default {
     width:90%;
     height:auto;
     position: relative;
-    padding: 18px 18px 1px 14px;
+    padding: 10.5px 18px 1px 14px;
     background-color: #F2F3F7;
     border-radius:8px;
   }
@@ -583,7 +583,7 @@ export default {
     text-align: left;
     display: flex;
     flex-direction: row;
-    margin-bottom: 12px
+    margin-bottom: 10px
   }
   .discuss-person{
     color: #191919;

src/components/CourseDiscuss/DiscusssingleReply.vue

@@ -129,7 +129,7 @@ export default {
 <style scoped>
   .discussWrap {
     width: 100%;
-    margin-bottom: 15px;
+    margin-bottom: 12px;
   }
   .singleReply{
     color: #333333;font-family:PingFang-SC-Regular;margin-bottom: 12px
@@ -166,7 +166,7 @@ export default {
     text-align: left;
     display: flex;
     flex-direction: row;
-    margin-bottom: 15px
+    margin-bottom: 12px
   }
   .reply-person{
     color: #191919;

src/views/CourseDetail/index.vue

@@ -128,7 +128,7 @@
         >
           <!-- {{ item ==='评论' ? item +'(' + (discussLen > 999 ? '999+' : discussLen) + ')': item }} -->
           {{item}}
-          <span class="count">
+          <span v-if="item === '评论'" class="count">
             {{ item ==='评论' ? (discussLen === 0 ? '' : (discussLen > 999 ? '999+' : discussLen)) : '' }}
           </span>
 <!--          <div-->
@@ -1413,6 +1413,7 @@ export default {
           /*margin-bottom: 0.4vw;*/
           /*font-weight: 800;*/
           /*position: relative;*/
+          box-sizing: border-box;
           color: @selectColor;
           border-bottom: 2px solid @selectColor;
         }

src/views/TrainDetail/index.vue

@@ -1678,6 +1678,7 @@ export default {
         /*margin-bottom: 5px;*/
         /*font-weight: 800;*/
         border-bottom: 2px solid #5A96E9;
+        box-sizing: border-box;
         /*position: relative;*/
         color: #5A96E9;
       }