From fe626d5e1cc97e30fa6aefd4c37a1cee6a2f91cd Mon Sep 17 00:00:00 2001 From: harry Date: Sat, 7 Mar 2020 02:05:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E5=A2=9E=E5=8A=A0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/paths/ShixunPathSearch.js | 50 ++++++++----------- .../src/modules/tpm/shixuns/ShixunsIndex.js | 38 +++++++++++--- .../tpm/shixuns/shixun-keyword-list.jsx | 34 +++---------- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index 98b28959c..053d06bc7 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -1,10 +1,12 @@ import React, { Component } from 'react'; import axios from 'axios'; -import { Pagination, Dropdown, Menu } from 'antd'; +import { Dropdown, Menu } from 'antd'; import { getImageUrl } from 'educoder'; import PathCard from "./ShixunPathCard"; import UpgradeModals from '../modals/UpgradeModals'; import './ShixunPaths.css'; +import KeywordList from '../tpm/shixuns/shixun-keyword-list'; +import btnUrl from '../tpm/shixuns/btn-new.png'; class ShixunPathSearch extends Component { constructor(props) { @@ -23,18 +25,18 @@ class ShixunPathSearch extends Component { sub_discipline_id: undefined } } - //切换列表状态 - changeStatus = (value) => { + //适配器 + onChangeLabel(value) { + let rs = value === 'new' ? 'updated_at' : 'myshixuns_scount' let { discipline_id, sub_discipline_id } = this.state; this.setState({ - order: value, + order: rs, page: 1 }) - this.getList(value, discipline_id, sub_discipline_id, 1); + this.getList(rs, discipline_id, sub_discipline_id, 1) } - //选择页数 onChange = (pageNumber) => { @@ -95,7 +97,16 @@ class ShixunPathSearch extends Component { }) } - getList = (order, discipline_id, sub_discipline_id, page) => { + OnSearchInput = (value, type) => { + this.setState({ + search: value, + page: 1 + }) + const { order, discipline_id, sub_discipline_id } = this.state + this.getList(order, discipline_id, sub_discipline_id, 1, value) + } + + getList = (order, discipline_id, sub_discipline_id, page, keyword = '') => { let url = '/paths.json'; axios.get(url, { @@ -103,6 +114,7 @@ class ShixunPathSearch extends Component { sort: "desc", limit: 16, order: order, + keyword, page: page, discipline_id: discipline_id, sub_discipline_id: sub_discipline_id @@ -120,7 +132,7 @@ class ShixunPathSearch extends Component { } //头部获取是否已经登录了 - getUser = (url, type) => { + getUser = (url) => { if (this.props.checkIfLogin() === false) { this.props.showLoginDialog() return @@ -238,26 +250,8 @@ class ShixunPathSearch extends Component { -
- {/* this.changeStatus("publish_time")}>全部*/} - {/* this.changeStatus("mine")}>我的*/} - this.changeStatus("updated_at")}>最新 - this.changeStatus("myshixuns_count")}>最热 - {this.props.user && this.props.user.main_site === false ? "" : this.props.Headertop === undefined ? "" : this.getUser("/paths/new")}>+新建实践课程} - {this.props.user && this.props.user.main_site === true ? "" : this.props.Headertop === undefined ? "" : - pathstype === true ? "" : this.props.user && this.props.user.admin === true || this.props.user && this.props.user.is_teacher === true || this.props.user && this.props.user.business === true ? this.getUser("/paths/new")}>+新建实践课程 : "" - } - {/*
*/} - {/*/!* *!/*/} - {/*
*/} -
+ + { this.state.pathList === null ? "" : total_count > 16 && diff --git a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js index e42a2bd36..be9be249b 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js +++ b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js @@ -6,6 +6,7 @@ import ShixunCardList from './shixun-keyword-list'; import ShixunSearchBar from './shixun-search-bar'; import ShixunCard from './shixun-card'; import UpgradeModals from '../../modals/UpgradeModals'; +import GotoQQgroup from '../../../modal/GotoQQgroup' const queryString = require('query-string'); import btnUrl from './btn-new.png' class ShixunsIndex extends Component { @@ -13,6 +14,7 @@ class ShixunsIndex extends Component { super(props) this.state = { order_by: "new", + showQQ: false, page: 1, limit: 16, keyword: "", @@ -278,7 +280,7 @@ class ShixunsIndex extends Component { console.log(error) }); } - ShixunsState = (val, type, sorts) => { + ShixunsState = (type, sorts) => { // sort, let { tag_level, tag_id, page, limit, keyword, status, diff, sort } = this.state; let newsort = sorts ? sorts : sort; @@ -341,8 +343,30 @@ class ShixunsIndex extends Component { this.shixunresultend(params) } + onNewHandler() { + const { checkIfLogin, showLoginDialog, checkIfProfileCompleted, showProfileCompleteDialog, current_user } = this.props + if (!checkIfLogin()) { + showLoginDialog() + return + } + if (!checkIfProfileCompleted()) { + showProfileCompleteDialog() + return + } + if (current_user && current_user.is_shixun_marker === false) { + this.setState( + { showQQ: true } + ) + return + } + window.location.href = '/shixuns/new' + } - + setShowQQ(v) { + this.setState({ + showQQ: v + }) + } shixunresultend = (params) => { let Url = `/shixuns.json`; @@ -363,7 +387,7 @@ class ShixunsIndex extends Component { }); } render() { - let { middleshixundata, typepvisible, pages, search_tags, keyword, parsedid, newtag_level, newpalce } = this.state; + let { middleshixundata, typepvisible, pages, search_tags, keyword, parsedid, newtag_level, newpalce, showQQ } = this.state; // console.log(this.state.updata) return ( @@ -413,14 +437,16 @@ class ShixunsIndex extends Component { {...this.state} /> + { + showQQ ? : + "" + } {/*下方图片*/} diff --git a/public/react/src/modules/tpm/shixuns/shixun-keyword-list.jsx b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.jsx index ca0fc5025..8f3ebf334 100644 --- a/public/react/src/modules/tpm/shixuns/shixun-keyword-list.jsx +++ b/public/react/src/modules/tpm/shixuns/shixun-keyword-list.jsx @@ -1,5 +1,4 @@ import React, { useState, Fragment } from 'react'; -import GotoQQgroup from '../../../modal/GotoQQgroup' import { Input, Icon } from 'antd' import './shixun-keyword-list.scss' @@ -9,17 +8,17 @@ function AddonAfter({ callback }) { 搜索 } -export default ({ onChangeLabel, btnUrl, OnSearchInput, checkIfLogin, showLoginDialog, checkIfProfileCompleted, showProfileCompleteDialog, current_user }) => { +export default ({ onChangeLabel, btnUrl, OnSearchInput, onNewHandler, btnStyle = + {} }) => { const [data, setData] = useState({ type: 'new', - showQQ: false, keyword: '', }) function onChangeTag(e) { const id = e.target.id setData({ ...data, type: id }) - onChangeLabel(false, id, "desc") + onChangeLabel(id, "desc") } function onSetKeyword(e) { setData({ ...data, keyword: e.target.value }) @@ -31,27 +30,14 @@ export default ({ onChangeLabel, btnUrl, OnSearchInput, checkIfLogin, showLoginD } } - function setShowQQ(v) { - setData({ ...data, showQQ: v }) - } - function onNewShiXun() { - if (!checkIfLogin()) { - showLoginDialog() - return - } - if (!checkIfProfileCompleted()) { - showProfileCompleteDialog() - return - } - if (current_user && current_user.is_shixun_marker === false) { - setShowQQ(true) + if (onNewHandler) { + onNewHandler() return } - window.location.href = '/shixuns/new' } - const { type, keyword, showQQ } = data + const { type, keyword } = data return (
@@ -64,17 +50,11 @@ export default ({ onChangeLabel, btnUrl, OnSearchInput, checkIfLogin, showLoginD } defaultValue="" placeholder='请输入课程名称进行搜索' />
- + 创建实训 - { - showQQ ? - - : - "" - } )