fix:合并任务并解决冲突

1d14c756 · wufan · 2a49658e · 621343e6 · 1d14c756 · 1d14c756
Commit 1d14c756 authored Sep 03, 2021 by wufan
13 changed files
--- a/src/domains/basic-domain/constants.ts
+++ b/src/domains/basic-domain/constants.ts
 /*
 * @Author: 陈剑宇
 * @Date: 2020-05-07 14:43:01
- * @LastEditTime: 2021-08-16 16:39:13
+ * @LastEditTime: 2021-09-03 13:54:34
- * @LastEditors: yuananting
+ * @LastEditors: wufan
 * @Description:
 * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
 */

--- a/src/domains/course-domain/constants.ts
+++ b/src/domains/course-domain/constants.ts
 /*
 * @Author: 吴文洁
 * @Date: 2020-08-20 09:21:40
- * @LastEditors: yuananting
+ * @LastEditors: wufan
- * @LastEditTime: 2021-08-16 16:38:55
+ * @LastEditTime: 2021-09-03 13:54:38
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */

--- a/src/index.d.ts
+++ b/src/index.d.ts
+/*
+ * @Author: wufan
+ * @Date: 2021-09-03 10:23:20
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-09-03 13:53:31
+ * @Description: Description
+ * @@Copyrigh: © 2021 杭州杰竞科技有限公司 版权所有
+ */
 declare module 'jquery'
 declare module 'cropper'
 declare module 'ExamShareModal'
-declare module 'routeHooks'
 declare module 'college'
 declare module '@/common/lottie/college'
+declare module 'routeHooks'
 // declare var this: any
\ No newline at end of file
--- a/src/index.html
+++ b/src/index.html
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-24 12:20:57
 * @LastEditors: wufan
- * @LastEditTime: 2021-08-15 19:12:55
+ * @LastEditTime: 2021-09-03 13:53:56
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 -->

--- a/src/modules/college-manage/CollegeInfoPage.jsx
+++ b/src/modules/college-manage/CollegeInfoPage.jsx
 import React from 'react';
 import { withRouter } from 'react-router-dom';
-import { Form, Input, Button, Modal,Switch, message } from 'antd';
+import { Form, Input, Button, Modal,Switch, message, Tooltip } from 'antd';
 import SelectPrepareFileModal from '@/modules/prepare-lesson/modal/SelectPrepareFileModal';
 import Upload from '@/core/upload';
 import StoreService from '@/domains/store-domain/storeService';
@@ -167,7 +167,12 @@ class CollegeInfoPage extends React.Component {
                />
              </Form.Item>
              <div className='title mt40'>高级设置</div>
-              <Form.Item label='学员审核' name='storeName' rules={[{ required: true }]}>
+              <Form.Item label={<span className='label-box'>学员审核
+                  <Tooltip title='学院同时支持企微和微信用户加入学院学习。学员审核开启后，微信用户需要先提出申请，学院管理员审核通过后才能成为学院的学员，保证仅可信的微信用户才能加入学院。' placement='top' arrowPointAtCenter>
+                    <span className='icon iconfont icon-tip'>&#xe61d;</span>
+                  </Tooltip>
+                  </span>}
+                name='storeName' >
                <div className='switch-box'>
                  <Switch checked={auditSwitch ==='OPEN' } onChange={(e) => this.onChangeFiledValue('auditSwitch', e ?'OPEN':'CLOSE')}/>
                  <Choose>

--- a/src/modules/college-manage/CollegeInfoPage.less
+++ b/src/modules/college-manage/CollegeInfoPage.less
@@ -84,6 +84,14 @@
      margin-left:132px;
      margin-top: 20px;
  }
+  .label-box{
+    // display: flex;
+    // align-content: center;
+    .icon{
+      color:#BFBFBF;
+      margin: 0 2px;
+    }
+  }
 }
 .college-info-page-view-modal-box{

--- a/src/modules/college-manage/EmployeeManage.tsx
+++ b/src/modules/college-manage/EmployeeManage.tsx
@@ -441,7 +441,6 @@ function EmployeeManage() {
                );
              })}
            </div>
