Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web

src/modules/course-manage/video-course/components/VideoCourseList.jsx

-/*
- * @Author: 吴文洁
- * @Date: 2020-08-05 10:12:45
- * @LastEditors: wufan
- * @LastEditTime: 2021-05-30 20:53:07
- * @Description: 视频课-列表模块
- * @Copyright: 杭州杰竞科技有限公司 版权所有
- */
-import React from 'react';
-import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
-import { PageControl } from "@/components";
+import React from "react"
+import { Table, Modal, message, Tooltip, Switch, Dropdown } from "antd"
+import _ from "underscore"
+import { PageControl } from "@/components"
+import { LIVE_SHARE } from "@/domains/course-domain/constants"
+
 import ShareLiveModal from "@/modules/course-manage/modal/ShareLiveModal"
 import WatchDataModal from "../modal/WatchDataModal"
 import CourseService from "@/domains/course-domain/CourseService"
@@ -142,10 +137,23 @@ class VideoCourseList extends React.Component {
         }
       },
       {
-        title: <span>
+        title: (
+          <span>
             <span>学院展示</span>
-          <Tooltip  title={<div>开启后，学员可在学院内查看到此课程。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px',fontWeight:'normal'}}>&#xe61d;</i></Tooltip>
-        </span>,
+            <Tooltip
+              title={
+                <div>
+                  开启后，学员可在学院内查看到此课程。
+                  <br />
+                  关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。
+                </div>
+              }>
+              <i className='icon iconfont' style={{ marginLeft: "5px", cursor: "pointer", color: "#bfbfbf", fontSize: "14px" }}>
+                &#xe61d;
+              </i>
+            </Tooltip>
+          </span>
+        ),
         width: 120,
         key: "shelfState",
         dataIndex: "shelfState",
@@ -240,12 +248,9 @@ class VideoCourseList extends React.Component {
               </If>
               <span className='operate__item split'> | </span>
               <Dropdown overlay={this.renderMoreOperate(record)}>
-                <span className="more-operate">
-                  <span className="operate-text">更多</span>
-                  <span
-                    className="iconfont icon"
-                    style={{ color: "#2966FF" }}
-                  >
+                <span className='more-operate'>
+                  <span className='operate-text'>更多</span>
+                  <span className='iconfont icon' style={{ color: "#2966FF" }}>
                     &#xe824;
                   </span>
                 </span>

src/modules/root/WechatLogin.less

@@ -9,34 +9,38 @@
     color: #999999;
     line-height: 20px;
   }
-  .rwm {
+  .rwm{
     position: relative;
-    width: 160px;
-    height: 160px;
+    width: 210px;
+    height: 210px;
     text-align: center;
     display: inline-block;
     margin-top: 24px;
-    .error {
+    border: 1px solid #e8e8e8;
+    border-radius: 2px;
+    padding:15px;
+    .error{
         position: absolute;
-      width: 100%;
-      height: 100%;
+        width: 200px;
+        height: 200px;
         background: rgba(255, 255, 255, 0.95);
         display: flex;
-      align-items: center;
-      justify-content: center;
-      left: 0px;
-      top: 0px;
-      div {
+        align-items:center;
+        justify-content:center;
+        left:5px;
+        top:5px;
+        div{
             margin: 0 10px;
             font-size: 14px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
             color: #333333;
             line-height: 20px;
+            
         }
-      .ope {
+        .ope{
             cursor: pointer;
-        color: rgba(82, 137, 250, 1);
+            color:rgba(82, 137, 250, 1);
         }
     }
   }

src/modules/teach-tool/examination-manager/Index.tsx

@@ -129,6 +129,7 @@ function ExaminationManager(props: any) {
         {
             title: "创建时间",
             dataIndex: "examCreateTime",
+            align:fixStr.right,
             sorter: true,
             sortOrder: field === "examCreateTime" ? order : sortStatus.type,
             render: (text: any, record: any) => <span>{moment(text).format("YYYY-MM-DD HH:mm")}</span>,