Merge branch 'master' into feature/zhangleyuan/20210619/yongzong-optimize

4de4930c · zhangleyuan · dbbb5ea8 · c380d5ba · 4de4930c · 4de4930c
Commit 4de4930c authored Jul 01, 2021 by zhangleyuan
7 changed files
--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -6,67 +6,67 @@
 * @Description: 大班直播分享弹窗
 */
-import React from 'react'
+import React from 'react';
-import { Modal, Button, message } from 'antd'
+import { Modal, Button, message } from 'antd';
-import domtoimage from 'dom-to-image'
+import domtoimage from 'dom-to-image';
-import qrcode from '@/libs/qrcode/qrcode.js'
+import qrcode from '@/libs/qrcode/qrcode.js';
-import User from '@/common/js/user'
+import User from '@/common/js/user';
-import $ from 'jquery'
+import $ from 'jquery';
-import _ from 'underscore'
+import _ from 'underscore';
-import CourseService from '@/domains/course-domain/CourseService'
+import CourseService from '@/domains/course-domain/CourseService';
-import './ShareLiveModal.less'
+import './ShareLiveModal.less';
 class ShareLiveModal extends React.Component {
  constructor(props) {
-    super(props)
+    super(props);
    this.state = {
      shareUrl: 'https://xiaomai5.com/liveShare?courseId=12',
-    }
+    };
  }
  componentDidMount() {
    // 获取短链接
-    this.handleConvertShortUrl()
+    this.handleConvertShortUrl();
  }
  handleConvertShortUrl = () => {
-    const { longUrl } = this.props.data
+    const { longUrl } = this.props.data;
    // 发请求
    CourseService.getQrcode({
      urls: [longUrl],
    }).then((res) => {
-      const { result = [] } = res
+      const { result = [] } = res;
      this.setState(
        {
          shareUrl: result[0].shortUrl,
        },
        () => {
-          const qrcodeWrapDom = document.querySelector('#qrcodeWrap')
+          const qrcodeWrapDom = document.querySelector('#qrcodeWrap');
          const qrcodeNode = new qrcode({
            text: this.state.shareUrl,
            size: 98,
-          })
+          });
-          qrcodeWrapDom.appendChild(qrcodeNode)
+          qrcodeWrapDom.appendChild(qrcodeNode);
-          const qrcodeWrapDomDownload = document.querySelector('#qrcodeWrap-dowload')
+          const qrcodeWrapDomDownload = document.querySelector('#qrcodeWrap-dowload');
          const qrcodeNodeDownLoad = new qrcode({
            text: this.state.shareUrl,
            size: 196,
-          })
+          });
-          qrcodeWrapDomDownload.appendChild(qrcodeNodeDownLoad)
+          qrcodeWrapDomDownload.appendChild(qrcodeNodeDownLoad);
        }
-      )
+      );
-    })
+    });
-  }
+  };
  componentWillUnmount() {
    // 页面销毁之前清空定时器
-    clearTimeout(this.timer)
+    clearTimeout(this.timer);
  }
  // 下载海报
@@ -79,31 +79,31 @@ class ShareLiveModal extends React.Component {
      () => {
        this.setState({ time: new Date().valueOf() }, () => {
          setTimeout(() => {
-            let node = document.getElementById('poster-dowload')
+            let node = document.getElementById('poster-dowload');
            domtoimage.toPng(node).then((imgData) => {
-              console.log(imgData)
+              console.log(imgData);
-              const download = document.createElement('a')
+              const download = document.createElement('a');
-              const { courseName } = this.props.data
+              const { courseName } = this.props.data;
-              $(download).attr('href', imgData).attr('download', `${courseName}.png`).get(0).click()
+              $(download).attr('href', imgData).attr('download', `${courseName}.png`).get(0).click();
-            })
+            });
-          }, 1000)
+          }, 1000);
-        })
+        });
      }
-    )
+    );
-  }
+  };
  // 复制分享链接
  handleCopy = () => {
-    const textContent = document.getElementById('shareUrl').innerText
+    const textContent = document.getElementById('shareUrl').innerText;
-    window.copyText(textContent)
+    window.copyText(textContent);
-    message.success('复制成功!')
+    message.success('复制成功!');
-  }
+  };
  render() {
-    const { courseDivision, data, type, title } = this.props
+    const { courseDivision, data, type, title } = this.props;
-    const { courseName, scheduleVideoUrl, courseMediaVOS, coverUrl } = data
+    const { courseName, scheduleVideoUrl, courseMediaVOS, coverUrl } = data;
-    const { shareUrl, showImg, time } = this.state
+    const { shareUrl, showImg, time } = this.state;
    // 判断是否是默认图, 默认图不需要在URL后面增加字符串
    let coverImgSrc = '';
    switch (type) {
@@ -111,21 +111,27 @@ class ShareLiveModal extends React.Component {
        if (courseMediaVOS && courseMediaVOS.length > 0) {
          data.courseMediaVOS.map((item, index) => {
            if (item.contentType === 'COVER') {
-              coverImgSrc = item.mediaUrl
+              coverImgSrc = item.mediaUrl;
+            } else {
+              coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
            }
-          })
+          });
        } else {
          coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
        }
        break;
      case 'videoClass': // 视频课
-        coverImgSrc = coverUrl || (courseDivision === 'internal' ? `${scheduleVideoUrl}?x-oss-process=video/snapshot,t_0,m_fast&anystring=anystring` : 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png')
+        coverImgSrc =
+          coverUrl ||
+          (courseDivision === 'internal'
+            ? `${scheduleVideoUrl}?x-oss-process=video/snapshot,t_0,m_fast&anystring=anystring`
+            : 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png');
        break;
      case 'graphicsClass': // 图文课
        coverImgSrc = coverUrl || 'https://image.xiaomaiketang.com/xm/wFnpZtp2yB.png';
        break;
      case 'offlineClass': // 线下课
-          coverImgSrc = coverUrl || 'https://image.xiaomaiketang.com/xm/pxbWKsYA87.png';
+        coverImgSrc = coverUrl || 'https://image.xiaomaiketang.com/xm/pxbWKsYA87.png';
        break;
    }
@@ -214,8 +220,8 @@ class ShareLiveModal extends React.Component {
          </div>
        </div>
      </Modal>
-    )
+    );
  }
 }
-export default ShareLiveModal
+export default ShareLiveModal;
--- a/src/modules/plan-manage/components/EmployeeShareData.jsx
+++ b/src/modules/plan-manage/components/EmployeeShareData.jsx
--- a/src/modules/plan-manage/components/UserLearningData.jsx
+++ b/src/modules/plan-manage/components/UserLearningData.jsx
--- a/src/modules/plan-manage/modal/relatedCourseModal.jsx
+++ b/src/modules/plan-manage/modal/relatedCourseModal.jsx
--- a/src/modules/teach-tool/examination-manager/ExamData.tsx
+++ b/src/modules/teach-tool/examination-manager/ExamData.tsx
--- a/src/modules/teach-tool/paper-manage/OperatePaper.jsx
+++ b/src/modules/teach-tool/paper-manage/OperatePaper.jsx
--- a/src/modules/teach-tool/paper-manage/OperatePaper.less
+++ b/src/modules/teach-tool/paper-manage/OperatePaper.less
@@ -6,6 +6,7 @@
    }
    .table-style {
      border: 1px solid #f0f0f0 !important;
+      margin-bottom: 70px;
    }
    .ant-tabs {
      color: #666666;