催一下
diff --git a/src/routes/User/RegisterResult.js b/src/routes/User/RegisterResult.js
index 5eb6cb7295ba437bac93b406beee4a9201dbdff0..fac8260bf4041e0fde008337291e41a4321e27d6 100644
--- a/src/routes/User/RegisterResult.js
+++ b/src/routes/User/RegisterResult.js
@@ -23,7 +23,8 @@ const RegisterResult = ({ location }) => (
type="success"
title={
- 你的账户：{location.state ? location.state.account : 'AntDesign@example.com'} 注册成功
+ 你的账户：
+ {location.state ? location.state.account : 'AntDesign@example.com'} 注册成功
}
description="激活邮件已发送到你的邮箱中，邮件有效期为24小时。请及时登录邮箱，点击邮件中的链接激活帐户。"
diff --git a/src/utils/request.js b/src/utils/request.js
index 591da964f5c9f08118bfb6c1e2daafcdaea4def0..80e495ea21b4c7caa91110fcc74091050c955ca1 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -47,7 +47,11 @@ export default function request(url, options) {
credentials: 'include',
};
const newOptions = { ...defaultOptions, ...options };
- if (newOptions.method === 'POST' || newOptions.method === 'PUT') {
+ if (
+ newOptions.method === 'POST' ||
+ newOptions.method === 'PUT' ||
+ newOptions.method === 'DELETE'
+ ) {
if (!(newOptions.body instanceof FormData)) {
newOptions.headers = {
Accept: 'application/json',
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 60d16d162e1ccf39c80c1bab36410ee205c4ef4a..add0a935bea0068f1dc8e89019894269ba72a150 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -124,11 +124,10 @@ function getRenderArr(routes) {
let renderArr = [];
renderArr.push(routes[0]);
for (let i = 1; i < routes.length; i += 1) {
- let isAdd = false;
- // 是否包含
- isAdd = renderArr.every(item => getRelation(item, routes[i]) === 3);
// 去重
renderArr = renderArr.filter(item => getRelation(item, routes[i]) !== 1);
+ // 是否包含
+ const isAdd = renderArr.every(item => getRelation(item, routes[i]) === 3);
if (isAdd) {
renderArr.push(routes[i]);
}
@@ -164,7 +163,7 @@ export function getRoutes(path, routerData) {
}
/* eslint no-useless-escape:0 */
-const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/g;
+const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
export function isUrl(path) {
return reg.test(path);