Merge remote-tracking branch 'origin/bww-v1' into wxl-develop

src/pages/coursegather/detail/CourseDetail.js

@@ -239,7 +239,7 @@ class CourseDetailForm extends React.Component {
       labelCol: {
         xs: { span: 24 },
         sm: { span: 3 },
-        md: { span: 2 },
+        md: { span: 3 },
         lg: { span: 2 },
         xl: { span: 2 },
         xxl: { span: 1 },
@@ -247,7 +247,7 @@ class CourseDetailForm extends React.Component {
       wrapperCol: {
         xs: { span: 24 },
         sm: { span: 21 },
-        md: { span: 22 },
+        md: { span: 21 },
         lg: { span: 22 },
         xl: { span: 22 },
         xxl: { span: 23 },
@@ -292,7 +292,7 @@ class CourseDetailForm extends React.Component {
                   </div>
                 </div>
             }
-            <span className="ant-form-text">图片建议格式位JPG/PNG，尺寸260*140，图片大小不超过10MB</span>
+            <span className="ant-form-text">图片建议格式位JPG/PNG，尺寸424*230，图片大小不超过10MB</span>
           </FormItem>
           <FormItem {...formItemModalLineLayout} label="标题">
             {getFieldDecorator('title', {

src/pages/coursegather/detail/CourseDetail.less

@@ -25,23 +25,24 @@
       position: absolute;
       width: 100%;
       height: 100%;
-      bottom: -230px;
+      bottom: 0;
       left: 0;
-      background: rgba(0,0,0,0.7);
-      transition: bottom 0.2s;
       opacity: 0;
       display: flex;
       align-items: center;
       justify-content: space-between;
       z-index: -10;
+      background: rgba(0,0,0,0.7);
+      transition: opacity  .3s linear;
+      border-radius: 6px;
     }
     .defaultImg {
       width: 424px;
       height: 230px;
+      border-radius: 6px;
     }
   }
   .defaultImgBox:hover .chooseType {
-    bottom: 0;
     opacity: 1;
     z-index: 0;
   }

src/pages/coursegather/detail/StaticBox.less

@@ -115,6 +115,7 @@
     .switchDay {
         position: absolute;
         width: 94%;
+        z-index: 11;
         .searchDay {
             justify-content: flex-end;
         }

src/pages/onlineclasses/singleclass/CourseDetail.js

@@ -307,7 +307,7 @@ class CourseDetailForm extends React.Component {
       labelCol: {
         xs: { span: 24 },
         sm: { span: 3 },
-        md: { span: 2 },
+        md: { span: 3 },
         lg: { span: 2 },
         xl: { span: 2 },
         xxl: { span: 1 },
@@ -315,7 +315,7 @@ class CourseDetailForm extends React.Component {
       wrapperCol: {
         xs: { span: 24 },
         sm: { span: 21 },
-        md: { span: 22 },
+        md: { span: 21 },
         lg: { span: 22 },
         xl: { span: 22 },
         xxl: { span: 23 },

src/pages/onlineclasses/singleclass/CourseDetail.less

@@ -25,23 +25,24 @@
       position: absolute;
       width: 100%;
       height: 100%;
-      bottom: -230px;
+      bottom: 0;
       left: 0;
-      background: rgba(0,0,0,0.7);
-      transition: bottom 0.2s;
       opacity: 0;
       display: flex;
       align-items: center;
       justify-content: space-between;
       z-index: -10;
+      background: rgba(0,0,0,0.7);
+      transition: opacity  .3s linear;
+      border-radius: 6px;
     }
     .defaultImg {
       width: 424px;
       height: 230px;
+      border-radius: 6px;
     }
   }
   .defaultImgBox:hover .chooseType {
-    bottom: 0;
     opacity: 1;
     z-index: 0;
   }