diff --git a/public/react/src/modules/tpm/shixuns/ShixunCardList.js b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
index 2125eecea..078016057 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunCardList.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
@@ -1,251 +1,253 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route} from "react-router-dom";
-
-import { Switch ,Input,Tooltip,Icon} from 'antd';
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import 'antd/lib/switch/style/index.css'
-
-import './shixunCss/ShixunCardList.css';
-
-import { on, off } from 'educoder'
-
-const $ = window.$;
-
-const Search = Input.Search;
-
-class ShixunCardList extends Component {
-
- constructor(props) {
- super(props);
- this.state={
- allevent:"desc",
- mine:0,
- InputValue: props.keyword || "",
- typemy:0,
- hots:0,
- news:0,
- shixunid:"",
- upcircle:false,
- typekeyid:undefined,
- }
- }
-
- componentDidUpdate = (prevProps, prevState) => {
- if (this.props.keyword != prevProps.keyword) {
- this.setState({
- InputValue: this.props.keyword
- })
- }
- }
- componentDidMount = () => {
- on('searchKeywordChange', (event, data) => {
- // console.log(data)
- this.Input_search(data)
- })
- }
- componentWillUnmount = () => {
- off('searchKeywordChange')
- }
-
-
- latestHot=(e,key)=>{
-
- let{upcircle,typekeyid}=this.state;
-
- let id = e.target.id;
- $("#"+id).siblings().removeClass("active");
- $("#"+id).addClass("active");
-
- let type;
-
- if(id==="all"){
- type="publish_time";
- }
- if(id==="hot"){
- type="hot";
- }else if(id==="new"){
- type="new";
-
- }
- if(typekeyid===key){
- if(upcircle===true){
- this.setState({
- upcircle:false,
- })
- this.props.Shixunsupcircles("desc")
- }else if(upcircle===false){
- this.setState({
- upcircle:true,
- })
- this.props.Shixunsupcircles("asc")
- }
- }else{
- this.setState({
- typekeyid:key
- })
- }
-
- //allevent
- this.props.ShixunsState(false,type);
- }
-
-
- onSwitchChange=(e,key)=>{
- let id=e.target.id
- $("#"+id).siblings().removeClass("active");
- $("#"+id).addClass("active");
- let {typemy,upcircle,typekeyid}=this.state;
-
- if(typekeyid===key){
- if(upcircle===true){
- this.setState({
- upcircle:false,
- })
- this.props.Shixunsupcircles("desc")
- }else if(upcircle===false){
- this.setState({
- upcircle:true
- })
- this.props.Shixunsupcircles("asc")
- }
- }else{
- this.setState({
- typekeyid:key
- })
- }
-
-
- if(typemy===0){
- this.setState({
- typemy:1
- })
- }else{
- this.setState({
- typemy:0
- })
- }
- // allevent
- this.props.ShixunsSwitch();
- }
- //输入框搜索
- Input_search = (value) => {
- this.setState({
- InputValue: value
- })
- this.props.OnSearchInput(value,true);
- }
-
- Input_searchs = (e) => {
- this.setState({
- InputValue: e.target.value
- })
- this.props.OnSearchInput(e.target.value,false);
- }
- upcircles=(val)=>{
- if(val==="asc"){
- this.setState({
- upcircle:false,
- })
- this.props.Shixunsupcircles("desc")
- }else if(val==="desc"){
- this.setState({
- upcircle:true
- })
- this.props.Shixunsupcircles("asc")
- }
- }
- render(){
- let {mine,InputValue,upcircle}=this.state;
- return (
-
-
-
-
this.latestHot(e,1)}>全部
-
-
this.onSwitchChange(e,2)}>我的
-
-
-
this.latestHot(e,3)}>最热
-
-
this.latestHot(e,4)}>最新
-
-
-
this.upcircles("asc")}
- >
-
-
- {/**/}
-
-
-
this.upcircles("desc")}
- style={{display:upcircle===true?"none":"block"}}
- >
-
-
- {/**/}
-
-
-
-
- {/* this.Input_search(value)}*/}
- {/*enterButton*/}
- {/*/>*/}
-
- {/* this.Input_search(value)}
- autoComplete="off"
- > */}
-
-
-
{
- this.props.search_tags === null ? "" : this.props.search_tags
- }
- {/*
*/}
- {/*/!*
*/}
- {/*
*!/*/}
- {/*
*/}
- {/*
*/}
- {/*
隐藏我的*/}
-
-
-
-
-
- );
- }
-}
-
-export default ShixunCardList;
+import React, { Component } from 'react';
+import { Redirect } from 'react-router';
+
+import { BrowserRouter as Router, Route} from "react-router-dom";
+
+import { Switch ,Input,Tooltip,Icon} from 'antd';
+
+import PropTypes from 'prop-types';
+
+import classNames from 'classnames'
+
+import 'antd/lib/switch/style/index.css'
+
+import './shixunCss/ShixunCardList.css';
+
+import { on, off } from 'educoder'
+
+const $ = window.$;
+
+const Search = Input.Search;
+
+class ShixunCardList extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state={
+ allevent:"desc",
+ mine:0,
+ InputValue: props.keyword || "",
+ typemy:0,
+ hots:0,
+ news:0,
+ shixunid:"",
+ upcircle:false,
+ typekeyid:undefined,
+ }
+ }
+
+ componentDidUpdate = (prevProps, prevState) => {
+ if (this.props.keyword != prevProps.keyword) {
+ this.setState({
+ InputValue: this.props.keyword
+ })
+ }
+ }
+ componentDidMount = () => {
+ on('searchKeywordChange', (event, data) => {
+ // console.log(data)
+ this.Input_search(data)
+ })
+ }
+ componentWillUnmount = () => {
+ off('searchKeywordChange')
+ }
+
+
+ latestHot=(e,key)=>{
+
+ let{upcircle,typekeyid}=this.state;
+
+ let id = e.target.id;
+ $("#"+id).siblings().removeClass("active");
+ $("#"+id).addClass("active");
+
+ let type;
+
+ if(id==="all"){
+ type="publish_time";
+ }
+ if(id==="hot"){
+ type="hot";
+ }else if(id==="new"){
+ type="new";
+
+ }
+ if(typekeyid===key){
+ if(upcircle===true){
+ this.setState({
+ upcircle:false,
+ })
+ this.props.Shixunsupcircles("desc")
+ }else if(upcircle===false){
+ this.setState({
+ upcircle:true,
+ })
+ this.props.Shixunsupcircles("asc")
+ }
+ }else{
+ this.setState({
+ typekeyid:key
+ })
+ }
+
+ //allevent
+ this.props.ShixunsState(false,type);
+ }
+
+
+ onSwitchChange=(e,key)=>{
+ let id=e.target.id
+ $("#"+id).siblings().removeClass("active");
+ $("#"+id).addClass("active");
+ let {typemy,upcircle,typekeyid}=this.state;
+
+ if(typekeyid===key){
+ if(upcircle===true){
+ this.setState({
+ upcircle:false,
+ })
+ this.props.Shixunsupcircles("desc")
+ }else if(upcircle===false){
+ this.setState({
+ upcircle:true
+ })
+ this.props.Shixunsupcircles("asc")
+ }
+ }else{
+ this.setState({
+ typekeyid:key
+ })
+ }
+
+
+ if(typemy===0){
+ this.setState({
+ typemy:1
+ })
+ }else{
+ this.setState({
+ typemy:0
+ })
+ }
+ // allevent
+ this.props.ShixunsSwitch();
+ }
+ //输入框搜索
+ Input_search = (value) => {
+ this.setState({
+ InputValue: value
+ })
+ this.props.OnSearchInput(value,true);
+ }
+
+ Input_searchs = (e) => {
+ this.setState({
+ InputValue: e.target.value
+ })
+ this.props.OnSearchInput(e.target.value,false);
+ }
+ upcircles=(val)=>{
+ if(val==="asc"){
+ this.setState({
+ upcircle:false,
+ })
+ this.props.Shixunsupcircles("desc")
+ }else if(val==="desc"){
+ this.setState({
+ upcircle:true
+ })
+ this.props.Shixunsupcircles("asc")
+ }
+ }
+ render(){
+ let {mine,InputValue,upcircle}=this.state;
+ return (
+
+
+
+
this.latestHot(e,1)}>全部
+
+
this.onSwitchChange(e,2)}>我的
+
+
+
this.latestHot(e,4)}>最新
+
+
+
this.latestHot(e,3)}>最热
+
+
+
+
this.upcircles("asc")}
+ >
+
+
+ {/**/}
+
+
+
this.upcircles("desc")}
+ style={{display:upcircle===true?"none":"block"}}
+ >
+
+
+ {/**/}
+
+
+
+
+ {/* this.Input_search(value)}*/}
+ {/*enterButton*/}
+ {/*/>*/}
+
+ {/* this.Input_search(value)}
+ autoComplete="off"
+ > */}
+
+
+
{
+ this.props.search_tags === null ? "" : this.props.search_tags
+ }
+ {/*
*/}
+ {/*/!*
*/}
+ {/*
*!/*/}
+ {/*
*/}
+ {/*
*/}
+ {/*
隐藏我的*/}
+
+
+
+
+
+ );
+ }
+}
+
+export default ShixunCardList;