From 0bc92a8729a1e8b9a8022d70c9cd26ee119e81ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 30 Jul 2019 23:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=97=E5=8C=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/user/usersInfo/InfosPackage.js | 125 +++++++++++++++--- 1 file changed, 109 insertions(+), 16 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index f1077cd62..65cf2467a 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -2,16 +2,35 @@ import React, { Component } from 'react'; import { SnackbarHOC } from 'educoder'; import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; import {Tooltip,Menu,Pagination,Spin} from 'antd'; -import Loadable from 'react-loadable'; -import Loading from '../../../Loading'; import axios from 'axios'; -import NoneData from '../../courses/coursesPublic/NoneData' import {getImageUrl} from 'educoder'; -import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; -import { CNotificationHOC } from '../../courses/common/CNotificationHOC' +import NoneData from '../../courses/coursesPublic/NoneData' import "./usersInfo.css" -import Create from './publicCreatNew' +import moment from 'moment'; +let categorylist=[ + {name:"全部",value:undefined}, + {name:"前端开发",value:"front"}, + {name:"后端开发",value:"backend"}, + {name:"移动开发",value:"mobile"}, + {name:"数据库",value:"database"}, + {name:"云计算和大数据",value:"cloud_compute_and_big_data"}, + {name:"人工智能",value:"ai"}, + {name:"运维与测试",value:"devops_and_test"}, + {name:"其他",value:"other"}, +] +// +function setcategorylist(val){ + let vals="" + categorylist.some((item,key)=> { + if (item.name === val) { + vals=item.value + return true + } + } + ) + return vals +} class InfosPackage extends Component{ constructor(props){ super(props); @@ -19,8 +38,8 @@ class InfosPackage extends Component{ category:undefined, status:undefined, page:1, - per_page:16, - + per_page:20, + sort_direction:'desc', totalCount:undefined, data:undefined, isSpin:false @@ -36,12 +55,14 @@ class InfosPackage extends Component{ } getCourses=(category,status,page)=>{ - let url=`/users/${this.props.match.params.username}/courses.json`; + let url=`/users/${this.props.match.params.username}/project_packages.json`; axios.get((url),{params:{ category, status, page, - per_page: this.props.is_current && category && page ==1?17:16 + sort_by:"published_at", + sort_direction:'desc', + per_page:20 }}).then((result)=>{ if(result){ this.setState({ @@ -103,21 +124,93 @@ class InfosPackage extends Component{ } = this.state; let is_current=this.props.is_current; - console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") + console.log(data) return(
-
  • this.changeCategory()}>全部
    • -
  • this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
    • -
  • this.changeCategory("study")}>{is_current ? "我":"TA"}参与的
    • +
  • this.changeCategory()}>全部
    • +
  • this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
    • +
  • this.changeCategory("bidden")}>{is_current ? "我":"TA"}参与的
    • - + { + category=="manage"? +
    +
  • this.changeStatus()}>全部
    • +
  • this.changeStatus("unpublished")}>未发布
    • +
  • this.changeStatus("bidding")}>竞标中
    • +
  • this.changeStatus("finished")}>已完成
    • +
    : category=="bidden"? +
    +
  • this.changeStatus()}>全部
    • +
  • this.changeStatus("bidding_lost")}>未中标
    • +
  • this.changeStatus("bidding_won")}>已中标
    • +
    :"" + }

    - 共{0}个 + 共{totalCount}个 发布时间

    + {/*bidden_status: "pending"*/} + + {/*category_id: 2*/} + + {/*status: "published"*/} + + {/*type: "bidden"*/} + + + {data===undefined?:data.project_packages.length===0?:data.project_packages.map((item,key)=>{ + return( +
    +
    +
    + 图片 +
    +
    +
    + +
    +
    +
    +
    + {item.min_price===null?"":￥{item.min_price}} + {item.max_price===null||item.min_price===null?"":~} + {item.max_price===null?"":￥{item.max_price}} + {item.min_price===null&&item.max_price===null?可议价:""} +
    +
    +
    +
    {item.category_name}
    +
    +
    +
    + + {item.visit_count}人浏览 +
    +
    + + {moment(item.deadline_at).endOf('day').fromNow()}竞标截止 +
    +
    + + {item.bidding_users_count}人竞标 +
    +
    +
    + 发布于：{item.published_at} +
    +
    +
    +
    +
    + )})} + + +
    )