fix:合并周优化并解决冲突

src/modules/teach-tool/components/CourseCategoryManage.jsx

 /*
 /*
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-02-23 18:28:50
  * @Date: 2021-02-23 18:28:50
- * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-06-25 14:35:20
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-07-23 15:03:50
  * @Description: 助学工具-课程分类
  * @Description: 助学工具-课程分类
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */

src/modules/teach-tool/components/CourseCategoryManage.less

@@ -31,7 +31,7 @@
         height: 44px;
         height: 44px;
         padding: 0;
         padding: 0;
         span {
         span {
-          line-height: 44px;
+          line-height: 47px;
           vertical-align: middle;
           vertical-align: middle;
         }
         }
         .ant-tree-node-content-wrapper.ant-tree-node-selected {
         .ant-tree-node-content-wrapper.ant-tree-node-selected {
@@ -45,10 +45,10 @@
             *.node-title-div {
             *.node-title-div {
               width: 100%;
               width: 100%;
               display: flex;
               display: flex;
-              justify-content: space-between;
               .title-opts {
               .title-opts {
                 visibility: hidden;
                 visibility: hidden;
-                margin-right: 16px;
+                margin-left: 24px;
+                margin-bottom: 4px;
               }
               }
             }
             }
           }
           }

src/modules/teach-tool/components/XMAudio.less

@@ -8,8 +8,8 @@
 .xm-audio {
 .xm-audio {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
-  width: 280px;
-  padding: 10px 20px;
+  width: 315px;
+  padding: 10px 0 10px 20px;
   border-radius: 5px;
   border-radius: 5px;
   background-color: #ffffff;
   background-color: #ffffff;
   .audio-image {
   .audio-image {

src/modules/teach-tool/paper-manage/modal/PreviewPaperModal.less

@@ -101,7 +101,6 @@
       .voice-box {
       .voice-box {
         margin-bottom: 12px;
         margin-bottom: 12px;
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-        padding: 10px 20px;
         width: 320px;
         width: 320px;
       }
       }
     }
     }

src/modules/teach-tool/question-manage/components/OperateQuestionTab.less

@@ -314,7 +314,6 @@
         .audio-box {
         .audio-box {
           position: relative;
           position: relative;
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
           width: 320px;
           margin-bottom: 12px;
           margin-bottom: 12px;
           .icon_sider {
           .icon_sider {

src/modules/teach-tool/question-manage/modal/PreviewQuestionModal.less

@@ -68,7 +68,6 @@
       .voice-box {
       .voice-box {
         margin-bottom: 12px;
         margin-bottom: 12px;
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
         box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-        padding: 10px 20px;
         width: 320px;
         width: 320px;
       }
       }
     }
     }
@@ -144,7 +143,6 @@
         .voice-box {
         .voice-box {
           margin-bottom: 12px;
           margin-bottom: 12px;
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
           width: 320px;
         }
         }
       }
       }
@@ -248,7 +246,6 @@
         margin-bottom: 16px;
         margin-bottom: 16px;
         .audio-box {
         .audio-box {
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
           box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
-          padding: 10px 20px;
           width: 320px;
           width: 320px;
           margin-bottom: 12px;
           margin-bottom: 12px;
         }
         }