Skip to content

X
xiaomai-cloud-class-web
Commit 007fc7db by maolipeng
Options

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

# Conflicts:
#	src/common/js/axios.ts
#	src/modules/college-manage/UserManagePage.tsx
#	src/modules/root/Header.jsx
#	src/modules/root/Login.jsx
#	src/modules/root/WechatLogin.tsx
#	yarn.lock
parents 8b20dee9 39090150
Showing with 113 additions and 17 deletions
src/common/js/axios.ts
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-08-31 09:34:31
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-23 10:22:39
* @LastEditTime: 2021-06-24 19:34:21
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
......@@ -99,10 +99,6 @@ class Axios {
} else if (success || resultCode === 0) {
return response;
} else if (!options.reject) {
// if(code === "NONE_STORE_USER"){
// window.RCHistory.replace('/login');
// return Promise.reject();
// }
message.error(ResMessage || resultMsg);
}
return Promise.reject(response.data);
......@@ -121,7 +117,6 @@ class Axios {
break;
default:
message.error(error.message);
console.log('222');
break;
}
return Promise.reject(error.message);
......
src/modules/college-manage/UserManagePage.tsx
......@@ -18,7 +18,6 @@ import ChooseMembersModal from "./modal/ChooseMembersModal";
import { XMTable } from '@/components';
import college from '@/common/lottie/college.json';
import LimitTip from "./LimitTip"
import "./UserManagePage.less";
import moment from "moment";
......
src/modules/root/Header.jsx
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2019-09-10 18:26:03
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-23 16:11:49
* @LastEditTime: 2021-06-24 19:28:14
* @Description:
*/
import React, { useRef, useContext, useEffect, useState } from 'react';
......
src/modules/root/Login.jsx
......@@ -13,6 +13,10 @@ import user from '@/common/js/user';
const { TabPane } = Tabs;
function Login(props) {
/**
* 手机登陆入口，暂时隐藏，此页注释代码勿删
*/
// const [phone, setPhone] = useState(''); // 登录手机号
// const [phoneverify, setPhoneverify] = useState(''); // 密码登录验证码
// const [openCheck1, setOpenCheck1] = useState(false);
......@@ -23,6 +27,10 @@ function Login(props) {
// const [phoneError, setPhoneError] = useState(false);
// const [checkObject1, setCheckObject1] = useState({});
/**
* 手机登陆入口，暂时隐藏，此页注释代码勿删
*/
useEffect(() => {
const enterpriseId = getParameterByName('enterpriseId');
const userId = getParameterByName('userId');
......@@ -66,6 +74,11 @@ function Login(props) {
});
});
}
/**
* 手机登陆入口，暂时隐藏，此页注释代码勿删
*/
// async function checkAccount(code, callback = () => {}) {
// callback();
// }
......@@ -153,6 +166,10 @@ function Login(props) {
// });
// }
/**
* 手机登陆入口，暂时隐藏，此页注释代码勿删
*/
return (
<div className='login-page'>
<div className='logo-img-box'>
......@@ -173,6 +190,91 @@ function Login(props) {
<TabPane tab='企业微信登录' key='1'>
<WechatLogin></WechatLogin>
</TabPane>
{/* 手机登陆入口，暂时隐藏，此页注释代码勿删 */}
{/* <TabPane tab='手机号登录' key='2'>
<div className='login-form'>
<div className='form'>
<div className='username' style={{ marginBottom: 16 }}>
<Input
type='phone'
autoComplete='off'
name='account'
maxLength={11}
placeholder="请输入手机号"
value={phone}
onChange={(e) => {
setPhone(e.target.value)
}}
/>
</div>
<div className='error-message'></div>
<div className='phoneverify'>
<Input
type="text"
id="phoneverify"
name="phoneverify"
placeholder="请输入验证码"
autoComplete="off"
value={phoneverify}
maxLength={4}
onChange={(e) => {
setPhoneverify(e.target.value)
}}
/>
<Popover
visible={openCheck1}
trigger='click'
title=''
content={
<div>
<span style={{ fontSize: '12px', color: '#999', marginBottom: 8, display: 'block' }}>请完成安全验证</span>
<CheckBeforeSendCode
callback={(data, nc) => {
setCheckObject1(nc)
checkAccount(1, (userType) => {
handleSendSMSCode(data, userType)
setTimeout(() => {
setOpenCheck1(false)
}, 500)
})
}}
/>
</div>
}
onVisibleChange={(value) => {
if (!value) {
setOpenCheck1(false)
}
}}
placement='bottomRight'>
<div
className='btn'
id='sendVerifyCode'
onClick={() => {
if (checking1) return
checkSend(1)
}}>
{codeText}
</div>
</Popover>
</div>
<div className='error-message'>{errorMessage}</div>
<div className='submit'>
<div className='btn'>
<span
id='loginIn'
onClick={() => {
handleSubmit()
}}>
登录
</span>
</div>
</div>
</div>
</div>
</TabPane> */}
{/* 手机登陆入口，暂时隐藏，此页注释代码勿删 */}
</Tabs>
</div>
</div>
......
src/modules/root/Menu.tsx
......@@ -192,11 +192,11 @@ function Aside(props: any) {
function handleMenu() {
handleMenuType();
setCollapsed(!collapsed)
// if (!collapsed) {
// setOpenKeys([])
// } else {
// setOpenKeys(lastOpenKeys)
// }
if (!collapsed) {
setOpenKeys([])
} else {
setOpenKeys(lastOpenKeys)
}
}
return (
......
src/modules/root/WechatLogin.tsx
......@@ -27,15 +27,11 @@ export default function WechatLogin(props: any) {
Service.Hades('anon/hades/getTicket', {}).then((res: any) => {
setTicket(res.result);
const redirect = `${PATH}?ticket=${res.result}&appTermEnum=XIAOMAI_CLOUD_CLASS_PC_WEB_ADMIN&env=${process.env.DEPLOY_ENV || 'dev'}`;
// console.log(redirect)
// const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww409ccf9c6e31f19e&redirect_uri=${encodeURIComponent(redirect)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
// console.log(url)
const qrcodeWrapDom: any = document.querySelector('#qrcode');
let qrnode = new qrcode({
text: redirect,
correctLevel: 2,
size: 180,
// image: 'https://image.xiaomaiketang.com/xm/Newk4NrxKC.png',
image: 'https://image.xiaomaiketang.com/xm/bFkRBz7teA.png',
imageSize: 50,
});
......@@ -80,6 +76,10 @@ export default function WechatLogin(props: any) {
window.currentStoreUserInfo.token = _res.result.loginInfo.xmToken;
window.currentStoreUserInfo.enterpriseId = _res.result.loginInfo.enterpriseId;
User.setIdentifier(_res.result.identifier);
window.currentStoreUserInfo = {}
window.currentStoreUserInfo.userId = _res.result.loginInfo.userId;
window.currentStoreUserInfo.token = _res.result.loginInfo.xmToken;
window.currentStoreUserInfo.enterpriseId = _res.result.enterpriseId;
window.RCHistory.push({
pathname: `/switch-route`,
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment