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

src/modules/course-manage/DataList/CourseData.jsx

@@ -93,6 +93,18 @@ class DataList extends React.Component {
 
   };
 
+  studentTypeEnum = (type)=> {
+    if (type === "STUDENT") {
+      return "学员"
+    }
+    if (type === "NON_STUDENT") {
+      return "待加入"
+    }
+    if (type === "GUEST") {
+      return "游客"
+    }
+  }
+
   // 进入直播次数列表
   getVisiterColumns() {
     const columns = [
@@ -190,7 +202,7 @@ class DataList extends React.Component {
     const columnsWorkWX = [
       {
         title: '学员姓名',
-        dataIndex: 'userName',
+        dataIndex: 'name',
       },
       {
         title: ()=> {
@@ -210,43 +222,16 @@ class DataList extends React.Component {
             </div>
           )
         },
-        dataIndex: 'phone',
+        dataIndex: 'studentTypeEnum',
         render: (text, record) => {
-          const { phone = '', bindingWeChat } = record;
-          return <div>{phone}</div>;
+          return <div>{this.studentTypeEnum(record.studentTypeEnum)}</div>;
         },
       },
       {
         title: '账号类型',
-        dataIndex: 'entryNum',
+        dataIndex: 'accountTypeEnum',
         render: (text, record) => {
-          if (text > 0) {
-            if (record.visitorInfoVOList && record.visitorInfoVOList.length > 0) {
-              const table = (
-                <XMTable
-                  renderEmpty={{
-                    image: college,
-                    description: '暂无数据',
-                  }}
-                  columns={this.getVisiterColumns()}
-                  dataSource={record.visitorInfoVOList}
-                  scroll={{ y: 75 }}
-                  size={'small'}
-                  style={{ width: 450 }}
-                  pagination={false}
-                />
-              );
-              return (
-                <Popover content={table} trigger='click'>
-                  <span className='handel-btn'>{text}</span>
-                </Popover>
-              );
-            } else {
-              return <div className='live-table--empty'>暂无观看数据</div>;
-            }
-          } else {
-            return <span>{text}</span>;
-          }
+          return record.accountTypeEnum === "ENTERPRISE_WECHAT" ? <span style={{color:"#5289FA"}}>企业微信</span> : <span style={{color:"#1DCC65"}}>微信</span>
         },
       },
       {

src/modules/course-manage/components/AddLiveClassInfoWorkWX.jsx

 import React, { useEffect, useState } from "react";
-import { DatePicker, TimePicker, Select } from 'antd';
+import { DatePicker, TimePicker, Select, message } from 'antd';
 import StoreService from "@/domains/store-domain/storeService";
 import "./AddLiveClassInfoWorkWX.less";
 import GraphicsEditor from "./GraphicsEditor";
@@ -35,9 +35,9 @@ export default function AddLiveClassInfoWorkWX(props) {
         setBeginDate(moment(props.data.startTime).startOf('day').valueOf())
         setEndTime(props.data.startTime+Number(props.data.duration))
         setEndDate(moment(props.data.startTime+Number(props.data.duration)).startOf('day').valueOf())
-
         setTeacherId(props.data.teacherId)
         setRemindTime(props.data.remindTime)
+        console.log(props.data)
     },[props.data])
 
     useEffect(()=> {
@@ -45,10 +45,20 @@ export default function AddLiveClassInfoWorkWX(props) {
         setIntroduce(intro)
     },[props.introduce])
 
+    function disabledDate(current) {
+        // Can not select days before today and today
+        return current && current < moment().startOf('day');
+    }
+
     //开始日期
     function onBeginDateChange(date, dateString) {
         if (date) {
+            if (date.isBefore(moment())) {
+                message.warning('开始日期不能早于当前日期')
+                setBeginDate(moment().startOf('day').valueOf())
+            } else {
                 setBeginDate(date.startOf('day').valueOf())
+            }
         } else {
             setBeginDate(0)
         }
@@ -64,6 +74,10 @@ export default function AddLiveClassInfoWorkWX(props) {
     }
 
     function onBeginTimeOK(time) {
+        if (time.isBefore(moment())) {
+            message.warning('开始时间不能早于当前时间')
+            return
+        }
         let begin = beginDate+(time.hour()*60+time.minute())*60*1000
         setBeginTime(begin)
         props.onChange("beginTime",begin)
@@ -91,6 +105,10 @@ export default function AddLiveClassInfoWorkWX(props) {
     }
 
     function onEndTimeOK(time) {
+        if (time.isSameOrBefore(moment(beginTime))) {
+            message.warning('结束时间不能早于开始时间')
+            return
+        }
         let end = endDate+(time.hour()*60+time.minute())*60*1000
         setEndTime(end)
         props.onChange("endTime",end)
@@ -163,6 +181,7 @@ export default function AddLiveClassInfoWorkWX(props) {
                 value={moment(beginDate)}
                 onChange={onBeginDateChange} 
                 onOk={onBeginDateOK} 
+                disabledDate={disabledDate}
                 />
                 <TimePicker 
                 value={beginTime===0?undefined:moment(beginTime)}
@@ -179,6 +198,9 @@ export default function AddLiveClassInfoWorkWX(props) {
                         value={moment(endDate)}
                         onChange={onEndDateChange} 
                         onOk={onEndDateOK} 
+                        disabledDate={(current)=> {
+                            return current && current < beginDate
+                        }}
                         />
                         <TimePicker 
                         value={endTime === 0?undefined:moment(endTime)}

src/modules/course-manage/components/CreateWorkWXCourse.jsx

@@ -39,7 +39,7 @@ const defaultBasicInfo = {
 
 
 const defaultClassInfo = {
-  teacherId: '', //讲师的Id
+  teacherId: null, //讲师的Id
   courseName: '', //课程名称
   duration: 3600000, //直播时长默认1小时
   remindTime: 0,  //提醒时间