Merge branch 'feature/pangguoming/20210805/wechat_audit' into dev

src/modules/college-manage/CollegeInfoPage.jsx

@@ -19,6 +19,7 @@ class CollegeInfoPage extends React.Component {
       cutImageBlob: null,
       imageFile: null, // 需要被截取的图片
       auditSwitch:"OPEN",
+      videwMoal:false
     };
   }
   componentWillMount() {
@@ -105,6 +106,22 @@ class CollegeInfoPage extends React.Component {
       Bus.trigger('updateCollegeInfo');
     });
   };
+  renderModal (){
+    const {videwMoal} = this.state
+    return <Modal
+    visible={videwMoal}
+    title={'功能预览'}
+    width={680}
+    onCancel={()=>{this.setState({videwMoal:false})}}
+    maskClosable={false}
+    footer={null}
+    closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
+  >
+    <div className='college-info-page-view-modal-box'>
+      <img src='https://image.xiaomaiketang.com/xm/KkfaSaY8kX.gif' alt=''></img>
+    </div>
+  </Modal>
+  }
   render() {
     const { storeName, showSelectFileModal, visible, logo, imageFile,auditSwitch } = this.state;
     return (
@@ -156,7 +173,7 @@ class CollegeInfoPage extends React.Component {
                   <Choose>
                     <When condition={auditSwitch ==='OPEN'}>
                       <div className='switch-desc'>已开启，成为学院学员需要审核</div>
-                      <div className='switch-prew-link'>功能预览</div>
+                      <div className='switch-prew-link' onClick={()=>this.setState({videwMoal:true})}>功能预览</div>
                     </When>
                     <Otherwise>
                       <div className='switch-desc'>已关闭，成为学院学员不需要审核</div>
@@ -201,6 +218,7 @@ class CollegeInfoPage extends React.Component {
             </Button>
           </div>
         </div>
+        {this.renderModal()}
       </div>
     );
   }

src/modules/college-manage/CollegeInfoPage.less

@@ -84,5 +84,10 @@
       margin-left:132px;
       margin-top: 20px;
   }
-  
+ 
+}
+.college-info-page-view-modal-box{
+    img{
+        width: 100%;
+    }
 }
\ No newline at end of file

src/modules/college-manage/NewUsersManagePage.jsx

@@ -12,7 +12,7 @@ import { Route,withRouter } from "react-router-dom";
 import StoreService from "@/domains/store-domain/storeService";
 import _ from "underscore";
 import User from "@/common/js/user";
-import {Tabs} from "antd";
+import {Tabs,Badge} from "antd";
 import DepartMentTabCon from './components/DepartMentTabCon';
 import WechatUserAudit from './WechatUserAudit/WechatUserAudit'
 
