dev_aliyun2
harry 5 years ago
parent dda18468ec
commit 18566d0b24

@ -1,5 +1,6 @@
import React, { Fragment } from 'react' import React, { Fragment } from 'react'
import { getImageUrl, setImagesUrl } from 'educoder'; import { getImageUrl, setImagesUrl } from 'educoder';
import { Link } from 'react-router-dom'
import { Tooltip, Rate } from 'antd'; import { Tooltip, Rate } from 'antd';
import './index.less' import './index.less'
@ -30,15 +31,15 @@ export default ({ list = [] }) => {
<p className="font-14 color-white">非试用内容需要授权</p> <p className="font-14 color-white">非试用内容需要授权</p>
</div> </div>
} }
<a href={"/shixuns/" + identifier + "/challenges"} className="square-img" target="_blank"> <Link to={"/shixuns/" + identifier + "/challenges"} className="square-img" target="_blank">
<img src={setImagesUrl(`${pic}`)} /> <img src={setImagesUrl(`${pic}`)} />
</a> </Link>
<div className="square-main"> <div className="square-main">
<p className="task-hide"> <p className="task-hide">
<a href={"/shixuns/" + identifier + "/challenges"} className="justify color-grey-name" title={name} target="_blank"> <Link to={"/shixuns/" + identifier + "/challenges"} className="justify color-grey-name" title={name} target="_blank">
{name} {name}
</a> </Link>
</p> </p>
<p className="clearfix mt8 ml-3"> <p className="clearfix mt8 ml-3">

@ -1,13 +1,5 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Redirect } from 'react-router';
import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
import PropTypes from 'prop-types';
import classNames from 'classnames'
const $ = window.$;
const _origin = window.location.origin; const _origin = window.location.origin;
class CommentItemKEEditor extends Component { class CommentItemKEEditor extends Component {
@ -42,9 +34,6 @@ class CommentItemKEEditor extends Component {
} else { } else {
$(reply_message_el).show(); $(reply_message_el).show();
} }
// $(reply_message_el).html("");
// $(reply_iconup_el).hide();
} }
// 自动focus // 自动focus
setTimeout(() => { setTimeout(() => {

@ -5,7 +5,7 @@ import Loading from '../../components/loading'
import ShixunCardList from '../../components/shixun-card-list' import ShixunCardList from '../../components/shixun-card-list'
import TPMIndexHOC from '../tpm/TPMIndexHOC' import TPMIndexHOC from '../tpm/TPMIndexHOC'
import ListContainer from './list-container' import ListContainer from './list-container'
import { SnackbarHOC, getImageUrl, configShareForIndex } from 'educoder' import { SnackbarHOC } from 'educoder'
import ShixunPathCard from '../paths/ShixunPathCard' import ShixunPathCard from '../paths/ShixunPathCard'
import { Carousel } from 'antd' import { Carousel } from 'antd'
import { getUrl } from 'educoder' import { getUrl } from 'educoder'

@ -492,8 +492,6 @@ class NewHeader extends Component {
return return
} }
} }
// console.log("点击了503")
// console.log(url);
let { user } = this.state; let { user } = this.state;
if (user === undefined) { if (user === undefined) {
@ -525,16 +523,9 @@ class NewHeader extends Component {
} }
} }
if (url !== undefined || url !== "") { if (url !== undefined || url !== "") {
window.location.href = url; window.location.href = url;
} }
} }
//修改登录方法 //修改登录方法
@ -586,7 +577,6 @@ class NewHeader extends Component {
document.head.appendChild(link); document.head.appendChild(link);
} }
handleVisibleChanges = (boll) => { handleVisibleChanges = (boll) => {
this.setState({ this.setState({
visiblemyss: boll, visiblemyss: boll,
@ -594,15 +584,10 @@ class NewHeader extends Component {
} }
getAppdata = () => { getAppdata = () => {
try { try {
var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse')); var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
// console.log("NewHeaderNewHeaderNewHeader");
// console.log(chromesettingArray);
// console.log(chromesettingresponseArray);
this.setState({ this.setState({
mygetHelmetapi2: chromesettingArray mygetHelmetapi2: chromesettingArray
}); });
@ -620,8 +605,6 @@ class NewHeader extends Component {
geturlsdata = () => { geturlsdata = () => {
let url = "/setting.json"; let url = "/setting.json";
axios.get(url).then((response) => { axios.get(url).then((response) => {
// console.log("app.js开始请求/setting.json");
// console.log("获取当前定制信息");
if (response) { if (response) {
if (response.data) { if (response.data) {
this.setState({ this.setState({
@ -689,7 +672,6 @@ class NewHeader extends Component {
}) })
} }
render() { render() {
const isLogin = true; // 这里不会出现未登录的情况,服务端在服务端路由时发现如果是未登录,则跳转到登录页了。
const { match } = this.props; const { match } = this.props;
let { Addcoursestypes, let { Addcoursestypes,
@ -740,14 +722,9 @@ class NewHeader extends Component {
let headtypes = '/'; let headtypes = '/';
// console.log("mygetHelmetapi2");
// console.log(mygetHelmetapi2);
if (mygetHelmetapi2) { if (mygetHelmetapi2) {
if (mygetHelmetapi2.navbar) { if (mygetHelmetapi2.navbar) {
if (mygetHelmetapi2.navbar.length > 0) { if (mygetHelmetapi2.navbar.length > 0) {
// console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
//
// console.log(match.path);
if (match.path === '/') { if (match.path === '/') {
if (headtypesonClickbool === false) { if (headtypesonClickbool === false) {
headtypes = undefined; headtypes = undefined;
@ -767,9 +744,6 @@ class NewHeader extends Component {
} }
} }
// console.log(mygetHelmetapi2);
// console.log("NewHeadermygetHelmetapi123123123123");
let shixuntype = false; let shixuntype = false;
let pathstype = false; let pathstype = false;
let coursestypes = false; let coursestypes = false;
@ -860,7 +834,7 @@ class NewHeader extends Component {
"" ""
} }
<a href={"/"} onClick={() => this.headtypesonClick("/", false)} className={"fl mr30 ml25 mt10"}> <Link to={"/"} className={"fl mr30 ml25 mt10"}>
{ {
mygetHelmetapi2 === null ? mygetHelmetapi2 === null ?
"" ""
@ -870,19 +844,8 @@ class NewHeader extends Component {
: :
<img alt="高校智能化教学与实训平台" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(mygetHelmetapi2.nav_logo_url)}></img> <img alt="高校智能化教学与实训平台" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
} }
</a> </Link>
<style>
{
`
.educontents{
margin: 0px auto;
box-sizing: border-box;
}
`
}
</style>
{ {
mygetHelmetapi2 === null ? mygetHelmetapi2 === null ?
"" : "" :

Loading…
Cancel
Save