-          </div>
            {(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager') &&
              <>
                <Button

--- a/src/modules/college-manage/NewUsersManagePage.jsx
+++ b/src/modules/college-manage/NewUsersManagePage.jsx
@@ -47,28 +47,39 @@ function UserManagePage(props) {
    }
    handleFetchAuditListCount();
  },[])
-  useEffect(()=>{
+  function getStoreDetail(){
    const params= {
      storeId:User.getStoreId()
    }
-    StoreService.getStoreDetail(params).then((res) => {
+    return StoreService.getStoreDetail(params).then((res) => {
      const { result = { } } = res;
      const {
        auditSwitch
      } = result;
      setAuditSwitch(auditSwitch)
+      return auditSwitch
+    })
+  }
+  function jumpWechatAudit(){
+    getStoreDetail().then((res)=>{
+      if(res === 'OPEN'){
+        window.RCHistory.push({
+          pathname: `${match.url}/wechat-user-audit`,
+        });
+      }
    })
+  }
+  useEffect(()=>{
+    getStoreDetail()
  },[])
  return (
    <div className="page new-user-manage-page">
        <div className="content-header">
          <div>学员管理</div>
            <If condition={auditSwitch === 'OPEN'}>
-              <div className='wechat-audit' onClick={()=>{
+              <div className='wechat-audit' onClick={jumpWechatAudit} >
-                window.RCHistory.push({
-                  pathname: `${match.url}/wechat-user-audit`,
-                });
-              }} >
                <div>
                  <span className='icon iconfont icon-font-weixin'>&#xe8e0;</span>
                  <span className='content-header-right'>学员审核列表</span>

--- a/src/modules/college-manage/WechatUserAudit/WechatUserAuditList.jsx
+++ b/src/modules/college-manage/WechatUserAudit/WechatUserAuditList.jsx
@@ -121,6 +121,13 @@ function WechatUserAuditList(props) {
        message.success('操作成功');
        onChange(query)
      }
+    }).catch(res=>{
+      if(res.code === 'THIS_OPERATION_INVALID'){
+        window.RCHistory.goBack();
+      }
+      if(res.code === 'AUDIT_HAS_OPERATION'){
+        onChange(query)
+      }
    });
  }

--- a/src/modules/home/Home.less
+++ b/src/modules/home/Home.less
@@ -68,6 +68,7 @@
        }
        .data-footer {
          margin-top: 12px;
+          margin-left: 22px;
          .footer-word {
            font-size: 12px;
            color: #999;

--- a/src/modules/root/Header.jsx
+++ b/src/modules/root/Header.jsx
 /*
 * @Author: 吴文洁
 * @Date: 2019-09-10 18:26:03
- * @LastEditors: yuananting
+ * @LastEditors: wufan
- * @LastEditTime: 2021-08-17 19:19:42
+ * @LastEditTime: 2021-09-03 13:54:55
 * @Description:
 */
 import React, { useRef, useContext, useEffect, useState } from 'react';

--- a/src/modules/task-center/data-center/components/TestLinkTaskData.jsx
+++ b/src/modules/task-center/data-center/components/TestLinkTaskData.jsx
@@ -33,7 +33,7 @@ function TestLinkTaskData(props) {
        setActiveExam(stageExamCustomerVOList[0].contentVOList[0]);
        const { contentId, paperId } = stageExamCustomerVOList[0].contentVOList[0];
        const { match } = props;
-        const path = `${match.url}/test-detail/${contentId}?paperId=${paperId}1&userId=${storeCustomerId}&fromTrainingTask=true`;
+        const path = `${match.url}/test-detail/${contentId}?paperId=${paperId}&userId=${storeCustomerId}&fromTrainingTask=true`;
        window.RCHistory.replace(path);
      }
    });

--- a/src/routes/config/mainRoutes.tsx
+++ b/src/routes/config/mainRoutes.tsx
 /*
 * @Author: 吴文洁
 * @Date: 2020-04-29 10:26:32
- * @LastEditors: yuananting
+ * @LastEditors: wufan
- * @LastEditTime: 2021-08-18 12:41:27
+ * @LastEditTime: 2021-09-03 13:54:59
 * @Description: 内容线路由配置
 */
 import Home from '@/modules/home/Home';