From ef06ee046283d89cdd363a84cbcc446cdb7f2068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 4 Nov 2019 17:38:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B425338=20=E5=A4=9A=E7=BA=A7tab?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/usersInfo/InfosCourse.js | 83 +++++++++++--- .../modules/user/usersInfo/InfosPackage.js | 72 ++++++++++--- .../src/modules/user/usersInfo/InfosPath.js | 98 +++++++++++++---- .../modules/user/usersInfo/InfosProject.js | 82 +++++++++++--- .../src/modules/user/usersInfo/InfosShixun.js | 101 ++++++++++++++---- .../src/modules/user/usersInfo/usersInfo.css | 12 +++ .../user/usersInfo/video/InfosVideo.js | 6 ++ 7 files changed, 375 insertions(+), 79 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index 8e2478510..b44ed83ad 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -71,8 +71,8 @@ class InfosCourse extends Component{ page:1, isSpin:true }) - let{status}=this.state; - this.getCourses(cate,status,1); + let {status, sort_by, sort_direction} = this.state; + this.getCourses(cate, status, 1, sort_by, sort_direction); } //切换状态 changeStatus=(status)=>{ @@ -81,8 +81,8 @@ class InfosCourse extends Component{ page:1, isSpin:true }) - let{category}=this.state; - this.getCourses(category,status,1); + let {category, sort_by, sort_direction} = this.state; + this.getCourses(category, status, 1, sort_by, sort_direction); } //切换页数 changePage=(page)=>{ @@ -90,8 +90,8 @@ class InfosCourse extends Component{ page, isSpin:true }) - let{category,status}=this.state; - this.getCourses(category,status,page); + let {category, status, sort_by, sort_direction} = this.state; + this.getCourses(category, status, page, sort_by, sort_direction); } // 进入课堂 @@ -147,32 +147,87 @@ class InfosCourse extends Component{ ); - + console.log("InfosCourse"); + console.log(status); return(
-
  • this.changeCategory()}>全部
    • -
  • this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
    • -
  • this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
    • +
  • this.changeCategory()} className="font-16 w32">全部
    • +
  • this.changeCategory("manage")} + className="font-16 w66">{is_current ? "我" : "TA"}管理的
    • +
  • this.changeCategory("study")} + className="font-16 w66">{is_current ? "我" : "TA"}学习的
    • + + { is_current && -
    -
  • this.changeStatus()}>全部
    • -
  • this.changeStatus("processing")}>正在进行
    • -
  • this.changeStatus("end")}>已结束
    • +
    +
  • this.changeStatus()} + className="w32">全部
    • +
  • this.changeStatus("processing")} className="w66">正在进行
    • +
  • this.changeStatus("end")} className="w66">已结束
    • }

    { ` + .whitepanelyslli { + width: 32px !important; + height: 48px !important; + line-height: 46px !important; + } + .whitepanelyslliss { + width: 32px !important; + height: 48px !important; + line-height: 46px !important; + } + + .whitepanelysllis { + width: 66px !important; + height: 48px !important; + line-height: 46px !important; + margin-left: 40px !important; + } .white-panel li.active { border-radius: 24px; border: 0px solid #4CACFF; color: #4CACFF; } + + + ` }

    -
  • this.changeCategory()}>全部
    • -
  • this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
    • -
  • this.changeCategory("bidden")}>{is_current ? "我":"TA"}参与的
    • +
  • this.changeCategory()} className="font-16 w32">全部
    • +
  • this.changeCategory("manage")} + className="font-16 w66">{is_current ? "我" : "TA"}管理的
    • +
  • this.changeCategory("study")} + className="font-16 w66">{is_current ? "我" : "TA"}学习的
    • + { category=="manage"? -
    -
  • this.changeStatus()}>全部
    • -
  • this.changeStatus("unpublished")}>未发布
    • -
  • this.changeStatus("bidding")}>竞标中
    • -
  • this.changeStatus("finished")}>已完成
    • +
    +
  • this.changeStatus()} className="w32">全部
    • +
  • this.changeStatus("unpublished")} className="w60">未发布
    • +
  • this.changeStatus("bidding")} className="w60">竞标中
    • +
  • this.changeStatus("finished")} className="w60">已完成
    • : category=="bidden"? -
    -
  • this.changeStatus()}>全部
    • -
  • this.changeStatus("bidding_lost")}>未中标
    • -
  • this.changeStatus("bidding_won")}>已中标
    • + :"" }

    diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js index 429495cf1..ffb61b2f2 100644 --- a/public/react/src/modules/user/usersInfo/InfosPath.js +++ b/public/react/src/modules/user/usersInfo/InfosPath.js @@ -160,37 +160,97 @@ class InfosPath extends Component{ return(

    - - + } + + + + { category && category == "manage" && is_current && -
    -
  • this.changeStatus()}>全部
    • -
  • this.changeStatus("editing")}>编辑中
    • -
  • this.changeStatus("applying")}>待审核
    • -
  • this.changeStatus("published")}>已发布
    • + } { category && category == "study" && is_current && -
    -
  • this.changeStatus()}>全部
    • -
  • this.changeStatus("unfinished")}>未完成
    • -
  • this.changeStatus("finished")}>已完成
    • + }
    - - + } + + + { is_current && -
    -
  • this.changeStatus()}>全部
    • -
  • this.changeStatus("publicly")}>公开
    • -
  • this.changeStatus("personal")}>私有
    • + }

    - -

    + } + + + + { category && category == "manage" && is_current && -
    -
  • this.changeStatus()}>全部
    • -
  • this.changeStatus("editing")}>编辑中
    • -
  • this.changeStatus("applying")}>待审核
    • -
  • this.changeStatus("published")}>已发布
    • -
  • this.changeStatus("closed")}>已关闭
    • + } { category && category == "study" && is_current && -