From a7c3dee7e325fb3f6253895bb8f5ffe183908895 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 26 Nov 2020 10:55:03 +0800
Subject: [PATCH 001/274] =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/App.js b/src/App.js
index 9d24d286a..ece782b1a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -10,7 +10,7 @@ import {
import axios from 'axios';
import LoginDialog from './modules/login/LoginDialog';
import 'babel-polyfill';
-import Loading from './Loading'
+import Loading from './Loading';
import Loadable from 'react-loadable';
import marked from './common/marked';
From af48da2eb3328b2574d7142dc084b8fd591c4b17 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 29 Mar 2021 17:14:56 +0800
Subject: [PATCH 002/274] href
---
.idea/workspace.xml | 11 -----------
src/AppConfig.js | 2 +-
src/forge/Main/CoderRootIndex.js | 4 ----
src/modules/login/EducoderLogin.js | 4 ++--
src/modules/tpm/NewHeader.js | 10 ++--------
5 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f221492f6..b6bb1a5df 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -499,7 +499,6 @@
-
@@ -1020,16 +1019,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/AppConfig.js b/src/AppConfig.js
index a5a063b09..31f391509 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -27,7 +27,7 @@ if (isDev) {
}
debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
window.location.search.indexOf('debug=s') !== -1 ? 'student' :
- window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+ window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || ''
}
function clearAllCookie() {
cookie.remove('_educoder_session', { path: '/' });
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index 4dd531bc3..ceff9d9f2 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -13,10 +13,6 @@ const UploadFile = Loadable({
loader: () => import('../Newfile/upload_file'),
loading: Loading,
})
-const CoderRootDirectory = Loadable({
- loader: () => import('./CoderRootDirectory'),
- loading: Loading,
-})
const CoderRootCommit = Loadable({
loader: () => import('./CoderRootCommit'),
loading: Loading,
diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js
index 5663c69c8..578c260cd 100644
--- a/src/modules/login/EducoderLogin.js
+++ b/src/modules/login/EducoderLogin.js
@@ -1,6 +1,6 @@
-import React, {Component} from "react";
+import React, { Component } from "react";
import moment from 'moment';
-import { SnackbarHOC,getImageUrl } from 'educoder';
+import { getImageUrl } from 'educoder';
import '../courses/css/members.css';
import "../courses/common/formCommon.css"
import '../courses/css/Courses.css';
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index cc054774f..bf835abc0 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -811,18 +811,12 @@ class NewHeader extends Component {
{user === undefined ?
this.educoderlogin()} className="mr5 color-grey-6">登录
- {
- settings && settings.new_course && settings.new_course.register_url &&
- 注册
- }
+ 注册
: user.login === "" ?
this.educoderlogin()} className="mr5 color-grey-6">登录
- {
- settings && settings.new_course && settings.new_course.register_url &&
- 注册
- }
+ 注册
:
From e3c926da77c8e3ebefadd0f9df8e732160699c09 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 29 Mar 2021 17:37:16 +0800
Subject: [PATCH 003/274] =?UTF-8?q?=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/modules/login/EducoderLogin.js | 4 +-
src/modules/login/LoginDialog.js | 10 +-
src/modules/user/LoginRegisterComponent.js | 867 +++++++--------------
3 files changed, 266 insertions(+), 615 deletions(-)
diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js
index 578c260cd..59e6cc628 100644
--- a/src/modules/login/EducoderLogin.js
+++ b/src/modules/login/EducoderLogin.js
@@ -137,9 +137,9 @@ class EducoderLogin extends Component {
{this.props.mygetHelmetapi === null ? ""
:
this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
-
![]()
this.gohome()} src={educodernet}/>
+
![]()
this.gohome()} src={educodernet} width="80px"/>
:
-
![]()
this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
+
![]()
this.gohome()} width="80px" src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
}
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 441975249..f00088a90 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -1,13 +1,7 @@
import React, { Component } from 'react';
-import { Redirect } from 'react-router';
+import Dialog from 'material-ui/Dialog';
+import { notification } from 'antd';
-import Dialog, {
- DialogActions,
- DialogContent,
- DialogContentText,
- DialogTitle,
-} from 'material-ui/Dialog';
-import { notification, Modal } from 'antd';
import axios from 'axios';
diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js
index db369458b..c2c01df75 100644
--- a/src/modules/user/LoginRegisterComponent.js
+++ b/src/modules/user/LoginRegisterComponent.js
@@ -1,6 +1,6 @@
-import React, {Component} from 'react';
-import {setmiyah,broadcastChannelPostMessage} from 'educoder';
-import {Tabs, Input, Checkbox, Button, notification,Menu} from 'antd';
+import React, { Component } from 'react';
+import { setmiyah, broadcastChannelPostMessage } from 'educoder';
+import { Tabs, Input, Checkbox, Button, notification, Menu } from 'antd';
import passopen from '../../../src/images/login/passopen.png';
import passoff from '../../../src/images/login/passoff.png';
import axios from 'axios';
@@ -11,7 +11,7 @@ import './common.css'
import './commontwo.css'
const { TabPane } = Tabs;
const loginInputsyl = {
- "width":"434px",
+ "width": "434px",
"height": "462px",
"-webkit-box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)",
"box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)",
@@ -24,15 +24,9 @@ class LoginRegisterComponent extends Component {
constructor(props) {
super(props)
-
- //
- // console.log("LoginRegisterComponent");
- // console.log("29");
- // console.log(props.loginstatus);
- if(props.loginstatus === true){
- // console.log(props.loginstatus);
+ if (props.loginstatus === true) {
this.state = {
- tab:["0"],
+ tab: ["0"],
classpass: "text",
// 登录
passopens: passoff,
@@ -53,25 +47,25 @@ class LoginRegisterComponent extends Component {
codes: "",
Phonenumberisnotco: undefined,
Phonenumberisnotcos: undefined,
- Phonenumberisnotcosyzm:undefined,
- Phonenumberisnotcosymmm:undefined,
- Phonenumberisnotcosytdhk:undefined,
- Phonenumberisnotcosyfwtk:undefined,
- Phonenumberisnotcodmm:undefined,
+ Phonenumberisnotcosyzm: undefined,
+ Phonenumberisnotcosymmm: undefined,
+ Phonenumberisnotcosytdhk: undefined,
+ Phonenumberisnotcosyfwtk: undefined,
+ Phonenumberisnotcodmm: undefined,
Phonenumberisnotcobool: false,
- Whethertoverify:false,
- pciphone:true,
- MyEduCoderModals:false,
- registered:undefined,
- Phonenumberisnotcodmms:undefined,
- weixinlogin:false,
- qqlogin:false
+ Whethertoverify: false,
+ pciphone: true,
+ MyEduCoderModals: false,
+ registered: undefined,
+ Phonenumberisnotcodmms: undefined,
+ weixinlogin: false,
+ qqlogin: false
}
}
- if(props.loginstatus === false){
+ if (props.loginstatus === false) {
// console.log(props.loginstatus);
this.state = {
- tab:["1"],
+ tab: ["1"],
classpass: "text",
// 登录
passopens: passoff,
@@ -92,25 +86,25 @@ class LoginRegisterComponent extends Component {
codes: "",
Phonenumberisnotco: undefined,
Phonenumberisnotcos: undefined,
- Phonenumberisnotcosyzm:undefined,
- Phonenumberisnotcosymmm:undefined,
- Phonenumberisnotcosytdhk:undefined,
- Phonenumberisnotcosyfwtk:undefined,
+ Phonenumberisnotcosyzm: undefined,
+ Phonenumberisnotcosymmm: undefined,
+ Phonenumberisnotcosytdhk: undefined,
+ Phonenumberisnotcosyfwtk: undefined,
Phonenumberisnotcobool: false,
- Phonenumberisnotcodmm:undefined,
- Whethertoverify:false,
- pciphone:true,
- MyEduCoderModals:false,
- registered:undefined,
- Phonenumberisnotcodmms:undefined,
- weixinlogin:false,
- qqlogin:false
+ Phonenumberisnotcodmm: undefined,
+ Whethertoverify: false,
+ pciphone: true,
+ MyEduCoderModals: false,
+ registered: undefined,
+ Phonenumberisnotcodmms: undefined,
+ weixinlogin: false,
+ qqlogin: false
}
}
}
//判断是否是手机端
- IsPC=()=> {
+ IsPC = () => {
var userAgentInfo = navigator.userAgent;
var Agents = ["Android", "iPhone",
"SymbianOS", "Windows Phone",
@@ -124,58 +118,48 @@ class LoginRegisterComponent extends Component {
}
return flag;
}
-// 点击表单后,改变type
+ // 点击表单后,改变type
changeType = () => {
- this.setState({classpass: 'password'});
+ this.setState({ classpass: 'password' });
+ }
+ IsPC = () => {
+ var userAgentInfo = navigator.userAgent;
+ var Agents = ["Android", "iPhone",
+ "SymbianOS", "Windows Phone",
+ "iPad", "iPod"];
+ var flag = true;
+ for (var v = 0; v < Agents.length; v++) {
+ if (userAgentInfo.indexOf(Agents[v]) > 0) {
+ flag = false;
+ break;
+ }
+ }
+ return flag;
}
- IsPC=()=>{
- var userAgentInfo = navigator.userAgent;
- var Agents = ["Android", "iPhone",
- "SymbianOS", "Windows Phone",
- "iPad", "iPod"];
- var flag = true;
- for (var v = 0; v < Agents.length; v++) {
- if (userAgentInfo.indexOf(Agents[v]) > 0) {
- flag = false;
- break;
- }
- }
- return flag;
- }
componentDidMount = () => {
- let flag = this.IsPC(); //true为PC端,false为手机端
- this.setState({
- isphone:flag
- })
- // console.log("componentDidUpdate");
- // console.log(this.props);
- let pcipns=this.IsPC();
+ let flag = this.IsPC(); //true为PC端,false为手机端
+ this.setState({
+ isphone: flag
+ })
+ let pcipns = this.IsPC();
if (this.props.match.url === "/login") {
- // this.state = {
- // tab:["0"],
- //
- // }
this.setState({
- tab:["0"]
+ tab: ["0"]
})
} else if (this.props.match.url === "/register") {
- // this.state = {
- // tab:["1"],
- //
- // }
this.setState({
- tab:["1"]
+ tab: ["1"]
})
}
this.setState({
- pciphone:pcipns,
+ pciphone: pcipns,
})
}
- openNotification = (messge,type) => {
+ openNotification = (messge, type) => {
// type 1 成功提示绿色 2提醒颜色黄色 3错误提示红色
notification.open({
message: "提示",
@@ -209,7 +193,7 @@ class LoginRegisterComponent extends Component {
});
try {
this.props.Setshowbool(3);
- }catch (e) {
+ } catch (e) {
}
}
@@ -219,7 +203,7 @@ class LoginRegisterComponent extends Component {
// -------------------- LOGIN START
//下次自动登入
onAutoLoginChange = (e) => {
- this.setState({autoLogin: e.target.checked})
+ this.setState({ autoLogin: e.target.checked })
}
// -------------------- LOGIN END
@@ -248,19 +232,19 @@ class LoginRegisterComponent extends Component {
}
// -------------------- REGISTER START
onReadAgreementChange = (e) => {
- this.setState({readAgreement: e.target.checked})
+ this.setState({ readAgreement: e.target.checked })
}
//是否验证通过
dragOkCallback = () => {
this.setState({
- Phonenumberisnotcosytdhk:undefined,
+ Phonenumberisnotcosytdhk: undefined,
})
if (this.state.logins.length === 0) {
this.setState({
- Phonenumberisnotcos:"账号不能为空",
+ Phonenumberisnotcos: "账号不能为空",
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
@@ -278,14 +262,14 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
})
} else {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
});
this.Emailphonenumberverification(this.state.logins, 2);
return
@@ -301,8 +285,8 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: stringdata,
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
});
@@ -312,14 +296,14 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
})
this.Emailphonenumberverification(this.state.logins, 2);
return
}
this.setState({
- Phonenumberisnotcosytdhk:undefined,
+ Phonenumberisnotcosytdhk: undefined,
})
this.Emailphonenumberverification(this.state.logins, 2)
@@ -338,12 +322,12 @@ class LoginRegisterComponent extends Component {
if (this.state.login === undefined || this.state.login == "") {
this.setState({
- Phonenumberisnotco:"账号不能为空",
+ Phonenumberisnotco: "账号不能为空",
})
return
} else if (this.state.password === undefined || this.state.password == "") {
this.setState({
- Phonenumberisnotcodmm:"密码不能为空",
+ Phonenumberisnotcodmm: "密码不能为空",
})
return
}
@@ -357,38 +341,38 @@ class LoginRegisterComponent extends Component {
return
}
- if(response.data.status === -2){
- if(response.data.message==="该手机号尚未注册" || response.data.message==="该邮箱尚未注册"){
+ if (response.data.status === -2) {
+ if (response.data.message === "该手机号尚未注册" || response.data.message === "该邮箱尚未注册") {
this.setState({
- Phonenumberisnotco:response.data.message,
+ Phonenumberisnotco: response.data.message,
})
return;
}
- else if(response.data.message==="错误的账号或密码"){
+ else if (response.data.message === "错误的账号或密码") {
this.setState({
- Phonenumberisnotcodmms:response.data.message,
+ Phonenumberisnotcodmms: response.data.message,
})
return;
}
- else if(response.data.message==="违反平台使用规范,账号已被锁定"){
+ else if (response.data.message === "违反平台使用规范,账号已被锁定") {
this.setState({
- Phonenumberisnotco:response.data.message,
+ Phonenumberisnotco: response.data.message,
})
return;
} else if (response.data.message === "登录密码出错已达上限,账号已被锁定, 请10分钟后重新登录或找回密码") {
const messge = (
-
-
- 登录密码出错已达上限,账号已被锁定;
+
+
+ 登录密码出错已达上限,账号已被锁定;
-
- 请10分钟后重新登录或找回密码
-
-
+
+ 请10分钟后重新登录或找回密码
+
+
)
this.openNotifications(messge);
return;
@@ -414,14 +398,14 @@ class LoginRegisterComponent extends Component {
isRender: false
})
var weekArray = JSON.parse(window.sessionStorage.getItem('yslgeturls'));
- if(weekArray===undefined){
- weekArray="/";
+ if (weekArray === undefined) {
+ weekArray = "/";
}
- if(weekArray===null){
- weekArray="/";
+ if (weekArray === null) {
+ weekArray = "/";
}
- if(weekArray==="null"){
- weekArray="/";
+ if (weekArray === "null") {
+ weekArray = "/";
}
window.location.href = weekArray;
}
@@ -452,57 +436,57 @@ class LoginRegisterComponent extends Component {
// this.openNotification(`请同意服务协议条款`,2);
// return;
// }
- if (this.state.logins === undefined || this.state.logins === ""||this.state.logins.length===0) {
+ if (this.state.logins === undefined || this.state.logins === "" || this.state.logins.length === 0) {
this.setState({
- Phonenumberisnotcos:"账号不能为空",
+ Phonenumberisnotcos: "账号不能为空",
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
}
- if(this.state.pciphone===true){
+ if (this.state.pciphone === true) {
if (this.state.dragOk === false) {
// this.openNotification(`请拖动滑块完成验证`,2);
this.setState({
- Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ Phonenumberisnotcosytdhk: "请拖动滑块完成验证",
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
}
}
- if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
+ if (this.state.codes === undefined || this.state.codes == "" || this.state.codes.length === 0) {
// this.openNotification(`请输入验证码`,2);
this.setState({
- Phonenumberisnotcosyzm:"验证码不能为空",
+ Phonenumberisnotcosyzm: "验证码不能为空",
})
return
- } else if (this.state.passwords === undefined || this.state.passwords == "" ||this.state.passwords.length===0) {
+ } else if (this.state.passwords === undefined || this.state.passwords == "" || this.state.passwords.length === 0) {
this.setState({
- Phonenumberisnotcosymmm:"密码不能为空",
+ Phonenumberisnotcosymmm: "密码不能为空",
})
return
- } else if (this.state.passwords !==undefined &&this.state.passwords.length>0&&this.state.passwords.length<8){
+ } else if (this.state.passwords !== undefined && this.state.passwords.length > 0 && this.state.passwords.length < 8) {
this.setState({
- Phonenumberisnotcosymmm:"密码不能少于8位",
+ Phonenumberisnotcosymmm: "密码不能少于8位",
})
return
- } else if (this.state.passwords !==undefined &&this.state.passwords.length>0&&this.state.passwords.length>16){
+ } else if (this.state.passwords !== undefined && this.state.passwords.length > 0 && this.state.passwords.length > 16) {
this.setState({
- Phonenumberisnotcosymmm:"密码不能超过16位",
+ Phonenumberisnotcosymmm: "密码不能超过16位",
})
return
} else if (this.state.Agreetotheterms === false) {
- this.openNotification(`请同意服务协议条款`,2);
+ this.openNotification(`请同意服务协议条款`, 2);
return;
}
let url;
- if(this.props.weixinlogin){
- url= '/weapps/register.json';
- }else{
+ if (this.props.weixinlogin) {
+ url = '/weapps/register.json';
+ } else {
url = "/accounts/register.json";
}
@@ -511,25 +495,25 @@ class LoginRegisterComponent extends Component {
password: this.state.passwords,
code: this.state.codes,
}).then((result) => {
- if(result){
- if(result.data.status===-2){
- if(result.data.message==="验证码不正确"){
+ if (result) {
+ if (result.data.status === -2) {
+ if (result.data.message === "验证码不正确") {
this.setState({
- Phonenumberisnotcosyzm:"验证码不正确",
+ Phonenumberisnotcosyzm: "验证码不正确",
})
return;
- }else if(result.data.message==="验证码已失效"){
+ } else if (result.data.message === "验证码已失效") {
this.setState({
- Phonenumberisnotcosyzm:"验证码不正确",
+ Phonenumberisnotcosyzm: "验证码不正确",
})
return;
- }else {
+ } else {
this.openNotification(result.data.message);
return;
}
- }else {
+ } else {
// this.setState({
// logins: "",
// dragOk: false,
@@ -559,21 +543,21 @@ class LoginRegisterComponent extends Component {
// console.log(result);
// this.setState({dragOk: true})
- if(result){
- if(result.data.status===-2){
+ if (result) {
+ if (result.data.status === -2) {
if (id === 1) {
- if(result.data.message==="该手机号码或邮箱已被注册"){
+ if (result.data.message === "该手机号码或邮箱已被注册") {
this.setState({
Phonenumberisnotco: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
})
- }else {
+ } else {
this.setState({
Phonenumberisnotco: result.data.message,
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
@@ -583,26 +567,26 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: result.data.message,
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return;
}
- }else {
+ } else {
if (id === 1) {
this.setState({
Phonenumberisnotco: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
})
return;
} else if (id === 2) {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
- dragOk:true,
+ dragOk: true,
})
return;
}
@@ -615,20 +599,20 @@ class LoginRegisterComponent extends Component {
};
//短信验证
SMSverification = () => {
- let logins=this.state.logins;
+ let logins = this.state.logins;
var url = `/accounts/get_verification_code.json`;
axios.get((url), {
params: {
login: this.state.logins,
type: 1,
- smscode:setmiyah(logins)
+ smscode: setmiyah(logins)
}
}).then((result) => {
//验证有问题{"status":1,"message":"success"}
// console.log(result);
- if(result.data.status===1){
+ if (result.data.status === 1) {
this.openNotification("验证码已发送,请注意查收");
- }else if(result.data.status===-2){
+ } else if (result.data.status === -2) {
this.openNotification(result.data.message);
}
}).catch((error) => {
@@ -641,13 +625,13 @@ class LoginRegisterComponent extends Component {
if (this.state.classpassbool === true) {
this.setState({
- passopens:passoff ,
+ passopens: passoff,
classpass: "text",
classpassbool: false,
})
} else {
this.setState({
- passopens: passopen ,
+ passopens: passopen,
classpass: "password",
classpassbool: true,
})
@@ -659,19 +643,19 @@ class LoginRegisterComponent extends Component {
getverificationcode = () => {
// console.log(this.state.Phonenumberisnotcobool);
// console.log(this.state.dragOk);
- if(this.state.logins === undefined || this.state.logins.length===0){
+ if (this.state.logins === undefined || this.state.logins.length === 0) {
this.openNotification("请输入手机号或邮箱");
return;
}
//这是判断是否手机正确
- if(this.state.Phonenumberisnotcobool === true){
+ if (this.state.Phonenumberisnotcobool === true) {
this.openNotification(this.state.Phonenumberisnotcos);
this.setState({
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return;
}
- if(this.state.pciphone===true) {
+ if (this.state.pciphone === true) {
if (this.state.dragOk === false) {
this.openNotification("请拖动滑块验证");
return;
@@ -723,25 +707,25 @@ class LoginRegisterComponent extends Component {
loginInputonChange = (e) => {
// console.log(e.target.value);
var stirngt;
- if(e.target.value.length>0){
- var str= e.target.value.replace(/\s*/g,"")
- stirngt=str;
- }else{
- stirngt= e.target.value;
+ if (e.target.value.length > 0) {
+ var str = e.target.value.replace(/\s*/g, "")
+ stirngt = str;
+ } else {
+ stirngt = e.target.value;
}
if (e.target.value.length === 0) {
this.setState({
Phonenumberisnotco: undefined,
Phonenumberisnotcobool: false,
- Phonenumberisnotcodmms:undefined,
+ Phonenumberisnotcodmms: undefined,
login: stirngt,
})
- }else{
+ } else {
this.setState({
login: stirngt,
- Phonenumberisnotco:undefined,
- Phonenumberisnotcodmms:undefined,
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcodmms: undefined,
})
}
@@ -758,20 +742,17 @@ class LoginRegisterComponent extends Component {
})
return;
}
- // var telephone = $("#telephoneAdd.tianjia_phone").val();
var regph = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
- // var email = $("#add_email.tianjia_email").val();
var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
- // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
var stringdata = undefined;
if (!regph.test(e.target.value)) {
stringdata = "手机号格式不正确";
this.setState({
Phonenumberisnotcos: stringdata,
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
} else {
this.setState({
@@ -792,8 +773,8 @@ class LoginRegisterComponent extends Component {
this.setState({
Phonenumberisnotcos: stringdata,
Phonenumberisnotcobool: true,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
} else {
@@ -809,47 +790,43 @@ class LoginRegisterComponent extends Component {
}
//获取登入密码
passwordonChange = (e) => {
- // console.log(e.target.value);
var stirngt;
- if(e.target.value.length>0){
- var str= e.target.value.replace(/\s*/g,"")
- stirngt=str;
- }else{
- stirngt= e.target.value;
+ if (e.target.value.length > 0) {
+ var str = e.target.value.replace(/\s*/g, "")
+ stirngt = str;
+ } else {
+ stirngt = e.target.value;
}
this.setState({
password: stirngt,
- Phonenumberisnotcodmm:undefined,
- Phonenumberisnotcodmms:undefined,
+ Phonenumberisnotcodmm: undefined,
+ Phonenumberisnotcodmms: undefined,
})
- // this.setState({
- // password: e.target.value
- // })
}
//获取注册登入
loginInputonChanges = (e) => {
var stirngt;
- if(e.target.value.length>0){
- var str= e.target.value.replace(/\s*/g,"")
- stirngt=str;
- }else{
- stirngt= e.target.value;
+ if (e.target.value.length > 0) {
+ var str = e.target.value.replace(/\s*/g, "")
+ stirngt = str;
+ } else {
+ stirngt = e.target.value;
}
if (e.target.value.length === 0) {
this.setState({
Phonenumberisnotcos: undefined,
Phonenumberisnotcobool: false,
logins: stirngt,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
- }else{
+ } else {
this.setState({
logins: stirngt,
Phonenumberisnotcos: undefined,
- dragOk:false,
- Whethertoverify:this.state.Whethertoverify===true?false:true,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
}
@@ -858,449 +835,129 @@ class LoginRegisterComponent extends Component {
passwordonChanges = (e) => {
// console.log(e.target.value);
var stirngt;
- if(e.target.value.length>0){
- var str= e.target.value.replace(/\s*/g,"")
- stirngt=str;
- }else{
- stirngt= e.target.value;
+ if (e.target.value.length > 0) {
+ var str = e.target.value.replace(/\s*/g, "")
+ stirngt = str;
+ } else {
+ stirngt = e.target.value;
}
this.setState({
passwords: stirngt,
- Phonenumberisnotcosymmm:undefined,
+ Phonenumberisnotcosymmm: undefined,
})
}
//获取code
codesonChange = (e) => {
this.setState({
codes: e.target.value,
- Phonenumberisnotcosyzm:undefined,
+ Phonenumberisnotcosyzm: undefined,
})
}
//切换tab
- changeTab=(e)=>{
+ changeTab = (e) => {
this.setState({
- tab:e.key
+ tab: e.key
})
-
- if(e.key === 0){
+ if (e.key === 0) {
this.setState({
- Phonenumberisnotcos:undefined
+ Phonenumberisnotcos: undefined
})
- }else{
+ } else {
this.setState({
- Phonenumberisnotco:undefined
+ Phonenumberisnotco: undefined
})
-
}
-
- // this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/student_exercise_list?tab=`+e.key)
-
}
- loginonkeyup =(e)=>{
- if(e.keyCode==32){
-
- return false;
- }
- };
- setNotcompleteds=()=>{
+ setMyEduCoderModals = () => {
this.setState({
- Notcompleteds:true,
- MyEduCoderModals:false,
- registered:undefined,
-
- })
- };
- setMyEduCoderModals=()=>{
- this.setState({
- MyEduCoderModals:true,
- registered:"注册成功"
+ MyEduCoderModals: true,
+ registered: "注册成功"
})
};
- openweixinlogin=()=>{
- this.setState({
- weixinlogin:true
- })
- }
- hideweixinlogin=()=>{
- this.setState({
- weixinlogin:false,
- qqlogin:false,
- tab:["0"]
- })
- }
-
- openqqlogin=()=>{
- this.setState({
- qqlogin:true
- })
- //window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
- window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
- // window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
- }
-
- openphoneqqlogin=()=>{
- window.open(
- `https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
- )
- }
render() {
- const {
- // 登录
- autoLogin,
- classpass,
- passopens,
- seconds,
- getverificationcodes,
- Agreetotheterms,
- Phonenumberisnotco,
- Phonenumberisnotcos,
- codes,
- tab,
- dragOk,
- Whethertoverify,
- classpassbool,
- Phonenumberisnotcosytdhk,
- Phonenumberisnotcosyzm,
- Phonenumberisnotcosymmm,
- Phonenumberisnotcodmm,
- // 注册
- readAgreement,
- pciphone,
- Phonenumberisnotcodmms,
- weixinlogin
- } = this.state
- // height: 346px;
- if (this.state.seconds === 0) {
- // window.location.href='http://www.cnblogs.com/a-cat/';
- }
-
-
+ const {passopens,Agreetotheterms,Phonenumberisnotcos,tab,classpassbool,Phonenumberisnotcosymmm} = this.state
return (
-
-
-
+ }
+
-
- {weixinlogin===false&&this.props.weixinlogin===undefined?
:""}
-
- {
- weixinlogin===false&&parseInt(tab[0])==0 &&
-
-
-
-
this.inputOnBlur(e, 1)}
- style={{marginTop: '30px', height: '38px'}}
- onPressEnter={() => this.postLogin()}
- >
-
- {
- Phonenumberisnotco && Phonenumberisnotco != "" ?
-
- {Phonenumberisnotco}
-
- :
- }
-
-
this.postLogin()}
- className={Phonenumberisnotcodmm && Phonenumberisnotcodmm !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
- placeholder="密码">
- {
- Phonenumberisnotcodmm && Phonenumberisnotcodmm != "" ?
-
- {Phonenumberisnotcodmm}
-
- : (Phonenumberisnotcodmms=== undefined?
:"")
- }
- {
- Phonenumberisnotcodmms && Phonenumberisnotcodmms != "" ?
-
- {Phonenumberisnotcodmms}
-
- : ""
- }
-
-
-
-
- {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?
-
- ———————— 快速登录 ————————
-
- :
- ———————— 快速登录 ————————
-
- :""}
-
- }
-
-
-
- {
- weixinlogin===false&&parseInt(tab[0])==1 &&
-
-
this.inputOnBlurzhuche(e, 2)}
- style={{marginTop: '30px' , height: '38px',color:'#999999',fontSize:"14px"}}>
- {
- Phonenumberisnotcos && Phonenumberisnotcos !== "" ?
-
- {Phonenumberisnotcos}
-
- :
-
- }
- {this.state.MyEduCoderModals===true?
{this.setNotcompleteds()}}
- />:""}
-
- {
- Whethertoverify===false&&pciphone===true?
-
-
- :
- ""
-
- }
- {
- Whethertoverify===true&&pciphone===true?
-
-
- :
- ""
- }
-
-
- {
- pciphone===true?
- (
- Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk !== "" ?
-
- {Phonenumberisnotcosytdhk}
-
- :
-
- )
- :""
- }
-
-
-
-
-
-
-
-
- {
- getverificationcodes === undefined ?
-
- : getverificationcodes === true ?
-
- :
-
- }
-
-
-
- {
- Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ?
-
- {Phonenumberisnotcosyzm}
-
- :
-
- }
-
-
-
-
-
- this.Showandhide(key)}>
-
- }>
- {
- Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ?
-
- {Phonenumberisnotcosymmm}
+ }
+ `
+ }
+
+ this.Showandhide(key)}>
+
+ }>
+ {
+ Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ?
+
+ {Phonenumberisnotcosymmm}
- :
+ :
- }
- {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?我已阅读并同意
-
- 《服务协议条款》
- :""}
-
-
- {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?
-
- ———————— 快速登录 ————————
-
- :
- ———————— 快速登录 ————————
-
- :""
- }
-
- }
-
-
-
-
- {weixinlogin===true?
:""}
- {weixinlogin===true?
- this.hideweixinlogin()}>返回登录注册
-
:""}
-
-
-
+ }
+ {/* {this.props.mygetHelmetapi && this.props.mygetHelmetapi.main_site === true ?
+ 我已阅读并同意
+ 《服务协议条款》
+ : ""} */}
+
+
+
+
);
}
}
From 49ebe450beaf4e36231a6a860ecef9f88c8ede7d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 31 Mar 2021 11:15:41 +0800
Subject: [PATCH 004/274] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E7=89=88=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Head/Header.js | 4 +-
src/forge/Main/CoderRootCommit.js | 17 +++--
src/forge/Source/Index.jsx | 111 +++++++++++++++++++++++++++++-
src/forge/Source/Index.scss | 65 +++++++++++++++++
src/forge/Source/UploadSource.jsx | 22 ++++++
src/modules/login/LoginDialog.js | 10 +--
src/modules/tpm/NewHeader.js | 10 ++-
7 files changed, 224 insertions(+), 15 deletions(-)
create mode 100644 src/forge/Source/UploadSource.jsx
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index e7880362c..64ad93fc8 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -696,8 +696,8 @@ class NewHeader extends Component {
this.educoderlogin()} className="mr5 color-grey-6">登录
{
- settings && settings.new_course && settings.new_course.register_url &&
- 注册
+ settings && settings.common && settings.common.register &&
+ 注册
}
:
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index f87a85398..bb4f5ba52 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -74,6 +74,7 @@ class CoderRootCommit extends Component{
array.push({
name:item.author && item.author.name,
login: item.author && item.author.login,
+ id: item.author && item.author.id,
image_url:item.author && item.author.image_url,
sha:item.sha,
time_from_now:item.time_from_now,
@@ -136,10 +137,18 @@ class CoderRootCommit extends Component{
{item.message}
-
- {item.image_url?
:""}
-
-
+ {
+ item.id ?
+
+ {item.image_url?
:""}
+
+ :
+
+ {item.image_url?
:""}
+
+
+ }
+
)
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index 475bda0c5..3ba406782 100644
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@@ -1,16 +1,121 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import './Index.scss';
import { Blueback , FlexAJ } from '../Component/layout';
+import { Dropdown, Input , Menu , Pagination } from 'antd';
+import { Link } from 'react-router-dom';
+import UploadSource from './UploadSource';
+const { Search } = Input;
+const sort = [
+ "按上传时间排序",
+ "按下载次数排序",
+ "按引用排序"
+]
+const limit = 15;
function Index(props){
+ const [ sortValue , setSortValue ] = useState(0);
+ const [ page , setPage ] = useState(1);
+ const [ total , setTotal ] = useState(0);
+ const [ search , setSearch ] = useState(undefined);
+
+ const [ visible , setVisible ] = useState(false);
+
+ useEffect(()=>{
+
+ },[search,sort,page])
+
+ // 搜索
+ function onSearch(value){
+ setSearch(value);
+ }
+
+ // 切换排序方式
+ function changeSort(e,index){
+ setSortValue(index);
+ }
+
+
+ const menu=(
+
+ )
+
+ const listmenu=(
+
+ )
+
+ function onOk(){
+
+ }
return(
+
setVisible(false)} onOk={onOk}/>
- 资源库
- 上传资源
+ 资源库(18)
+ setVisible(true)}>上传资源
+
+
+
+ {sort[sortValue]}
+
+
+
+
+ -
+
+
+
+ DaVinci.fdb
+
+
+
+
+
+ 上传时间:2021-03-30
+ 上传类型:软件版本
+ 文件大小:10KB
+ 下载:111
+
+
资源描述资源描述资源描述资源描述资源描述资源描述资源描述
+
+ 软件版本
+
+
+
+
+ {
+ total > limit &&
+
+ }
+
)
}
diff --git a/src/forge/Source/Index.scss b/src/forge/Source/Index.scss
index 4338c5a9f..20f55c27a 100644
--- a/src/forge/Source/Index.scss
+++ b/src/forge/Source/Index.scss
@@ -8,4 +8,69 @@
padding:15px 20px;
border-bottom: 1px solid #eee;
}
+ .subHeadtitle{
+ padding:15px 20px;
+ border-bottom: 1px solid #eee;
+ .ant-input-group-wrapper{
+ width:320px;
+ .ant-btn.ant-input-search-button{
+ margin: 0px;
+ margin-top: -1px;
+ }
+ }
+ }
+ .bodycontent{
+ padding:0px 20px;
+ & > ul.bodycontentul > li{
+ display: flex;
+ border-bottom: 1px solid #eee;
+ padding:20px 0px;
+ align-items: flex-start;
+ &:last-child{
+ border-bottom: none;
+ }
+ .infoImg{
+ img{
+ width: 50px;
+ height: 50px;
+ border-radius: 50%;
+ }
+ margin-right: 15px;
+ }
+ .infoname{
+ font-size: 16px;
+ }
+ .infos{
+ & > span{
+ margin-right: 20px;
+ color: #999;
+ & >span{
+ color: #666;
+ }
+ }
+ }
+ .infodesc{
+ color: #666;
+ line-height: 20px;
+ margin:5px 0px!important;
+ }
+ .infotag{
+ display: flex;
+ flex-wrap: wrap;
+ span{
+ display: block;
+ padding:0px 4px;
+ height: 20px;
+ line-height: 20px;
+ font-size: 12px;
+ margin-right: 10px;
+ border: 1px solid #f8df8c;
+ background: #fffce6;
+ color: #0d90c3;
+ border-radius: 2px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/Source/UploadSource.jsx b/src/forge/Source/UploadSource.jsx
new file mode 100644
index 000000000..a8ccfdc3a
--- /dev/null
+++ b/src/forge/Source/UploadSource.jsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { Modal } from 'antd';
+
+
+function UploadSource({ visible , onCancel , onOk }){
+ return(
+
+
+
+ )
+}
+export default UploadSource;
\ No newline at end of file
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index f00088a90..aebfba8c7 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -1,8 +1,8 @@
import React, { Component } from 'react';
+
import Dialog from 'material-ui/Dialog';
import { notification } from 'antd';
-
import axios from 'axios';
import './LoginDialog.css';
@@ -323,6 +323,7 @@ class LoginDialog extends Component {
return flag;
}
componentDidMount() {
+
let flag = this.IsPC(); //true为PC端,false为手机端
this.setState({
isphone: flag
@@ -472,6 +473,7 @@ class LoginDialog extends Component {
let { qqlogin, login, isGoing, isGoingValue, disabled, bottonclass, Phonenumberisnotco,
dialogBox, isRender, weixinlogin } = this.state;
+ let { settings } = this.props;
if (isRender === undefined) {
isRender = false
}
@@ -574,9 +576,9 @@ class LoginDialog extends Component {
- this.getloginurl("https://www.trustie.net/account/lost_password")}
- className="mr3 color-grey-9">找回密码
- this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册
+ this.getloginurl(`${settings && settings.common && settings.common.lost_password}`)} className="mr3 color-grey-9">找回密码
+
+ this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index bf835abc0..6d5b9697a 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -811,12 +811,18 @@ class NewHeader extends Component {
{user === undefined ?
this.educoderlogin()} className="mr5 color-grey-6">登录
- 注册
+ {
+ settings && settings.common && settings.common.register &&
+ 注册
+ }
: user.login === "" ?
this.educoderlogin()} className="mr5 color-grey-6">登录
- 注册
+ {
+ settings && settings.common && settings.common.register &&
+ 注册
+ }
:
From 8429effe16f94cb7139047fcf520e689ceb6c009 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 31 Mar 2021 12:02:38 +0800
Subject: [PATCH 005/274] =?UTF-8?q?=E6=B2=A1logo=E6=97=B6=E4=BC=9A?=
=?UTF-8?q?=E5=B0=86setting=E9=87=8D=E7=BD=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Head/Header.js | 32 +++-----------------------------
1 file changed, 3 insertions(+), 29 deletions(-)
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 64ad93fc8..069d07a8a 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -404,41 +404,14 @@ class NewHeader extends Component {
})
}
- getAppdata = () => {
- try {
- var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
- var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
- this.setState({
- settings: chromesettingArray
- });
- if (chromesettingArray.tab_logo_url) {
- this.gettablogourldata(chromesettingresponseArray);
- } else {
- this.gettablogourlnull();
- }
- } catch (e) {
- this.geturlsdata();
- }
- };
-
geturlsdata = () => {
let url = "/setting.json";
axios.get(url).then((response) => {
if (response && response.data) {
this.setState({ settings: response.data.setting });
- // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
- // localStorage.setItem('chromesettingresponse', JSON.stringify(response));
- try {
- if (response.data.setting.tab_logo_url) {
- this.gettablogourldata(response);
- } else {
- this.gettablogourlnull();
- }
- } catch (e) {
- this.gettablogourlnull();
+ if (response.data.setting.tab_logo_url) {
+ this.gettablogourldata(response);
}
- } else {
- this.gettablogourlnull();
}
}).catch((error) => {
this.gettablogourlnull();
@@ -579,6 +552,7 @@ class NewHeader extends Component {
let search_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="搜索");
let notice_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="通知");
+
return (