Merge branch 'feature/zhangleyuan/20210709/work-qrcode' into gray

src/bu-components/UploadProgressModal.jsx

@@ -98,6 +98,7 @@ class UploadProgressModal extends React.Component {
     // 开始上传之前初始化OssClient
     this.initOssClient(id, resourceName).then((result) => {
       const { ossClient, resourceId, callBack, callbackBody, ossUri } = result;
+      console.log('type',type);
       ossClient.multipartUpload(ossUri, fileContent, {
         callback: {
           url: callBack,

src/modules/root/Header.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2019-09-10 18:26:03
- * @LastEditors: yuananting
- * @LastEditTime: 2021-07-06 14:37:49
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-14 14:14:16
  * @Description:
  */
 import React, { useRef, useContext, useEffect, useState } from 'react';
@@ -36,7 +36,7 @@ function Header(props) {
   const [openDropdown, setOpenDropdown] = useState(false);
   const [instScroll, setInstScroll] = useState(false);
   const ctx = useContext(XMContext);
-  const htmlUrl = `${LIVE_SHARE}store/index?id=${User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
+  const htmlUrl = `${LIVE_SHARE}store/index?id=${User.getStoreId()}&userId=${User.getUserId()}`;
   const helpCenterUrl = 'https://www.yuque.com/wangzhong-zkqw0/qixue'; // 帮助中心
   const storeUserId = User.getStoreUserId();
   const enterpriseId = User.getEnterpriseId();
@@ -207,8 +207,9 @@ function Header(props) {
   }
 
   function handleConvertShortUrl() {
+    //提供给企业微信下的人员使用的码，用微信方式扫时页时获取企业微信的身份
     CourseService.getQrcode({
-      urls: [htmlUrl],
+      urls: [`${htmlUrl}&source=workWechat`],
     }).then((res) => {
       const { result = [] } = res;
       const qrcodeWrapDom = document.querySelector('#h5-qrcode');
@@ -343,7 +344,7 @@ function Header(props) {
                   <div className='h5-url'>
                     <div className='name'>手机端学院</div>
                     <div id='h5-qrcode'></div>
-                    <div className='tip'>微信扫码，打开学院</div>
+                    <div className='tip'>企业员工扫码登录学院</div>
                   </div>
                 </div>
               </div>

src/modules/root/Header.less

@@ -378,7 +378,7 @@
               .name,
               .tip {
                 width: 70px;
-                font-size: 14px;
+                font-size: 13px;
                 color: #333333;
                 line-height: 52px;
                 margin: 0 auto;