Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev

# Conflicts:
#	src/modules/root/Menu.tsx

src/common/js/user.ts

@@ -12,6 +12,10 @@ import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
 declare var window:any;
 class User {
   
+  getExpirationTime() {
+    return Storage.get(`${PREFIX}_expiration_time`)
+  }
+
   getVersion() {
     return Storage.getObj(`${PREFIX}_version`)
   }
@@ -56,6 +60,10 @@ class User {
     return Storage.get(`${PREFIX}_isAdmin`);
   }
 
+  setExpirationTime(value:number) {
+    return Storage.set(`${PREFIX}_expiration_time`,value)
+  }
+
   setVersion(value:any) {
     return Storage.setObj(`${PREFIX}_version`,value)
   }

src/modules/course-manage/AddLive.jsx

@@ -269,6 +269,15 @@ handleChangeBasicInfo = (field, value) => {
 
    // 完成创建/编辑
   handleSubmit = () => {
+    //过期判断
+    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
+      Modal.warning({
+        title:"服务已到期",
+        content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
+        okText: "我知道了"
+      })
+      return
+    }
     const { addLiveBasicInfo, addLiveClassInfo, addLiveIntroInfo, id, isEdit, type } = this.state;
     const {liveDate, timeHorizonStart} = addLiveClassInfo;
     const _liveDate = moment(liveDate).format("YYYY-MM-DD");

src/modules/course-manage/graphics-course/AddGraphicsCourse.jsx

@@ -10,7 +10,7 @@
 import React from 'react';
 import { Button, Input, Radio, message, Modal, Cascader } from 'antd';
 import $ from 'jquery';
-
+import moment from 'moment';
 import { DISK_MAP, FileTypeIcon, FileVerifyMap } from '@/common/constants/academic/lessonEnum';
 import { ImgCutModalNew } from '@/components';
 import ShowTips from '@/components/ShowTips';
@@ -390,6 +390,15 @@ class AddGraphicsCourse extends React.Component {
 
   // 保存
   handleSubmit = () => {
+    //过期判断
+    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
+      Modal.warning({
+        title:"服务已到期",
+        content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
+        okText: "我知道了"
+      })
+      return
+    }
     const { id, coverId, pageType, courseName, courseMedia, introduce, categoryId, shelfState, whetherVisitorsJoin } = this.state;
 
     const commonParams = {

src/modules/course-manage/offline-course/AddOfflineCourse.jsx

@@ -466,6 +466,15 @@ class AddOfflineCourse extends React.Component {
   };
 
   preSubmit = () => {
+    //过期判断
+    if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
+      Modal.warning({
+        title:"服务已到期",
+        content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
+        okText: "我知道了"
+      })
+      return
+    }
     const { courseId } = this.state;
     if (courseId) {
       this.checkDetail(courseId).then(bool => bool ? this.handleSubmit() : message.warning('课程已开始，无法继续编辑'))

src/modules/course-manage/video-course/AddVideoCourse.jsx

@@ -14,7 +14,7 @@ import { DISK_MAP, FileTypeIcon, FileVerifyMap } from '@/common/constants/academ
 import { ImgCutModalNew } from '@/components'
 import ShowTips from '@/components/ShowTips'
 import Breadcrumbs from '@/components/Breadcrumbs'
-
+import moment from 'moment'
 import AddVideoIntro from './components/AddVideoIntro'
 import SelectStudent from '../modal/select-student'
 import SelectPrepareFileModal from '../../prepare-lesson/modal/SelectPrepareFileModal'
@@ -321,6 +321,15 @@ class AddVideoCourse extends React.Component {
 
   // 保存
   handleSubmit = () => {
+        //过期判断
+        if (User.getExpirationTime() && moment().valueOf() > Number(User.getExpirationTime())) {
+          Modal.warning({
+            title:"服务已到期",
+            content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
+            okText: "我知道了"
+          })
+          return
+        }
     const { instId, adminId } = window.currentUserInstInfo
 
     const {

src/modules/home/Home.jsx

@@ -41,8 +41,7 @@ function HomeTip() {
         setExpirationTime(moment(res.result.validEndTime).format("YYYY-MM-DD"))
         if (res.result.stateEnum === "NO") {
           setTipType(2)
-        }
-        if (res.result.surplusDayTime === 30 || res.result.surplusDayTime <= 7) {
+        } else if (res.result.surplusDayTime === 30 || res.result.surplusDayTime <= 7) {
           setTipType(1)
         }
     })

src/modules/root/CollegeManagePage.jsx

@@ -144,6 +144,7 @@ export default class CollegeManagePage extends React.Component {
     BaseService.getLesseeVersionMsg()
     .then(res=> {
       User.setVersion(res.result)
+      User.setExpirationTime(res.result.validEndTime)
       this.setState({
         surplusDayTime: res.result.stateEnum === "NO" ? 0 : res.result.surplusDayTime,
         endTime: res.result.validEndTime

src/modules/root/Menu.tsx

@@ -37,7 +37,7 @@ function VersionPanel(props: any) {
     BaseService.getLesseeVersionMsg().then((res) => {
       let version = res.result;
       User.setVersion(version);
-
+      User.setExpirationTime(res.result.validEndTime)
       let versioninfo = {
         userNum: version.userNum === -1 ? '不限人数' : version.userNum,
         surplusUserNum: version.userNum === -1 ? '不限人数' : version.surplusUserNum,