@@ -25,6 +25,28 @@ function UserManagePage(props) {
   const { match } = props;
   const [currentTab, setCurrentTab] = useState("departMentTab");
   const [auditSwitch,setAuditSwitch] = useState('No') 
+  const [listCount, setListCount] = useState({
+    "allCnt": 0,
+    "passedCnt": 0,
+    "rejectedCnt": 0,
+    "waitCnt": 0
+  });
+  useEffect(()=>{
+    //列表获取
+    function handleFetchAuditListCount(_query) {
+      const params = {
+        storeId: User.getStoreId(),
+      };
+    
+      StoreService.getCustomerAuditListCount(params).then((res) => {
+        const {
+          result,
+        } = res;
+        setListCount(result)
+      });
+    }
+    handleFetchAuditListCount();
+  },[])
   useEffect(()=>{
     const params= {
       storeId:User.getStoreId()
@@ -47,9 +69,15 @@ function UserManagePage(props) {
                   pathname: `${match.url}/wechat-user-audit`,
                 });
               }} >
-                <span className='icon iconfont icon-font-weixin'>&#xe8e0;</span>
-                <span className='content-header-right'>学员审核列表</span>
+                <div>
+                  <span className='icon iconfont icon-font-weixin'>&#xe8e0;</span>
+                  <span className='content-header-right'>学员审核列表</span>
+                </div>
+                <If condition={listCount.waitCnt!=='0'}>
+                  <Badge status="error" text="" offset={[6,-6]} />
+                </If>
               </div>
+             
             </If>
         </div>
         <div className="box">

src/modules/college-manage/NewUsersManagePage.less

@@ -5,9 +5,11 @@
     .content-header{
         display: flex;
         justify-content: space-between;
-        align-items: center;
-        .wechat-audit:hover{
-          cursor: pointer;
+        .wechat-audit{
+          display: flex;
+          &:hover{
+            cursor: pointer;
+          }
         }
         .icon-font-weixin{
           color: #5DD333;

src/modules/college-manage/WechatUserAudit/WechatUserAudit.jsx

@@ -61,13 +61,14 @@ const WechatUserAudit = function () {
 
   //搜索条件改变
   function queryChange(_query) {
-    if(_query.applyStatus===''){
-      _query.applyStatus = null
-    }
+   if(_query.realName){
+     _query.nickName = _query.realName
+   }
     const params = {
       ...query,
       ..._query,
     };
+    console.log('params====>',params)
     setQuery(params);
   }
 

src/modules/college-manage/WechatUserAudit/WechatUserAuditFilter.jsx

@@ -17,6 +17,7 @@ const defaultQuery = {
   realName: null,
   startDate: null,
   endDate: null,
+  nickName:null
 };
 
 const WechatUserAuditFilter = function (props) {
@@ -58,7 +59,11 @@ const WechatUserAuditFilter = function (props) {
       ...defaultQuery,
       current: 1,
     });
-    onChange(query);
+   
+    onChange({
+      ...defaultQuery,
+      current: 1,
+    });
   }
 
   return (

src/modules/college-manage/WechatUserAudit/WechatUserAuditList.jsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { message, Badge } from 'antd';
 import { PageControl, XMTable } from '@/components';
 
-// import User from '@/common/js/user';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import './WechatUserAuditList.less';
 import StoreService from '@/domains/store-domain/storeService';
 import User from '@/common/js/user';
@@ -70,7 +70,9 @@ function WechatUserAuditList(props) {
         key: 'reviewer',
         dataIndex: 'reviewer',
         render: (val) => {
-          return <div>{val}</div>;
+          return <div>
+             <WWOpenDataCom type="userName" openid={val} />
+          </div>;
         },
       },
       {

src/modules/root/CreateCollege.jsx

 import React from 'react';
-import { Input, Button, Switch, message, Form } from 'antd';
+import { Input, Button, Switch, message, Form, Tooltip } from 'antd';
 import Upload from '@/core/upload';
 import Service from "@/common/js/service";
 import BaseService from "@/domains/basic-domain/baseService";
@@ -159,7 +159,12 @@ export default class CreateCollege extends React.Component {
                 }}
               ></Input>
             </Form.Item>
-            <Form.Item label={<div className='label-box'>学员审核 <span className='icon iconfont icon-tip'>&#xe61d;</span></div>} name='auditSwitch' rules={[{ required: true }]}>
+            <Form.Item label={<div className='label-box'>学员审核
+            <Tooltip title='学院同时支持企微和微信用户加入学院学习。学员审核开启后，微信用户需要先提出申请，学院管理员审核通过后才能成为学院的学员，保证仅可信的微信用户才能加入学院。' placement='top' arrowPointAtCenter>
+              <span className='icon iconfont icon-tip'>&#xe61d;</span>
+            </Tooltip>
+            
+             </div>} name='auditSwitch' rules={[{ required: true }]}>
                 <div className='switch-box'>
                 <Switch checked={auditSwitch ==='OPEN' } onChange={(e) => this.onChangeFiledValue('auditSwitch', e ?'OPEN':'CLOSE')}/>
                   <Choose>