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/components/addTrain/hSelector.vue

@@ -203,7 +203,7 @@ export default {
       transform: translate3d(0, 0, 0);
     }
     .h-selector-move-enter-active, .h-selector-move-leave-active {
-      transition: transform .6s;
+      transition: transform 0.1ms;
     }
     .h-selector-move-enter, .h-selector-move-leave-to {
       transform: translate3d(0, 100%, 0);
@@ -212,7 +212,7 @@ export default {
       opacity: 1;
     }
     .h-selector-fade-enter-active, .h-selector-fade-leave-active {
-      transition: opacity .4s;
+      transition: opacity 0.1ms;
     }
     .h-selector-fade-enter, .h-selector-fade-leave-to {
       opacity: 0;

src/components/addTrain/hWrapper.vue

@@ -48,7 +48,7 @@ export default {
       // 初始化样式
       style: {
         transform: 'translate3d(0px,0px,0px)',
-        transition: 'transform .3s'
+        transition: 'transform 0ms'
       },
       activeIndex: 0, // 当前激活的索引
       startY: 0, // 开始距离

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/PersonalCenter/IReleasedTrain.vue

@@ -258,7 +258,8 @@ export default {
       this.$router.push({
         path: '/addTrain',
         query: {
-          slId: this.businessId
+          slId: this.businessId,
+          releaseState: this.releaseState
         }
       })
       this.popupShow = false
@@ -387,10 +388,7 @@ export default {
     addTrain() {
       console.log(this.releaseState, 'releaseState')
       this.$router.push({
-        name: 'AddTrain',
-        query: {
-          releaseState: this.releaseState
-        }
+        name: 'AddTrain'
       })
     },
     // 下拉刷新事件

src/views/PersonalCenter/IntegralDetail.vue

@@ -154,9 +154,9 @@ export default {
         font-weight: 100;
       }
       .num{
-        margin-top: 13px;
         font-size: 30px;
         color: #ffffff;
+        padding: 12px 0px 10px;
       }
     }
     .list-box{

src/views/TrainDetail/index.vue

@@ -1679,6 +1679,7 @@ export default {
         /*margin-bottom: 5px;*/
         /*font-weight: 800;*/
         border-bottom: 2px solid #5A96E9;
+        box-sizing: border-box;
         /*position: relative;*/
         color: #5A96E9;
       }
@@ -1834,8 +1835,8 @@ export default {
           flex-direction: column;
           .three_porint{
             position: absolute;
-            top: 40%;
-            left: 52%;
+            top: 37%;
+            left: 50%;
             transform: translate(-50%, -50%);
             -webkit-appearance: none;
             line-height: 47.313px;