Merge branch 'dev' of…

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

src/modules/resource-disk/components/FolderList.jsx

@@ -402,8 +402,8 @@ class FolderList extends React.Component {
         title: '操作',
         title: '操作',
         key: 'operate',
         key: 'operate',
         render: (value, record) => {
         render: (value, record) => {
-          if (!(currentRootDisk.disk === 'COMMON' && (folderPathList.length === 1 || record.folderType === 'FOLDER')) ||
-            hasManagementAuthority) {
+          if ((!(currentRootDisk.disk === 'COMMON' && (folderPathList.length === 1 || record.folderType === 'FOLDER')) ||
+            hasManagementAuthority) && !(record.rights==="LOOK") ){
             return (
             return (
               <Dropdown overlay={this.renderMenu(record)} trigger={['hover']}>
               <Dropdown overlay={this.renderMenu(record)} trigger={['hover']}>
                 <span className="icon iconfont">&#xe62c;</span>
                 <span className="icon iconfont">&#xe62c;</span>
@@ -739,7 +739,7 @@ class FolderList extends React.Component {
               <span onClick={() => { this.handleDownload(record) }}>下载</span>
               <span onClick={() => { this.handleDownload(record) }}>下载</span>
             </Menu.Item>
             </Menu.Item>
           }
           }
-          {(currentRootDisk.disk === 'COMMON' && (rights === "LOOK_DOWNLOAD" || rights === 'EDIT') ) &&
+          {(rights === "LOOK_DOWNLOAD" || rights === 'EDIT') &&
            
            
             <Menu.Item key="copy">
             <Menu.Item key="copy">
               <span onClick={() => this.handleShowCopyFileModal(record)}>复制到</span>
               <span onClick={() => this.handleShowCopyFileModal(record)}>复制到</span>

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:44:01
+ * @LastEditTime: 2021-06-09 15:54:34
  * @Description: 录音组件
  * @Description: 录音组件
  */
  */
 
 
@@ -87,17 +87,28 @@ class XMRecord extends Component {
 
 
   handleStartRecord = () => {
   handleStartRecord = () => {
     if(Platform.isWorkWx()) { // 企业微信
     if(Platform.isWorkWx()) { // 企业微信
-      WechatApi.startRecord();
+      WechatApi.startRecord({
+        success: function (res) {
+          alert("开始录音", res)
+          this.mMediaRecorder = new AudioRecorder(res);
+          this.mMediaRecorder.start();
+          this.handleCountTime();
+        },
+        fail: function (res) {
+          alert("未开始录音", res)
+        }
+      });
+    } else {
+      navigator.mediaDevices
+      .getUserMedia({
+        audio: true,
+      })
+      .then((stream) => {
+        this.mMediaRecorder = new AudioRecorder(stream);
+        this.mMediaRecorder.start();
+        this.handleCountTime();
+      }, this.openDeviceFailure);
     }
     }
-    navigator.mediaDevices
-    .getUserMedia({
-      audio: true,
-    })
-    .then((stream) => {
-      this.mMediaRecorder = new AudioRecorder(stream);
-      this.mMediaRecorder.start();
-      this.handleCountTime();
-    }, this.openDeviceFailure);
   };
   };
 
 
   onProcessData = (audioData) => {
   onProcessData = (audioData) => {