Merge branch 'feature/wufan/20210513/replace-text' into…

Merge branch 'feature/wufan/20210513/replace-text' into feature/zhangleyuan/20210511/more-college-optimize

src/bu-components/ChooseMembersModal.jsx

@@ -19,7 +19,7 @@ class ChooseMembersModal extends React.Component {
     this.state = {
       allUserList : [],                               // 所有成员列表
       selectUserList: [],                             // 已选则成员
-      temporaryList: [],                              // 临时用户成员列表（搜索时使用）
+      temporaryList: [],                              // 临时学员成员列表（搜索时使用）
       instId : window.currentUserInstInfo.instId,     // 机构Id
       searchKey : null,                                 // 搜索内容  
       selectedRowKeys : [],                            // 勾选的成员  
@@ -229,7 +229,7 @@ class ChooseMembersModal extends React.Component {
   selectedColumnsRight = () => {
     const selectColumns = [
       {
-        title: '用户名',
+        title: '学员名',
         key: 'adminNameRight',
         dataIndex: 'adminName',
         width: '70%',

src/domains/course-domain/CourseService.ts

 /*
  * @Author: wufan
  * @Date: 2020-11-25 18:25:02
- * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-22 13:58:04
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:25:01
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -23,7 +23,7 @@ export default class courseService {
     return getQrcode(params);
   }
 
-  // 获取用户上课数据
+  // 获取学员上课数据
   static fetchUserData(params: any) {
     return fetchUserData(params);
   }

src/modules/college-manage/UserManagePage.tsx

 /*
  * @Author: wufan
  * @Date: 2020-11-30 10:47:38
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-02-02 10:22:34
- * @Description: 用户管理页面
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 17:45:53
+ * @Description: 学员管理页面
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -60,7 +60,7 @@ function UserManagePage() {
   function parseColumn() {
     const list = [
       {
-        title: "用户姓名",
+        title: "学员姓名",
         dataIndex: "nickName",
         render: (val: string, item: any) => {
           return (
@@ -117,16 +117,16 @@ function UserManagePage() {
 
   return (
     <div className=" page user-manage-page">
-        <div className="content-header">用户管理</div>
+        <div className="content-header">学员管理</div>
         <div className="box">
           <div className="box-header">
             <div className="header-item">
-              <span className="item-name">搜索用户：</span>
+              <span className="item-name">搜索学员：</span>
               <Search
                 style={{
                   width: 300,
                 }}
-                placeholder="搜索用户姓名/手机号"
+                placeholder="搜索学员姓名/手机号"
                 onSearch={(value) => {
                   const _query = { ...query };
                   if (value) {
@@ -149,7 +149,7 @@ function UserManagePage() {
 
             </div>
             <div className="header-item">
-              <span className="item-name">用户来源：</span>
+              <span className="item-name">学员来源：</span>
                 <Select
                   style={{ width: '100%' }}
                   placeholder="请选择"
@@ -195,7 +195,7 @@ function UserManagePage() {
             onClick={() => {
               handleToAddEmployee();
             }}
-          >添加用户</Button>
+          >添加学员</Button>
         }
         <div className="box-body">
           <Table

src/modules/college-manage/modal/ChooseMembersModal.jsx

@@ -21,7 +21,7 @@ class ChooseMembersModal extends React.Component {
       isOpen: props.isOpen,
       allUserList : [],                               // 所有成员列表
       selectUserList: [],                             // 已选则成员
-      temporaryList: [],                              // 临时用户成员列表（搜索时使用）
+      temporaryList: [],                              // 临时学员成员列表（搜索时使用）
       instId : window.currentUserInstInfo.instId,     // 机构Id
       searchKey : null,                                 // 搜索内容  
       selectedRowKeys : [],                            // 勾选的成员  
@@ -230,7 +230,7 @@ class ChooseMembersModal extends React.Component {
   selectedColumnsRight = () => {
     const selectColumns = [
       {
-        title: '用户名',
+        title: '学员名',
         key: 'nameRight',
         dataIndex: 'name',
         width: '70%',
@@ -274,7 +274,7 @@ class ChooseMembersModal extends React.Component {
       isOpen,
       selectObject,
     } = this.state;
-    const title = type === 'USER' ? '添加员工' : '添加用户';
+    const title = type === 'USER' ? '添加员工' : '添加学员';
     return (    
       <div>
         {/* 添加学员页面 */}
@@ -284,7 +284,7 @@ class ChooseMembersModal extends React.Component {
           onCancel={() => this.handleClose()}
           onOk={() => {
             if (_.isEmpty(selectUserList)) {
-              message.warning(type === 'USER' ? '请选择员工' : '请选择用户')
+              message.warning(type === 'USER' ? '请选择员工' : '请选择学员')
               return null;
             }
             type === 'USER' ? this.setState({ openSetModal: true, isOpen: false }) : this.addCustomer();
@@ -341,7 +341,7 @@ class ChooseMembersModal extends React.Component {
             </div>
             {/* 已选择的成员列表 */}
             <div className='container-right'>
-              <span className='span-left'>已选择{type === 'USER' ? '员工' : '用户'}</span>
+              <span className='span-left'>已选择{type === 'USER' ? '员工' : '学员'}</span>
               <div className='span-right' onClick={() => this.clearAllUser()}>
                 <span className={ (selectUserList.length > 0) ? 'span-right-l' : null }>清空</span>
               </div>

src/modules/college-manage/modal/SetEmployeeModal.jsx

@@ -88,7 +88,7 @@ export default class SetEmployeeModal extends React.Component {
               <Radio value={"Cloud_Operator"} className="mt-4">
                 <span style={{ color: "#333" }}>运营师</span>
                 <p className="radio-tip">
-                  仅可查看/转发培训计划内容，并查看负责的用户学习进度
+                  仅可查看/转发培训计划内容，并查看负责的学员学习进度
                 </p>
               </Radio>
               <Radio value={"Cloud_Lecturer"} className="mt-4">

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

@@ -106,7 +106,7 @@ class DataList extends React.Component {
   getStudentColumns() {
     const columns = [
       {
-        title: "用户姓名",
+        title: "学员姓名",
         dataIndex: "userName",
       },
       {
@@ -304,9 +304,9 @@ class DataList extends React.Component {
           </div>
         </div>
 
-        {/* 用户上课数据 */}
+        {/* 学员上课数据 */}
         <div className="courseData-student">
-          <p className="title">用户上课数据</p>
+          <p className="title">学员上课数据</p>
           <div className="filter-wrap">
             <div className="filter">
               <Button

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

@@ -56,7 +56,7 @@ class PlaybackData extends React.Component {
   getPlaybackColumns() {
     const columns = [
       {
-        title: "观看用户",
+        title: "观看学员",
         dataIndex: "userName",
       },
       {

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

@@ -132,8 +132,8 @@ class AddLiveIntro extends React.Component {
             </div>  
             <div>
               <div class="instro-text">
-                <div>开启：允许未绑定手机号的用户进入直播间观看直播</div>
-                <div>关闭：仅限绑定了手机号的用户可以进入直播间观看直播</div>
+                <div>开启：允许未绑定手机号的学员进入直播间观看直播</div>
+                <div>关闭：仅限绑定了手机号的学员可以进入直播间观看直播</div>
               </div>
             </div> 
           </div>

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

@@ -262,7 +262,7 @@ class LiveCourseList extends React.Component {
         {
           title: <span>
             <span>学院展示</span>
-            <Tooltip  title={<div>开启后，用户可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
+            <Tooltip  title={<div>开启后，学员可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
           </span>,
           width: "9%",
           key: "shelfState",
@@ -580,7 +580,7 @@ class LiveCourseList extends React.Component {
   handleDelete = (record)=>{
     return  confirm({
       title: '你确定要删除直播课？',
-      content: '删除后，用户将不能观看直播课/回放',
+      content: '删除后，学员将不能观看直播课/回放',
       icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
       okText: '删除',
       okType: 'danger',
@@ -658,7 +658,7 @@ class LiveCourseList extends React.Component {
   }
   getDownloadVersion() {
     const isMac = /macintosh|mac os x/i.test(navigator.userAgent);
-    // 判断用户系统
+    // 判断学员系统
     let platform;
     if(!isMac){
       platform = 1

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

@@ -28,7 +28,7 @@ class LiveCourseOpt extends React.Component {
   // 下载直播客户端
   handleDownloadClient = () => {
     const { isMac } = this.state;
-    // 判断用户系统
+    // 判断学员系统
     let platform;
     if(!isMac){
       platform = 1

src/modules/course-manage/graphics-course/components/AddGraphicsIntro.jsx

@@ -118,8 +118,8 @@ class AddGraphicsIntro extends React.Component {
             </div>  
             <div>
               <div className="desc">
-                <div>开启：允许未绑定手机号的用户观看</div>
-                <div>关闭：仅限绑定了手机号的用户可以进入观看图文课</div>
+                <div>开启：允许未绑定手机号的学员观看</div>
+                <div>关闭：仅限绑定了手机号的学员可以进入观看图文课</div>
               </div>
             </div> 
           </div>
@@ -133,8 +133,8 @@ class AddGraphicsIntro extends React.Component {
                 </Col>  
                 <Col span={21}>
                   <div className="desc">
-                    <div>开启：图文课将在用户学院图文课列表中展示</div>
-                    <div>关闭：图文课将在用户学院图文课列表中隐藏</div>
+                    <div>开启：图文课将在学员学院图文课列表中展示</div>
+                    <div>关闭：图文课将在学员学院图文课列表中隐藏</div>
                   </div>
                 </Col> 
               </Row>

src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:12:45
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-27 16:24:47
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:32:38
  * @Description: 视频课-列表模块
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
@@ -137,7 +137,7 @@ class GraphicsCourseList extends React.Component {
       {
         title: <span>
           <span>学院展示</span>
-          <Tooltip  title={<div>开启后，用户可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
+          <Tooltip  title={<div>开启后，学员可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
         </span>,
         width: 120,
         dataIndex: "courseware",
@@ -148,7 +148,7 @@ class GraphicsCourseList extends React.Component {
         },
       },
       {
-        title: "观看用户数",
+        title: "观看学员数",
         width: 110,
         key: "watchUserCount",
         dataIndex: "watchUserCount",

src/modules/course-manage/graphics-course/modal/WatchDataModal.jsx

@@ -84,7 +84,7 @@ class WatchDataModal extends React.Component {
   parseColumns = () => {
     const columns = [
       {
-        title: '观看用户',
+        title: '观看学员',
         key: 'name',
         dataIndex: 'name'
       },
@@ -141,7 +141,7 @@ class WatchDataModal extends React.Component {
           closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
         >
           <div className="search-container">
-            <Search placeholder="搜索用户姓名/手机号"  style={{ width: 200 }}  onChange={(e) => { this.handleChangNickname(e.target.value)}}  onSearch={ () => { this.handleFetchDataList()}} enterButton={<span className="icon iconfont">&#xe832;</span>}/>
+            <Search placeholder="搜索学员姓名/手机号"  style={{ width: 200 }}  onChange={(e) => { this.handleChangNickname(e.target.value)}}  onSearch={ () => { this.handleFetchDataList()}} enterButton={<span className="icon iconfont">&#xe832;</span>}/>
           </div>
           <div>
             <Table

src/modules/course-manage/modal/ShareLiveModal.jsx

@@ -197,10 +197,10 @@ class ShareLiveModal extends React.Component {
         <div className="share-poster right__item">
           <div className="title">① 海报分享</div>
           { type === "liveClass" && 
-            <div className="sub-title">用户可通过微信扫描海报二维码，观看{title}</div>
+            <div className="sub-title">学员可通过微信扫描海报二维码，观看{title}</div>
           }
           { type === "videoClass" && 
-            <div className="sub-title">用户可通过微信识别二维码，报名观看{title}</div>
+            <div className="sub-title">学员可通过微信识别二维码，报名观看{title}</div>
           }
 
           <div className="content" onClick={this.handleDownloadPoster}>下载海报</div>
@@ -209,10 +209,10 @@ class ShareLiveModal extends React.Component {
         <div className="share-url right__item">
           <div className="title">② 链接分享</div>
           { type === "liveClass" && 
-            <div className="sub-title">用户可通过微信打开以下链接，观看{title}</div>
+            <div className="sub-title">学员可通过微信打开以下链接，观看{title}</div>
           }
             { type === "videoClass" && 
-            <div className="sub-title">用户可通过打开链接，报名观看{title}</div>
+            <div className="sub-title">学员可通过打开链接，报名观看{title}</div>
           }
           <div className="content url-content">
             <div className="share-url" id="shareUrl">{shareUrl}</div>

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

@@ -121,8 +121,8 @@ class AddVideoIntro extends React.Component {
             </div>  
             <div>
               <div className="desc">
-                <div>开启：允许未绑定手机号的用户观看</div>
-                <div>关闭：仅限绑定了手机号的用户可以进入观看视频</div>
+                <div>开启：允许未绑定手机号的学员观看</div>
+                <div>关闭：仅限绑定了手机号的学员可以进入观看视频</div>
               </div>
             </div> 
           </div>
@@ -136,8 +136,8 @@ class AddVideoIntro extends React.Component {
                 </Col>  
                 <Col span={21}>
                   <div className="desc">
-                    <div>开启：此视频将在用户学院的视频列表中出现</div>
-                    <div>关闭：此视频将在用户学院的视频列表中隐藏</div>
+                    <div>开启：此视频将在学员学院的视频列表中出现</div>
+                    <div>关闭：此视频将在学员学院的视频列表中隐藏</div>
                   </div>
                 </Col> 
               </Row>

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

 /*
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:12:45
- * @LastEditors: yuananting
- * @LastEditTime: 2021-03-24 19:34:48
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:34:11
  * @Description: 视频课-列表模块
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
@@ -126,7 +126,7 @@ class VideoCourseList extends React.Component {
       {
         title: <span>
           <span>学院展示</span>
-          <Tooltip  title={<div>开启后，用户可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
+          <Tooltip  title={<div>开启后，学员可在学院内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
         </span>,
         width: 120,
         dataIndex: "courseware",
@@ -137,7 +137,7 @@ class VideoCourseList extends React.Component {
         },
       },
       {
-        title: "观看用户数",
+        title: "观看学员数",
         width: 110,
         key: "watchUserCount",
         dataIndex: "watchUserCount",

src/modules/course-manage/video-course/modal/WatchDataModal.jsx

@@ -84,7 +84,7 @@ class WatchDataModal extends React.Component {
   parseColumns = () => {
     const columns = [
       {
-        title: '观看用户',
+        title: '观看学员',
         key: 'name',
         dataIndex: 'name'
       },
@@ -133,7 +133,7 @@ class WatchDataModal extends React.Component {
           closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
         >
           <div className="search-container">
-            <Search placeholder="搜索用户姓名/手机号"  style={{ width: 200 }}  onChange={(e) => { this.handleChangNickname(e.target.value)}}  onSearch={ () => { this.handleFetchDataList()}} enterButton={<span className="icon iconfont">&#xe832;</span>}/>
+            <Search placeholder="搜索学员姓名/手机号"  style={{ width: 200 }}  onChange={(e) => { this.handleChangNickname(e.target.value)}}  onSearch={ () => { this.handleFetchDataList()}} enterButton={<span className="icon iconfont">&#xe832;</span>}/>
           </div>
           <div>
             <Table

src/modules/home/Home.jsx

@@ -266,7 +266,7 @@ class Home extends React.Component {
           <div className="data-item">
             <div className="header">
               <img className="header-icon" src="https://image.xiaomaiketang.com/xm/wAaFtjeRsM.png" />
-              <span className="header-word">用户总数 (人)</span>
+              <span className="header-word">学员总数 (人)</span>
             </div>
             <div className="data-number">{totalCustomerNum}</div>
             <div className="data-footer">

src/modules/knowledge-base/components/CourseData.jsx

@@ -2,8 +2,8 @@
  * @Description: 
  * @Author: zangsuyun
  * @Date: 2021-03-15 16:51:40
- * @LastEditors: zangsuyun
- * @LastEditTime: 2021-04-10 16:13:07
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:34:39
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -116,7 +116,7 @@ class CourseData extends React.Component {
   getStudentColumns() {
     const columns = [
       {
-        title: "用户姓名",
+        title: "学员姓名",
         dataIndex: "userName",
       },
       {
@@ -314,9 +314,9 @@ class CourseData extends React.Component {
           </div>
         </div>
 
-        {/* 用户上课数据 */}
+        {/* 学员上课数据 */}
         <div className="courseData-student">
-          <p className="title">用户上课数据</p>
+          <p className="title">学员上课数据</p>
           <div className="filter-wrap">
             <div className="filter">
               <Button

src/modules/knowledge-base/components/KnowledgeBaseList.jsx

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: zangsuyun
  * @Date: 2021-03-12 14:49:40
- * @LastEditors: zangsuyun
- * @LastEditTime: 2021-04-12 10:31:53
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:35:41
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -251,7 +251,7 @@ class KnowledgeBaseList extends React.Component {
                       {record.hideToUser && (
                         <Tooltip
                           title={
-                            <div>课程未成功开课，已在用户知识列表中隐藏</div>
+                            <div>课程未成功开课，已在学员知识列表中隐藏</div>
                           }
                         >
                           <i
@@ -423,7 +423,7 @@ class KnowledgeBaseList extends React.Component {
         },
       },
       {
-        title: "观看用户数",
+        title: "观看学员数",
         key: "watchUserCount",
         dataIndex: "watchUserCount",
         align:'right',

src/modules/knowledge-base/components/PlayBackData.jsx

@@ -56,7 +56,7 @@ class PlaybackData extends React.Component {
   getPlaybackColumns() {
     const columns = [
       {
-        title: "观看用户",
+        title: "观看学员",
         dataIndex: "userName",
       },
       {

src/modules/knowledge-base/components/WatchDataModal.jsx

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: zangsuyun
  * @Date: 2021-03-16 10:18:31
- * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-30 10:17:59
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:36:00
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -101,7 +101,7 @@ class WatchDataModal extends React.Component {
     const { type } = this.props;
     const columns = [
       {
-        title: "观看用户",
+        title: "观看学员",
         key: "name",
         dataIndex: "name",
       },
@@ -195,7 +195,7 @@ class WatchDataModal extends React.Component {
       <div className="watch-data">
         <div className="search-container">
           <Search
-            placeholder="搜索用户姓名/手机号"
+            placeholder="搜索学员姓名/手机号"
             style={{ width: 200 }}
             onChange={(e) => {
               this.handleChangNickname(e.target.value);

src/modules/plan-manage/LearningData.jsx

@@ -102,7 +102,7 @@ class LearningData extends React.Component {
             <Tabs.TabPane tab="员工分享数据" key="employeeShareData" forceRender="true">
                 <EmployeeShareData/>
             </Tabs.TabPane>
-            <Tabs.TabPane tab="用户学习数据" key="userLearningData" forceRender="true">
+            <Tabs.TabPane tab="学员学习数据" key="userLearningData" forceRender="true">
                 <UserLearningData/>
             </Tabs.TabPane>
           </Tabs>)

src/modules/plan-manage/components/BasicInfo.jsx

 /*
  * @Author: zhangleyuan
  * @Date: 2021-02-20 16:45:51
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-27 11:20:27
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:36:26
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -267,8 +267,8 @@ class BasicInfo extends React.Component{
               </div>  
               <div>
                 <div className="instro-text">
-                  <div>开启：此培训计划可以分享给用户进行学习</div>
-                  <div>关闭：此培训计划暂不可分享给用户进行学习，后续可开启</div>
+                  <div>开启：此培训计划可以分享给学员进行学习</div>
+                  <div>关闭：此培训计划暂不可分享给学员进行学习，后续可开启</div>
                 </div>
               </div> 
             </div>
@@ -313,7 +313,7 @@ class BasicInfo extends React.Component{
               <div>
                 <div className="live-standard-info">
                   <span className="icon iconfont">&#xe865;</span>
-                  <span className="instro">直播课单个课程，用户学习进度达到
+                  <span className="instro">直播课单个课程，学员学习进度达到
                     <Input
                       width="40" 
                       value={percentCompleteLive} 
@@ -326,7 +326,7 @@ class BasicInfo extends React.Component{
                 </div>
                 <div className="live-standard-info">
                   <span className="icon iconfont">&#xe864;</span>
-                  <span className="instro">视频课单个课程，用户学习进度达到
+                  <span className="instro">视频课单个课程，学员学习进度达到
                     <Input  
                       width="40" 
                       value={percentCompleteVideo} 
@@ -339,7 +339,7 @@ class BasicInfo extends React.Component{
                 </div>
                 <div className="live-standard-info">
                   <span className="icon iconfont">&#xe601;</span>
-                  <span className="instro">图文课单个课程，用户学习进度达到
+                  <span className="instro">图文课单个课程，学员学习进度达到
                     <Input  
                       width="40" 
                       value={percentCompletePicture} 
@@ -350,19 +350,6 @@ class BasicInfo extends React.Component{
                     %，即视为"已完成"学习
                   </span>
                 </div>
-                {/* <div className="video-standard-info">
-                  <span className="icon iconfont">&#xe864;</span>
-                  <span>图文课单个课程，用户学习进度达到
-                    <Input
-                      width="40"
-                      value={percentCompleteVideo} 
-                      onChange={(e) => { this.props.onChange('percentCompleteVideo', e.target.value.replace(/\D/g,'')) }} 
-                      onBlur={(e) => this.percentCompleteBlur(e, 'percentCompleteVideo')}
-                      className="input-box"
-                    />
-                    %，即视为“已完成”学习
-                  </span>
-                </div> */}
               </div>  
           </div>
           { operatorModalVisible && 

src/modules/plan-manage/components/PlanList.jsx

 /*
  * @Author: zhangleyuan
  * @Date: 2021-02-20 16:46:46
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-16 15:53:59
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:36:43
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -242,7 +242,7 @@ function PlanList(props) {
     function handleDelete(record){
       return  confirm({
         title: '你确定要删除吗？',
-        content: '删除后，此培训计划的用户将无法继续学习，所有学习数据将同步删除不可恢复',
+        content: '删除后，此培训计划的学员将无法继续学习，所有学习数据将同步删除不可恢复',
         icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
         okText: '删除',
         okType: 'danger',

src/modules/plan-manage/components/UserLearningData.jsx

@@ -110,8 +110,8 @@ class UserLearningData extends React.Component {
   UnbundEmployee = (record)=>{
     if(User.getUserRole()==='CloudOperator'){
       return confirm({
-        title: "你确定要解绑与用户的关系吗？",
-        content: "解绑后，用户该培训计划的学习数据将同步移出",
+        title: "你确定要解绑与学员的关系吗？",
+        content: "解绑后，学员该培训计划的学习数据将同步移出",
         icon: (
           <span className="icon iconfont default-confirm-icon">&#xe839; </span>
         ),
@@ -156,7 +156,7 @@ class UserLearningData extends React.Component {
     if(User.getUserRole() === "CloudManager" || User.getUserRole() === "StoreManager"){
       columns = [
         {
-          title: '用户',
+          title: '学员',
           key: 'storeCustomerName',
           dataIndex: 'storeCustomerName',
           render: (val, record) => {
@@ -225,7 +225,7 @@ class UserLearningData extends React.Component {
         {
           title: <span>
             <span>学习进度</span>
-            <Tooltip  title="用户培训计划中达到“已完成”状态的课程数/总课程数"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
+            <Tooltip  title="学员培训计划中达到“已完成”状态的课程数/总课程数"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
           </span>,
           key: 'learnNum',
           dataIndex: 'learnNum',
@@ -259,7 +259,7 @@ class UserLearningData extends React.Component {
     }else{
       columns = [
         {
-          title: '用户',
+          title: '学员',
           key: 'storeCustomerName',
           dataIndex: 'storeCustomerName',
           render: (val, record) => {
@@ -311,7 +311,7 @@ class UserLearningData extends React.Component {
         {
           title: <span>
             <span>学习进度</span>
-            <Tooltip  title="用户培训计划中达到“已完成”状态的课程数/总课程数"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
+            <Tooltip  title="学员培训计划中达到“已完成”状态的课程数/总课程数"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
           </span>,
           key: 'learnNum',
           dataIndex: 'learnNum',

src/modules/plan-manage/components/UserLearningDataFilter.jsx

@@ -126,10 +126,10 @@ function UserLearningDataFilter(props) {
         <Row>
             <div className="search-condition">
               <div className="search-condition__item">
-                <span className="label customer-label">用户：</span>
+                <span className="label customer-label">学员：</span>
                 <Search
                   value={query.customerName}
-                  placeholder="搜索用户名称"
+                  placeholder="搜索学员名称"
                   onChange={(e) => { handleChangeQuery('customerName', e.target.value)}}
                   onSearch={ () => { props.onChange(query) } }
                   style={{ width: "calc(100% - 70px)" }}

src/modules/plan-manage/modal/SharePlanModal.jsx

@@ -136,13 +136,13 @@ class ShareLiveModal extends React.Component {
       <div className="right">
         <div className="share-poster right__item">
           <div className="title">① 海报分享</div>
-          <div className="sub-title">用户可通过微信扫描海报二维码，查看培训计划</div>
+          <div className="sub-title">学员可通过微信扫描海报二维码，查看培训计划</div>
           <div className="content" onClick={this.handleDownloadPoster}>下载海报</div>
         </div>
 
         <div className="share-url right__item">
           <div className="title">② 链接分享</div>
-          <div className="sub-title">用户可通过微信或浏览器打开以下链接，查看培训计划</div>
+          <div className="sub-title">学员可通过微信或浏览器打开以下链接，查看培训计划</div>
           <div className="content url-content">
             <div className="share-url" id="shareUrl">{shareUrl}</div>
             <Button type="primary" onClick={this.handleCopy}>复制</Button>

src/modules/plan-manage/modal/UserLearnDetailModal.jsx

@@ -163,7 +163,7 @@ class UserLearnDetailModal extends React.Component {
     const { visible } = this.props;
     return (
         <Modal
-          title="用户学习详情"
+          title="学员学习详情"
           onCancel={this.props.onClose}
           onOk={this.props.onClose}
           maskClosable={false}
@@ -175,7 +175,7 @@ class UserLearnDetailModal extends React.Component {
         >
           <div className="customer-info">
             <span className="customer-name">
-              <span>用户：</span>
+              <span>学员：</span>
               <span>{storeCustomerName}</span>
             </span>
             <span className="customer-phone">

src/modules/root/CollegeManagePage.jsx

@@ -84,7 +84,7 @@ export default class CollegeManagePage extends React.Component {
 
         Modal.confirm({
           title: '确定停用吗？',
-          content: '停用学院，所有学院相关信息不可使用，用户无法继续学习，请谨慎操作！',
+          content: '停用学院，所有学院相关信息不可使用，学员无法继续学习，请谨慎操作！',
           icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
           onOk: () => {
             this.changeCollege(item, bool);

src/modules/store-manage/EmployeeAddOrEditModal.tsx

@@ -298,7 +298,7 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
                 <Radio value={"CloudOperator"} className="mt-4">
                   <span style={{ color: "#333" }}>运营师</span>
                   <p className="radio-tip">
-                  仅可查看/转发培训计划内容，并查看其负责的用户学习进度
+                  仅可查看/转发培训计划内容，并查看其负责的学员学习进度
                   </p>
                 </Radio>
               </RadioGroup>

src/modules/store-manage/UserManagePage.tsx

 /*
  * @Author: wufan
  * @Date: 2020-11-30 10:47:38
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-02-02 10:22:34
- * @Description: 用户管理页面
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:38:40
+ * @Description: 学员管理页面
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -49,7 +49,7 @@ function UserManagePage() {
   function parseColumn() {
     return [
       {
-        title: "用户姓名",
+        title: "学员姓名",
         dataIndex: "nickName",
         render: (val: string) => {
           return (
@@ -81,7 +81,7 @@ function UserManagePage() {
 
   return (
     <div className=" page user-manage-page">
-        <div className="content-header">用户管理</div>
+        <div className="content-header">学员管理</div>
         <div className="box">
           <div className="box-header">
             <div
@@ -93,13 +93,13 @@ function UserManagePage() {
               }}
             >
               <div>
-                搜索用户：
+                搜索学员：
                 <Search
                   style={{
                     width: 300,
                     marginRight: 40,
                   }}
-                  placeholder="搜索用户姓名/手机号"
+                  placeholder="搜索学员姓名/手机号"
                   onSearch={(value) => {
                     const _query = { ...query };
                     if (value) {

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

@@ -365,7 +365,7 @@ function AddExam(props: any) {
                                 checked={needPhone == 'NEED_PHONE_VERIFY'}
                                 onChange={(val) => { setNeedPhone(val ? 'NEED_PHONE_VERIFY' : 'DO_NOT_NEED_PHONE_VERIFY') }}
                             ></Switch>
-                            <div style={{ position: 'relative', top: 3, left: 8, color: "#999" }}><p>开启：需要绑定手机号的用户才能参加考试</p>
+                            <div style={{ position: 'relative', top: 3, left: 8, color: "#999" }}><p>开启：需要绑定手机号的学员才能参加考试</p>
                                 <p>关闭：微信/企业微信登陆直接参加考试</p></div>
                         </div>
 

src/modules/teach-tool/examination-manager/ExamShareModal.jsx

@@ -118,25 +118,11 @@ class ExamShareModal extends React.Component {
                    
                 </div>
                 <div className="right">
-
-
                     <div className="share-poster right__item">
                         <div className="title">① 海报分享</div>
-                        <div className="sub-title">用户可通过微信扫描海报二维码，查看考试</div>
+                        <div className="sub-title">学员可通过微信扫描海报二维码，查看考试</div>
                         <div className="content" onClick={this.handleDownloadPoster}>下载海报</div>
                     </div>
-
-                    {/* <div className="share-url right__item" style={{ marginTop: 40 }}>
-                        <div className="title">② 链接分享</div>
-                        <div className="sub-title">用户可通过微信或浏览器打开以下链接，查看考试（建议使用谷歌浏览器）</div>
-                        <div className="content">
-                            <div className="share-url" id="shareUrl">{shareUrl}</div>
-                            <Button
-                                type="primary"
-                                onClick={this.handleCopy}
-                            >复制</Button>
-                        </div>
-                    </div> */}
                 </div>
             </Modal>
         )

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

@@ -115,7 +115,7 @@ function DataAnalysic(props: any) {
     const columns = [
 
         {
-            title: "用户",
+            title: "学员",
             dataIndex: "userName",
             render: (text: any, record: any) => <span>{text}<span style={{ color: record.userSource === 'WORK_WE_CHAT' ? 'rgba(255, 157, 20, 1)' : 'rgba(29, 204, 101, 1)' }} >@{(userTypeEnum as any)[record.userSource]}</span></span>,
         },
@@ -221,11 +221,11 @@ function DataAnalysic(props: any) {
             <div style={{ display: 'flex' }}>
                 <div className="search-condition">
                     <div className="search-condition__item">
-                        <span className="search-name">用户:</span>
+                        <span className="search-name">学员:</span>
                         <Search
                             value={query.examName}
                             className='search-input'
-                            placeholder="搜索用户名或手机号"
+                            placeholder="搜索学员名或手机号"
                             onChange={(e) => {
                                 const _query = { ...query }
                                 _query.searchKey = e.target.value
@@ -237,8 +237,8 @@ function DataAnalysic(props: any) {
                     </div>
 
                     <div className="search-condition__item">
-                        <span className="search-name">用户类型:</span>
-                        <Select value={query.userSource} placeholder="请选择用户类型" onChange={(val) => {
+                        <span className="search-name">学员类型:</span>
+                        <Select value={query.userSource} placeholder="请选择学员类型" onChange={(val) => {
                             const _query = { ...query }
                             _query.userSource = val
                             setQuery(_query);

src/routes/config/mainRoutes.tsx

 /*
  * @Author: 吴文洁
  * @Date: 2020-04-29 10:26:32
- * @LastEditors: yuananting
- * @LastEditTime: 2021-04-15 21:45:42
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:39:51
  * @Description: 内容线路由配置
  */
 import Home from '@/modules/home/Home';
@@ -58,23 +58,18 @@ const mainRoutes = [
   {
     path: "/user-manage",
     component: UserManagePage,
-    name: "用户管理",
+    name: "学员管理",
   },
   {
     path: '/college-user',
 		component: UserManage,
-		name: '用户管理'
+		name: '学员管理'
   },
   {
     path: '/store-decoration',
 		component: StoreDecorationPage,
 		name: '学院装修'
   },
-  // {
-  //   path: "/course-catalog",
-  //   component: CourseCatalogPage,
-  //   name: "课程分类",
-  // },
   {
     path: "/live-course",
     component: LiveCoursePage,

src/routes/config/menuList.tsx

 /*
  * @Author: yuananting
  * @Date: 2021-02-21 15:53:31
- * @LastEditors: yuananting
- * @LastEditTime: 2021-03-27 15:20:42
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-05-13 16:40:11
  * @Description: 描述一下咯
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -97,7 +97,7 @@ export const menuList: any = [
         link: '/college-employee'
       },
       {
-        groupName: "用户管理",
+        groupName: "学员管理",
         groupCode: "ShopUser",
         link: '/college-user'
       },