Commit 01832c4a by maolipeng

Merge branch 'feature/zhujian/0726/qwLiving' into gray

parents fab2e284 39cbb390
...@@ -17,7 +17,7 @@ import { LIVE_SHARE } from '@/domains/course-domain/constants'; ...@@ -17,7 +17,7 @@ import { LIVE_SHARE } from '@/domains/course-domain/constants';
import CourseService from '@/domains/course-domain/CourseService'; import CourseService from '@/domains/course-domain/CourseService';
import { QuestionCircleOutlined } from '@ant-design/icons'; import { QuestionCircleOutlined } from '@ant-design/icons';
import { Dropdown, message, Badge, Modal, Switch, Tooltip, Menu } from 'antd'; import { Dropdown, message, Badge, Modal, Switch, Tooltip, Menu } from 'antd';
import React from 'react'; import React, { Fragment } from 'react';
import { Route, withRouter } from 'react-router-dom'; import { Route, withRouter } from 'react-router-dom';
import _ from 'underscore'; import _ from 'underscore';
import DataList from '../DataList/DataList'; import DataList from '../DataList/DataList';
...@@ -793,14 +793,12 @@ class LiveCourseList extends React.Component { ...@@ -793,14 +793,12 @@ class LiveCourseList extends React.Component {
if (!isWorkWx()) { if (!isWorkWx()) {
Modal.warning({ Modal.warning({
title: '提示', title: '提示',
content: ()=> { content: (
return ( <Fragment>
<>
<div>请使用企业微信进入直播间</div> <div>请使用企业微信进入直播间</div>
<div style={{color:"#999999"}}>备注:Mac版企业微信暂不支持进入直播间</div> <div style={{color:"#999999"}}>备注:Mac版企业微信暂不支持进入直播间</div>
</> </Fragment>
) )
}
}) })
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment