Merge branch 'dev' of…

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

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

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-03-18 10:01:28
  * @Date: 2020-03-18 10:01:28
  * @LastEditors: yuananting
  * @LastEditors: yuananting
- * @LastEditTime: 2021-06-09 14:20:59
+ * @LastEditTime: 2021-06-09 14:44:01
  * @Description: 录音组件
  * @Description: 录音组件
  */
  */
 
 
@@ -88,7 +88,7 @@ class XMRecord extends Component {
   handleStartRecord = () => {
   handleStartRecord = () => {
     if(Platform.isWorkWx()) { // 企业微信
     if(Platform.isWorkWx()) { // 企业微信
       WechatApi.startRecord();
       WechatApi.startRecord();
-    } else {
+    }
     navigator.mediaDevices
     navigator.mediaDevices
     .getUserMedia({
     .getUserMedia({
       audio: true,
       audio: true,
@@ -98,7 +98,6 @@ class XMRecord extends Component {
       this.mMediaRecorder.start();
       this.mMediaRecorder.start();
       this.handleCountTime();
       this.handleCountTime();
     }, this.openDeviceFailure);
     }, this.openDeviceFailure);
-    }
   };
   };
 
 
   onProcessData = (audioData) => {
   onProcessData = (audioData) => {

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

@@ -32,7 +32,7 @@
       color: #666666;
       color: #666666;
       .input-box {
       .input-box {
         margin-bottom: 8px;
         margin-bottom: 8px;
-        display: inline-block;
+        // display: inline-block;
         *:not(p) {
         *:not(p) {
           font-weight: normal !important;
           font-weight: normal !important;
           font-size: 14px !important;
           font-size: 14px !important;