Skip to content

S
saas-weichat
Commit 192bee37 by yanglang123
Options

xiugai

parent e2c7aa96
Showing with 1100 additions and 701 deletions
src/common/mediaDisplay/index.jsx
...@@ -188,7 +188,7 @@ class MediaDisplay extends Component { ...@@ -188,7 +188,7 @@ class MediaDisplay extends Component {
key={this.state.imgRefreshKey} key={this.state.imgRefreshKey}
id={'media-diplay-container' + this.state.randomId} id={'media-diplay-container' + this.state.randomId}
className={this.props.className + ' media-diplay-container-class'} className={this.props.className + ' media-diplay-container-class'}
style={{ width: this.props.width || '100%' }} style={{ width: this.props.width || '100%' ,fontSize:'32px'}}
dangerouslySetInnerHTML={{ __html: this.props.content }} dangerouslySetInnerHTML={{ __html: this.props.content }}
/> />
); );
......
src/components/AllDescribe/action.js 0 → 100644
import excute from '../../util/fetchUtil';
import API from '../../util/urlconfig';
export function AllDescribeApi(params,callback) {
return (dispatch) => {
return excute.post(
API.allDescribeUrl,
params,
(response) => {
if (callback) {
callback(response.data);
}
}
);
};
}
\ No newline at end of file
src/components/AllDescribe/index.jsx 0 → 100644
import React, { Component } from "react";
import "./style.less";
import { hashHistory } from "react-router";
import func from "../../util/commonFunc";
import moment from "moment";
import { connect } from "react-redux";
import { bindActionCreators } from "redux";
import { AllDescribeApi } from "./action";
class AllDescribe extends Component {
constructor(props) {
super(props);
this.state = {
list: {},
};
}
componentDidMount() {
let _this = this;
let { id } = this.props.location.query;
let params = {
researchId: id,
};
this.props.AllDescribeApi(params, (response) => {
_this.setState({
list: response,
});
});
}
render() {
let { id, type } = this.props.location.query;
const { list } = this.state;
let pageWidth =
document.body.clientWidth > 750 ? 750 : document.body.clientWidth;
return (
<div className="describe-out">
<div className="describe-top">
<div className="top-title">{list.name}</div>
<div className="top-img">
<img src={list.image} alt="" />
</div>
</div>
<div className="describe-mid">
{/* 主题 */}
<div className="mid-item">
<p className="item-tit">{type}主题</p>
<p className="item-cont" style={{ color: "#333" }}>
{list.content}
</p>
</div>
{/* 说明 */}
<div className="mid-item">
<p className="item-tit">{type}说明</p>
<p className="item-cont">{list.remark}</p>
</div>
{/* 时间 */}
<div className="mid-item">
<p className="item-tit">{type}时间</p>
<p className="item-cont">
{moment(list.startTime).format("YYYY年MM月DD日 HH:mm:ss")}
</p>
</div>
</div>
<div className="describe-bot">
<div
className="describe-btn"
onClick={() => {
this.handleTo(id, type);
}}
>
立即{type}
</div>
</div>
</div>
);
}
// 跳转到投票
handleTo = (id, type) => {
if (type == "投票") {
hashHistory.push({
pathname: func.routerBefore() + "/SurveyDetails",
query: { id: id },
});
}
};
}
const mapStateToProps = (state) => {
return {};
};
const mapDispatchToProps = (dispatch) => {
return {
AllDescribeApi: bindActionCreators(AllDescribeApi, dispatch),
};
};
export default connect(mapStateToProps, mapDispatchToProps)(AllDescribe);
src/components/AllDescribe/style.css 0 → 100644
.describe-out {
padding-top: 60px;
width: 100%;
height: 100%;
background: linear-gradient(0deg, #ff9286 0%, #d23a29), linear-gradient(180deg, rgba(255, 255, 255, 0) 59%, #f5f5f5 100%), linear-gradient(0deg, rgba(210, 58, 41, 0) 0%, #d23a29);
}
.describe-out .describe-top {
width: 92%;
margin: 0 auto;
margin-bottom: 40px;
}
.describe-out .describe-top .top-title {
width: 100%;
margin-bottom: 40px;
height: 60px;
line-height: 60px;
text-align: center;
font-size: 42px;
color: #fff;
font-family: PingFang SC, PingFang SC-500;
font-weight: 500;
background: linear-gradient(90deg, rgba(255, 151, 130, 0), #ff9782 53%, rgba(255, 151, 130, 0) 100%);
}
.describe-out .describe-top .top-img img {
width: 100%;
}
.describe-out .describe-mid {
width: 92%;
margin: 0 auto;
background-color: #fff;
border-radius: 14px;
}
.describe-out .describe-mid .mid-item {
padding: 40px;
}
.describe-out .describe-mid .mid-item .item-tit {
font-size: 40px;
font-weight: 600;
color: #353535;
}
.describe-out .describe-mid .mid-item .item-cont {
font-size: 32px;
font-weight: 500;
color: #000;
}
.describe-out .describe-bot .describe-btn {
position: fixed;
bottom: 0;
width: 100%;
text-align: center;
padding: 20px 0;
background: linear-gradient(270deg, #eb6c53 0%, #d23a29);
border-radius: 5px;
color: #fff;
font-size: 36px;
}
src/components/AllDescribe/style.less 0 → 100644
.describe-out {
padding-top: 60px;
width: 100%;
height: 100%;
background: linear-gradient(0deg, #ff9286 0%, #d23a29),
linear-gradient(180deg, rgba(255, 255, 255, 0) 59%, #f5f5f5 100%),
linear-gradient(0deg, rgba(210, 58, 41, 0) 0%, #d23a29);
.describe-top {
width: 92%;
margin: 0 auto;
margin-bottom: 40px;
.top-title {
width: 100%;
margin-bottom: 40px;
height: 60px;
line-height: 60px;
text-align: center;
font-size: 42px;
color: #fff;
font-family: PingFang SC, PingFang SC-500;
font-weight: 500;
background: linear-gradient(
90deg,
rgba(255, 151, 130, 0),
#ff9782 53%,
rgba(255, 151, 130, 0) 100%
);
}
.top-img {
img {
width: 100%;
}
}
}
.describe-mid {
width: 92%;
margin: 0 auto;
background-color: #fff;
border-radius: 14px;
.mid-item {
padding: 40px;
.item-tit {
font-size: 40px;
font-weight: 600;
color: #353535;
}
.item-cont {
font-size: 32px;
font-weight: 500;
color: #000;
}
}
}
.describe-bot {
.describe-btn {
position: fixed;
bottom: 0;
width: 100%;
text-align: center;
padding: 20px 0;
background: linear-gradient(270deg, #eb6c53 0%, #d23a29);
border-radius: 5px;
color: #fff;
font-size: 36px;
}
}
}
src/components/App.jsx
...@@ -22,7 +22,6 @@ import { ...@@ -22,7 +22,6 @@ import {
import intl from "react-intl-universal"; import intl from "react-intl-universal";
class App extends React.Component { class App extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
...@@ -64,16 +63,6 @@ class App extends React.Component { ...@@ -64,16 +63,6 @@ class App extends React.Component {
selectedTab: 'menucourse', selectedTab: 'menucourse',
}); });
func.changeDocumentTitle(intl.get("Course")); func.changeDocumentTitle(intl.get("Course"));
} else if (tab === 'menumarketing') {
this.setState({
selectedTab: 'menumarketing',
});
if (func.routerBefore() == "/shpd/lsbdd") {
func.changeDocumentTitle(intl.get("juyoucai"));
} else {
func.changeDocumentTitle(intl.get("PublishKey131"));
}
} else if (tab === 'menume') { } else if (tab === 'menume') {
this.setState({ this.setState({
selectedTab: 'menume', selectedTab: 'menume',
...@@ -124,17 +113,6 @@ class App extends React.Component { ...@@ -124,17 +113,6 @@ class App extends React.Component {
}); });
func.changeDocumentTitle(intl.get("Account")); func.changeDocumentTitle(intl.get("Account"));
break; break;
case "menumarketing":
this.setState({
selectedTab: 'menumarketing',
});
if (func.routerBefore() == "/shpd/lsbdd") {
func.changeDocumentTitle(intl.get("juyoucai"));
} else {
func.changeDocumentTitle(intl.get("PublishKey131"));
}
break;
case "association": case "association":
this.setState({ this.setState({
selectedTab: 'association', selectedTab: 'association',
...@@ -318,28 +296,6 @@ class App extends React.Component { ...@@ -318,28 +296,6 @@ class App extends React.Component {
</TabBar.Item> </TabBar.Item>
); );
let tabMarket = (<TabBar.Item
icon={
<IconfontD code={"iconhometabbar-marketing-unselect"} style={{fontSize:48}}/>
}
selectedIcon={
<IconfontD code={"iconhometabbar-marketing-selected"} style={{fontSize:48}}/>
}
title={<span>{intl.get("PublishKey131")}</span>}
di
key={intl.get("marketing")}
selected={this.state.selectedTab === 'menumarketing'}
onPress={() => {
this.setState({
selectedTab: 'menumarketing',
});
hashHistory.push(func.routerBefore() + '/menumarketing')
}}
>
</TabBar.Item>
)
let menuHome = (<TabBar.Item let menuHome = (<TabBar.Item
icon={ icon={
<IconfontD code={"iconhometabbar-mine-unselect"} style={{fontSize:48}}/> <IconfontD code={"iconhometabbar-mine-unselect"} style={{fontSize:48}}/>
...@@ -511,7 +467,7 @@ class App extends React.Component { ...@@ -511,7 +467,7 @@ class App extends React.Component {
: <div className={"index-tab-bar-container"}> <TabBar : <div className={"index-tab-bar-container"}> <TabBar
unselectedTintColor="#949494" unselectedTintColor="#949494"
tintColor="#4285f4" tintColor="#D23A29"
barTintColor="white" barTintColor="white"
hidden={this.state.hidden} hidden={this.state.hidden}
> >
...@@ -526,7 +482,7 @@ class App extends React.Component { ...@@ -526,7 +482,7 @@ class App extends React.Component {
<IconfontD code={"iconhometabbar-home-unselect"} style={{ fontSize: 48 }} /> <IconfontD code={"iconhometabbar-home-unselect"} style={{ fontSize: 48 }} />
} }
selectedIcon={ selectedIcon={
<IconfontD code={"iconhometabbar-home-selected"} style={{ fontSize: 48 }} /> <IconfontD code={"iconhometabbar-home-selected"} style={{ fontSize:48,color:'#E05540'}} />
} }
selected={this.state.selectedTab === 'menuhome'} selected={this.state.selectedTab === 'menuhome'}
onPress={() => { onPress={() => {
...@@ -548,7 +504,7 @@ class App extends React.Component { ...@@ -548,7 +504,7 @@ class App extends React.Component {
<IconfontD code={"iconhometabbar-training-unselect"} style={{ fontSize: 48 }} /> <IconfontD code={"iconhometabbar-training-unselect"} style={{ fontSize: 48 }} />
} }
selectedIcon={ selectedIcon={
<IconfontD code={"iconhometabbar-training-selected"} style={{ fontSize: 48 }} /> <IconfontD code={"iconhometabbar-training-selected"} style={{fontSize:48,color:'#E05540'}} />
} }
title={<span>{intl.get("TrainingProgram2") || "活动"}</span>} title={<span>{intl.get("TrainingProgram2") || "活动"}</span>}
key="train" key="train"
...@@ -565,53 +521,6 @@ class App extends React.Component { ...@@ -565,53 +521,6 @@ class App extends React.Component {
</TabBar.Item> </TabBar.Item>
) )
} }
if (data.id == '3' && data.checked) {
return (
<TabBar.Item
style={{ visibility: 'hidden' }}
hidden={tabInfo[2] && tabInfo[2].checked}
icon={
<IconfontD code={"iconhometabbar-course-unselect"} style={{fontSize:48}}/>
}
selectedIcon={
<IconfontD code={"iconhometabbar-course-selected"} style={{fontSize:48}}/>
}
title={<span>{intl.get("Course") || '课程'}</span>}
key="course"
selected={this.state.selectedTab === 'menucourse'}
onPress={() => {
this.setState({
selectedTab: 'menucourse',
});
hashHistory.push(func.routerBefore() + '/menucourse')
}}
>
</TabBar.Item>
)
}
if (data.id == '4' && data.checked) {
return (
<TabBar.Item
hidden={tabInfo[3] && tabInfo[3].checked}
icon={
<IconfontD code={"iconhometabbar-marketing-unselect"} style={{fontSize:48}}/>
}
selectedIcon={
<IconfontD code={"iconhometabbar-marketing-selected"} style={{fontSize:48}}/>
}
title={<span>{intl.get("PublishKey131") || "营销"}</span>}
key="menumarket"
selected={this.state.selectedTab === 'menumarketing'}
onPress={() => {
this.setState({
selectedTab: 'menumarketing',
});
hashHistory.push(func.routerBefore() + '/menumarketing')
}}
>
</TabBar.Item>
)
}
if (data.id == '5' && data.checked) { if (data.id == '5' && data.checked) {
return ( return (
<TabBar.Item <TabBar.Item
...@@ -620,7 +529,7 @@ class App extends React.Component { ...@@ -620,7 +529,7 @@ class App extends React.Component {
<IconfontD code={"iconhometabbar-mine-unselect"} style={{fontSize:48}}/> <IconfontD code={"iconhometabbar-mine-unselect"} style={{fontSize:48}}/>
} }
selectedIcon={ selectedIcon={
<IconfontD code={"iconhometabbar-mine-selected"} style={{fontSize:48}}/> <IconfontD code={"iconhometabbar-mine-selected"} style={{fontSize:48,color:'#E05540'}}/>
} }
title={<span>{intl.get("QuicklinkMyStudy") || "我的"}</span>} title={<span>{intl.get("QuicklinkMyStudy") || "我的"}</span>}
key="me" key="me"
......
src/components/Training/TrainingSteps/TrainingSteps.jsx
...@@ -76,6 +76,7 @@ class TrainingSteps extends Component { ...@@ -76,6 +76,7 @@ class TrainingSteps extends Component {
activityStateName: "", activityStateName: "",
signTimeId: "", //签到 signTimeId: "", //签到
signType: "", //签到 signType: "", //签到
hasFinished: "", //控制是否可以评论
}; };
this.contentDomHeightSetForSticky = this.contentDomHeightSetForSticky =
this.contentDomHeightSetForSticky.bind(this); this.contentDomHeightSetForSticky.bind(this);
...@@ -103,13 +104,19 @@ class TrainingSteps extends Component { ...@@ -103,13 +104,19 @@ class TrainingSteps extends Component {
this.props.trainStepsData(finished, params, () => { this.props.trainStepsData(finished, params, () => {
let { introductionVo } = _this.props.TrainingStepsReducer; let { introductionVo } = _this.props.TrainingStepsReducer;
let { activityStateCode, activityStateName, signTimeId, signType } = let {
introductionVo; activityStateCode,
activityStateName,
signTimeId,
signType,
hasFinished,
} = introductionVo;
_this.setState({ _this.setState({
activityStateCode: activityStateCode, activityStateCode: activityStateCode,
activityStateName: activityStateName, activityStateName: activityStateName,
signTimeId: signTimeId, signTimeId: signTimeId,
signType: signType, signType: signType,
hasFinished: hasFinished,
}); });
_this.contentDomHeightSetForSticky(); _this.contentDomHeightSetForSticky();
}); });
...@@ -247,7 +254,7 @@ class TrainingSteps extends Component { ...@@ -247,7 +254,7 @@ class TrainingSteps extends Component {
} }
}; };
renderContent = (code) => { renderContent = (hasFinished) => {
let { let {
introductionVo = {}, introductionVo = {},
hasEnrolled, hasEnrolled,
...@@ -275,15 +282,20 @@ class TrainingSteps extends Component { ...@@ -275,15 +282,20 @@ class TrainingSteps extends Component {
<div style={{ backgroundColor: "#F4F4F4" }}> <div style={{ backgroundColor: "#F4F4F4" }}>
{this.renderIntroduction(introductionVo)} {this.renderIntroduction(introductionVo)}
{code != "4" ? this.renderComment(reviewListData, loadMore) : ""} {hasFinished ? this.renderComment(reviewListData, loadMore) : ""}
</div> </div>
); );
}; };
render() { render() {
let { introductionVo = {} } = this.props.TrainingStepsReducer; let { introductionVo = {} } = this.props.TrainingStepsReducer;
let { activityStateCode, activityStateName, signTimeId, signType } = let {
this.state; activityStateCode,
hasFinished,
activityStateName,
signTimeId,
signType,
} = this.state;
let signUpTitle = let signUpTitle =
activityStateCode == "1" activityStateCode == "1"
? "待报名" ? "待报名"
...@@ -293,7 +305,11 @@ class TrainingSteps extends Component { ...@@ -293,7 +305,11 @@ class TrainingSteps extends Component {
? "立即报名" ? "立即报名"
: activityStateCode == "4" : activityStateCode == "4"
? "立即签到" ? "立即签到"
: "进行中"; : activityStateCode == "5"
? "进行中"
: activityStateCode == "7"
? "未报名"
: "";
let signUpColor = "#999999"; let signUpColor = "#999999";
let signedColor = "#d23a29"; let signedColor = "#d23a29";
...@@ -312,8 +328,9 @@ class TrainingSteps extends Component { ...@@ -312,8 +328,9 @@ class TrainingSteps extends Component {
alt="" alt=""
/> />
{/*头部信息*/} {/*头部信息*/}
<div className="train-info"> <div className="train-info-header">
<p>{introductionVo && introductionVo.name}</p> <p>{introductionVo && introductionVo.name}</p>
{activityStateCode == 1 ? ( {activityStateCode == 1 ? (
<div className="overed">待报名</div> <div className="overed">待报名</div>
) : activityStateCode == 2 ? ( ) : activityStateCode == 2 ? (
...@@ -336,9 +353,7 @@ class TrainingSteps extends Component { ...@@ -336,9 +353,7 @@ class TrainingSteps extends Component {
</div> </div>
</div> </div>
<div style={{ width: "100%", marginTop: 0 }}> <div style={{ width: "100%", marginTop: 0 }}>
<StickyContainer> <StickyContainer>{this.renderContent(hasFinished)}</StickyContainer>
{this.renderContent(activityStateCode)}
</StickyContainer>
</div> </div>
{activityStateCode != "5" && activityStateCode != "6" ? ( {activityStateCode != "5" && activityStateCode != "6" ? (
<Fragment> <Fragment>
...@@ -421,7 +436,10 @@ class TrainingSteps extends Component { ...@@ -421,7 +436,10 @@ class TrainingSteps extends Component {
}} }}
> >
{/*项目须知*/} {/*项目须知*/}
<div className="train-info-view"> <div
className="train-info-view"
style={{ width: "92%", margin: "0 auto", borderRadius: "10px" }}
>
<div className="train-up-info"> <div className="train-up-info">
{introductionVo && ( {introductionVo && (
<div> <div>
...@@ -466,11 +484,20 @@ class TrainingSteps extends Component { ...@@ -466,11 +484,20 @@ class TrainingSteps extends Component {
<div> <div>
<div className="product-info-view"> <div className="product-info-view">
<div className="train-info-view"> <div className="train-info-view">
<div style={{ marginBottom: "20px" }}> <div
style={{
marginBottom: "20px",
borderBottom: "1px solid #e5e6e8",
}}
>
<p <p
style={{ style={{
fontSize: "40px",
fontWeight: "bold", fontWeight: "bold",
paddingLeft: "40px", paddingLeft: "40px",
paddingTop: "15px",
paddingBottom: "20px",
color: "#353535",
}} }}
> >
活动介绍 活动介绍
...@@ -501,7 +528,8 @@ class TrainingSteps extends Component { ...@@ -501,7 +528,8 @@ class TrainingSteps extends Component {
width: "100%", width: "100%",
height: "280px", height: "280px",
paddingLeft: "40px", paddingLeft: "40px",
paddingRight: "40px", paddingRight: "15px",
marginBottom: "10px",
}} }}
> >
<img <img
...@@ -528,12 +556,18 @@ class TrainingSteps extends Component { ...@@ -528,12 +556,18 @@ class TrainingSteps extends Component {
</div> </div>
</div> </div>
{introductionVo.researchName ? ( {introductionVo.researchName ? (
<div style={{ marginBottom: "20px" }}> <div
style={{
marginBottom: "20px",
}}
>
<p <p
style={{ style={{
fontWeight: "bold", fontWeight: "bold",
paddingLeft: "40px", paddingLeft: "40px",
paddingBottom: "20px", paddingBottom: "20px",
color: "#353535",
fontSize: "40px",
}} }}
> >
投票链接 投票链接
...@@ -562,6 +596,8 @@ class TrainingSteps extends Component { ...@@ -562,6 +596,8 @@ class TrainingSteps extends Component {
fontWeight: "bold", fontWeight: "bold",
paddingLeft: "40px", paddingLeft: "40px",
paddingBottom: "20px", paddingBottom: "20px",
color: "#353535",
fontSize: "40px",
}} }}
> >
活动奖励 活动奖励
...@@ -788,9 +824,10 @@ class TrainingSteps extends Component { ...@@ -788,9 +824,10 @@ class TrainingSteps extends Component {
this.props.sign(params, () => { this.props.sign(params, () => {
_this.props.trainStepsData(finished, params1, () => { _this.props.trainStepsData(finished, params1, () => {
let { introductionVo } = _this.props.TrainingStepsReducer; let { introductionVo } = _this.props.TrainingStepsReducer;
let { activityStateCode } = introductionVo; let { activityStateCode, hasFinished } = introductionVo;
_this.setState({ _this.setState({
activityStateCode: activityStateCode, activityStateCode: activityStateCode,
hasFinished: hasFinished,
}); });
}); });
}); });
...@@ -867,11 +904,11 @@ class TrainingSteps extends Component { ...@@ -867,11 +904,11 @@ class TrainingSteps extends Component {
}); });
} }
}; };
// 跳转到投稿 // 跳转到投票详情
toSurvey = (id) => { toSurvey = (id) => {
hashHistory.push({ hashHistory.push({
pathname: func.routerBefore() + "/SurveyDetails", pathname: func.routerBefore() + "/allDescribe",
query: { id: id }, query: { id: id, type: "投票" },
}); });
}; };
} }
......
src/components/Training/TrainingSteps/index.css
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
width: 40px; width: 40px;
height: 40px; height: 40px;
} }
.train-info-view {
background-color: #fff;
padding: 15px 0;
}
.train-info-view .tp-icon { .train-info-view .tp-icon {
width: 24px !important; width: 24px !important;
height: 24px; height: 24px;
...@@ -393,7 +397,6 @@ ...@@ -393,7 +397,6 @@
font-size: 0.31rem; font-size: 0.31rem;
width: 92%; width: 92%;
margin: 0 auto; margin: 0 auto;
background-color: #fff;
border-radius: 12px; border-radius: 12px;
padding-top: 30px; padding-top: 30px;
padding-bottom: 30px; padding-bottom: 30px;
...@@ -406,9 +409,8 @@ ...@@ -406,9 +409,8 @@
background-color: #fff; background-color: #fff;
border-radius: 12px; border-radius: 12px;
margin-bottom: 30px; margin-bottom: 30px;
padding-left: 40px; padding-left: 14px;
padding-top: 30px; padding-top: 15px;
padding-bottom: 30px;
} }
.train-up-info p { .train-up-info p {
line-height: 0.46rem; line-height: 0.46rem;
...@@ -431,7 +433,7 @@ ...@@ -431,7 +433,7 @@
.train-up-info p span { .train-up-info p span {
color: #888; color: #888;
} }
.train-info { .train-info-header {
font-size: 0.31rem; font-size: 0.31rem;
color: #fff; color: #fff;
width: 100%; width: 100%;
...@@ -441,26 +443,54 @@ ...@@ -441,26 +443,54 @@
justify-content: space-between; justify-content: space-between;
padding-left: 40px; padding-left: 40px;
} }
.train-info .enroll { .train-info-header .enroll {
width: 120px; width: 140px;
background-color: #53af5c; background-color: #53af5c;
color: #fff; color: #fff;
text-align: center; text-align: center;
padding: 8px 10px; padding: 4px 0px;
border-radius: 4px;
} }
.train-info .enrolled { .train-info-header .enrolled {
width: 120px; width: 140px;
background-color: #ffba19; background-color: #ffba19;
color: #fff; color: #fff;
text-align: center; text-align: center;
padding: 8px 10px; padding: 4px 0px;
border-radius: 4px;
} }
.train-info .overed { .train-info-header .overed {
width: 120px; width: 140px;
background-color: #e5e6e8; background-color: #e5e6e8;
color: #a1a1a1; color: #a1a1a1;
text-align: center; text-align: center;
padding: 8px 10px; padding: 4px 0px;
border-radius: 4px;
}
.train-info-header p {
color: #fff;
line-height: 0.48rem;
margin: 0;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
/** 对象作为伸缩盒子模型显示 **/
-webkit-box-orient: vertical;
/** 设置或检索伸缩盒对象的子元素的排列方式 **/
-webkit-line-clamp: 2;
/** 显示的行数 **/
overflow: hidden;
/** 隐藏超出的内容 **/
font-size: 40px;
}
.train-info {
font-size: 0.31rem;
color: #fff;
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
padding-left: 40px;
} }
.train-info p { .train-info p {
color: #fff; color: #fff;
...@@ -499,7 +529,7 @@ ...@@ -499,7 +529,7 @@
color: blue; color: blue;
} }
.train-info .train-info-contain p { .train-info .train-info-contain p {
font-size: 24px !important; font-size: 30px !important;
padding: 0 !important; padding: 0 !important;
color: #4a4a4a !important; color: #4a4a4a !important;
} }
......
src/components/Training/TrainingSteps/index.less
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
//margin-right: 16px; //margin-right: 16px;
} }
.train-info-view { .train-info-view {
background-color: #fff;
padding: 15px 0;
.tp-icon { .tp-icon {
width: 24px !important; width: 24px !important;
height: 24px; height: 24px;
...@@ -555,7 +557,6 @@ ...@@ -555,7 +557,6 @@
font-size: 0.31rem; font-size: 0.31rem;
width: 92%; width: 92%;
margin: 0 auto; margin: 0 auto;
background-color: #fff;
border-radius: 12px; border-radius: 12px;
padding-top: 30px; padding-top: 30px;
padding-bottom: 30px; padding-bottom: 30px;
...@@ -572,9 +573,8 @@ ...@@ -572,9 +573,8 @@
background-color: #fff; background-color: #fff;
border-radius: 12px; border-radius: 12px;
margin-bottom: 30px; margin-bottom: 30px;
padding-left: 40px; padding-left: 14px;
padding-top: 30px; padding-top: 15px;
padding-bottom: 30px;
p { p {
line-height: 0.46rem; line-height: 0.46rem;
.line-hidden; .line-hidden;
...@@ -587,8 +587,7 @@ ...@@ -587,8 +587,7 @@
} }
} }
} }
.train-info-header {
.train-info {
font-size: 0.31rem; font-size: 0.31rem;
color: #fff; color: #fff;
width: 100%; width: 100%;
...@@ -598,25 +597,28 @@ ...@@ -598,25 +597,28 @@
justify-content: space-between; justify-content: space-between;
padding-left: 40px; padding-left: 40px;
.enroll { .enroll {
width: 120px; width: 140px;
background-color: #53af5c; background-color: #53af5c;
color: #fff; color: #fff;
text-align: center; text-align: center;
padding: 8px 10px; padding: 4px 0px;
border-radius: 4px;
} }
.enrolled { .enrolled {
width: 120px; width: 140px;
background-color: #ffba19; background-color: #ffba19;
color: #fff; color: #fff;
text-align: center; text-align: center;
padding: 8px 10px; padding: 4px 0px;
border-radius: 4px;
} }
.overed { .overed {
width: 120px; width: 140px;
background-color: #e5e6e8; background-color: #e5e6e8;
color: #a1a1a1; color: #a1a1a1;
text-align: center; text-align: center;
padding: 8px 10px; padding: 4px 0px;
border-radius: 4px;
} }
p { p {
color: #fff; color: #fff;
...@@ -624,7 +626,22 @@ ...@@ -624,7 +626,22 @@
.line-hidden; .line-hidden;
font-size: 40px; font-size: 40px;
} }
}
.train-info {
font-size: 0.31rem;
color: #fff;
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
padding-left: 40px;
p {
color: #fff;
line-height: 0.48rem;
.line-hidden;
font-size: 40px;
}
.descr { .descr {
p { p {
-webkit-line-clamp: unset; -webkit-line-clamp: unset;
...@@ -654,7 +671,7 @@ ...@@ -654,7 +671,7 @@
} }
p { p {
font-size: 24px !important; font-size: 30px !important;
padding: 0 !important; padding: 0 !important;
color: #4a4a4a !important; color: #4a4a4a !important;
} }
...@@ -897,8 +914,8 @@ ...@@ -897,8 +914,8 @@
text-align: center; text-align: center;
} }
.signup-modal { .signup-modal {
.am-modal-content{ .am-modal-content {
background: linear-gradient(180deg,#ffe2e2 0%,#fff 25%); background: linear-gradient(180deg, #ffe2e2 0%, #fff 25%);
} }
.am-modal-title { .am-modal-title {
color: #16181a; color: #16181a;
...@@ -908,14 +925,14 @@ ...@@ -908,14 +925,14 @@
text-align: left; text-align: left;
margin: 28px 0; margin: 28px 0;
} }
.am-modal-button{ .am-modal-button {
width: 45% !important; width: 45% !important;
height: 80px !important; height: 80px !important;
line-height: 80px !important; line-height: 80px !important;
margin: 0 auto; margin: 0 auto;
color: #fff !important; color: #fff !important;
margin-bottom: 25px; margin-bottom: 25px;
background:linear-gradient(270deg,#eb6c53, #d23a29); background: linear-gradient(270deg, #eb6c53, #d23a29);
} }
} }
.train-pay-button-container { .train-pay-button-container {
......
src/components/common/carousel.jsx
...@@ -25,96 +25,68 @@ export default class carousel extends Component { ...@@ -25,96 +25,68 @@ export default class carousel extends Component {
render() { render() {
let { data, carouselparam } = this.props; let { data, carouselparam } = this.props;
if (data.length == 1) { return (
return ( <div
<div style={{ width: "100%", padding: "0 30px" }}> className={this.props.isIndex ? "carousel-index-container" : ""}
<a style={{ width: "100%" }}
key={data[0].id} >
style={{ display: "inline-block", width: "100%", padding: 0 }} <Carousel
onClick={() => this.imageClick(data[0])} className="my-index-carousel"
className={this.props.isIndex ? "carousel-container" : ""} autoplay={true}
> infinite={true}
<img dots={false}
swipeSpeed={35}
afterChange={this.autoSlideListen}
>
{data.map((item, index) => (
<a
key={index}
style={{ style={{
height: carouselparam.height, display: "block",
borderRadius: carouselparam.radius, height: '34%',
width: "100%", overflow: "hidden",
}} position: "relative",
src={data[0].imageSrc}
alt="icon"
onLoad={() => {
// fire window resize event to change height
window.dispatchEvent(new Event("resize"));
this.setState({
initialHeight: null,
});
}} }}
/> onClick={() => this.imageClick(item)}
</a> >
</div> <img
); style={{
} else { height: '34%',
return ( width: "100%",
<div }}
className={this.props.isIndex ? "carousel-index-container" : ""} src={item.imageSrc}
style={{ width: "100%" }} alt="icon"
> onLoad={() => {
<Carousel // fire window resize event to change height
className="my-index-carousel" window.dispatchEvent(new Event("resize"));
autoplay={true} this.setState({
infinite={true} initialHeight: null,
dots={false} });
swipeSpeed={35} }}
afterChange={this.autoSlideListen} />
> <div
{data.map((item, index) => (
<a
key={index}
style={{ style={{
display: "block", width: "100%",
height: carouselparam.height + 80, textAlign: "center",
borderRadius: carouselparam.radius, color: "#fff",
fontSize: "26px",
position: "absolute",
bottom: "0px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden", overflow: "hidden",
position: "relative", padding: "12px 0",
textIndent: "1em",
background:
"linear-gradient(180deg,rgba(0,0,0,0.00), rgba(0,0,0,0.50) 50%, #000000 100%)",
}} }}
onClick={() => this.imageClick(item)}
> >
<img {item.imgTitle}
style={{ </div>
height: carouselparam.height + 80, </a>
borderRadius: carouselparam.radius, ))}
width: "100%", </Carousel>
}} </div>
src={item.imageSrc} );
alt="icon"
onLoad={() => {
// fire window resize event to change height
window.dispatchEvent(new Event("resize"));
this.setState({
initialHeight: null,
});
}}
/>
<div
style={{
width: "100%",
textAlign: "center",
color: "#fff",
fontSize: "26px",
position: "absolute",
bottom: "20px",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
overflow: "hidden",
}}
>
{item.imgTitle}
</div>
</a>
))}
</Carousel>
</div>
);
}
} }
} }
src/components/exam/less/examquestion.css
.singleLineOverflow {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-break: break-all;
}
.question-block { .question-block {
width: 100%; width: 90%;
margin: 0 auto;
padding-top: 20px;
background-color: #fff; background-color: #fff;
transform: translateY(60px);
border-radius: 15px;
} }
.question-block .exam-media { .question-block .exam-media {
padding: 0; padding: 10px 30px;
} }
.question-block .am-list-item { .question-block .am-list-item {
padding-left: 0 !important; padding-left: 0 !important;
...@@ -16,27 +26,26 @@ ...@@ -16,27 +26,26 @@
} }
.separator { .separator {
height: 0.3rem; height: 0.3rem;
border-top: 1px solid #E4E4E4; border-top: 1px solid #e4e4e4;
border-bottom: 1px solid #E4E4E4; border-bottom: 1px solid #e4e4e4;
overflow: hidden; overflow: hidden;
} }
.question-topic { .question-topic {
width: 100%; width: 100%;
padding: 0.1rem 0.3rem; padding: 0.1rem 0.3rem;
text-align: justify;
position: relative; position: relative;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.question-topic h4 { .question-topic h4 {
margin-bottom: 32px;
font-size: 0.34rem; font-size: 0.34rem;
padding-top: 0.3rem; padding-top: 0.3rem;
color: #030303; color: #030303;
} }
.question-topic h4 .item-type { .question-topic h4 .item-type {
color: #67512C; color: #67512c;
margin-bottom: 32px;
display: inline-block; display: inline-block;
} }
.question-topic .daying-icon { .question-topic .daying-icon {
...@@ -104,8 +113,8 @@ ...@@ -104,8 +113,8 @@
} }
.exam-question { .exam-question {
width: 100%; width: 100%;
padding-top: 0.88rem; height: 100%;
padding-bottom: 0.98rem; background: linear-gradient(0deg, #ff9286 0%, #d23a29), linear-gradient(180deg, rgba(255, 255, 255, 0) 59%, #f5f5f5 100%), linear-gradient(0deg, rgba(210, 58, 41, 0) 0%, #d23a29);
} }
.exam-question .btn-flex { .exam-question .btn-flex {
background-color: #fff; background-color: #fff;
......
src/components/exam/less/examquestion.less
@import "config"; @import "config";
.question-block { .question-block {
width: 100%; width: 90%;
margin: 0 auto;
padding-top: 20px;
background-color: #fff; background-color: #fff;
.exam-media{ transform: translateY(60px);
padding: 0; border-radius: 15px;
.exam-media {
padding: 10px 30px;
} }
.am-list-item{ .am-list-item {
padding-left: 0 !important; padding-left: 0 !important;
} }
.am-textarea-control textarea{ .am-textarea-control textarea {
border: 1px solid gray; border: 1px solid gray;
border-radius: 0.12rem; border-radius: 0.12rem;
text-indent: 0.1rem; text-indent: 0.1rem;
...@@ -19,9 +23,9 @@ ...@@ -19,9 +23,9 @@
.separator { .separator {
height: 0.3rem; height: 0.3rem;
border-top: 1px solid #E4E4E4; border-top: 1px solid #e4e4e4;
border-bottom: 1px solid #E4E4E4; border-bottom: 1px solid #e4e4e4;
overflow: hidden overflow: hidden;
} }
.question-topic { .question-topic {
...@@ -38,11 +42,11 @@ ...@@ -38,11 +42,11 @@
padding-top: 0.3rem; padding-top: 0.3rem;
color: #030303; color: #030303;
.item-type { .item-type {
color: #67512C; color: #67512c;
display: inline-block; display: inline-block;
} }
} }
.daying-icon{ .daying-icon {
position: absolute; position: absolute;
top: 20px; top: 20px;
right: 20px; right: 20px;
...@@ -59,41 +63,41 @@ ...@@ -59,41 +63,41 @@
} }
} }
.question-ans{ .question-ans {
margin: 0.1rem 0.3rem; margin: 0.1rem 0.3rem;
.ans-wrong{ .ans-wrong {
font-size: 28px; font-size: 28px;
width: 172px; width: 172px;
height: 60px; height: 60px;
border-radius: 2px; border-radius: 2px;
color: rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
text-align: center; text-align: center;
line-height: 60px; line-height: 60px;
background: rgba(234,85,78,1); background: rgba(234, 85, 78, 1);
}
.ans {
padding: 20px;
font-size: 32px;
font-weight: 600;
color: rgba(51, 51, 51, 1);
background: rgba(250, 250, 250, 1);
border-radius: 6px;
span {
color: rgba(66, 133, 244, 1);
} }
.ans{
padding: 20px;
font-size: 32px;
font-weight: 600;
color: rgba(51,51,51,1);
background:rgba(250,250,250,1);
border-radius:6px;
span{
color:rgba(66,133,244,1);
}
} }
.ans-ringht{ .ans-ringht {
font-size: 28px; font-size: 28px;
width: 172px; width: 172px;
height: 60px; height: 60px;
border-radius: 2px; border-radius: 2px;
color: rgba(255,255,255,1); color: rgba(255, 255, 255, 1);
text-align: center; text-align: center;
line-height: 60px; line-height: 60px;
background:rgb(108, 191, 112) background: rgb(108, 191, 112);
} }
} }
.question-analysis{ .question-analysis {
width: 100%; width: 100%;
padding: 0.1rem 0.3rem; padding: 0.1rem 0.3rem;
text-align: justify; text-align: justify;
...@@ -102,29 +106,32 @@ ...@@ -102,29 +106,32 @@
.exam-media { .exam-media {
width: 100%; width: 100%;
padding: 30px; padding: 30px;
img,video,audio { img,
video,
audio {
width: 100%; width: 100%;
} }
} }
.exam-question { .exam-question {
width: 100%; width: 100%;
padding-top: 44*@len; height: 100%;
padding-bottom: .98rem; background: linear-gradient(0deg, #ff9286 0%, #d23a29),
// background-color: #f6f6f6; linear-gradient(180deg, rgba(255, 255, 255, 0) 59%, #f5f5f5 100%),
.btn-flex{ linear-gradient(0deg, rgba(210, 58, 41, 0) 0%, #d23a29);
.btn-flex {
background-color: #fff; background-color: #fff;
padding: .2rem .3rem .3rem .3rem; padding: 0.2rem 0.3rem 0.3rem 0.3rem;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
a:hover{ a:hover {
color: #fff; color: #fff;
text-decoration:none; text-decoration: none;
} }
} }
.top-header { .top-header {
width: 100%; width: 100%;
height: 44*@len; height: 44 * @len;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
...@@ -134,11 +141,11 @@ ...@@ -134,11 +141,11 @@
.header { .header {
width: 100%; width: 100%;
justify-content: center; justify-content: center;
line-height: 44*@len; line-height: 44 * @len;
text-align: center; text-align: center;
font-size: 15*@len; font-size: 15 * @len;
color: #4a4a4a; color: #4a4a4a;
padding:0; padding: 0;
span { span {
color: #000; color: #000;
} }
...@@ -149,106 +156,101 @@ ...@@ -149,106 +156,101 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 0 0.2rem; padding: 0 0.2rem;
height: 44*@len; height: 44 * @len;
span { span {
font-size: 15*@len; font-size: 15 * @len;
} }
span.mark { span.mark {
color: @common-blue;
color: @common-blue
} }
} }
} }
.top-header1 {
.top-header1{
// position: fixed; // position: fixed;
margin: 30px; margin: 30px;
height: 390px; height: 390px;
/* width: 100%; */ /* width: 100%; */
background: rgba(255,255,255,1); background: rgba(255, 255, 255, 1);
box-shadow: 0px -2px 17px 0px rgba(0,0,0,0.08); box-shadow: 0px -2px 17px 0px rgba(0, 0, 0, 0.08);
border-radius: 10px; border-radius: 10px;
padding: 40px; padding: 40px;
.paperName{ .paperName {
font-size:32px; font-size: 32px;
font-weight:400; font-weight: 400;
color:rgba(74,74,74,1); color: rgba(74, 74, 74, 1);
text-align: center; text-align: center;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
overflow: hidden; overflow: hidden;
} }
.qus-total{ .qus-total {
font-size: 24px; font-size: 24px;
font-weight: 400; font-weight: 400;
color: rgba(66,133,244,1); color: rgba(66, 133, 244, 1);
} }
.mark1{ .mark1 {
font-size: 48px; font-size: 48px;
font-weight: 600; font-weight: 600;
color: rgba(66,133,244,1); color: rgba(66, 133, 244, 1);
line-height: 64px; line-height: 64px;
text-align: center; text-align: center;
.score{ .score {
font-size: 128px; font-size: 128px;
line-height: 1; line-height: 1;
} }
.underLineImg{ .underLineImg {
width: 136px; width: 136px;
height: 34px; height: 34px;
margin-top: -100px; margin-top: -100px;
} }
.fen{ .fen {
font-size:28px; font-size: 28px;
font-weight:600; font-weight: 600;
color:rgba(66,133,244,1); color: rgba(66, 133, 244, 1);
} }
} }
} }
.no-course{ .no-course {
margin-bottom: -98px; margin-bottom: -98px;
font-size:24px; font-size: 24px;
background-color: #fff; background-color: #fff;
} }
.count-time { .count-time {
font-size: 15*@len; font-size: 15 * @len;
line-height: 44*@len; line-height: 44 * @len;
//color: #dd4457; //color: #dd4457;
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
height: 44*@len; height: 44 * @len;
position: fixed; position: fixed;
top: 0; top: 0;
left: 32px; left: 32px;
z-index: 101; z-index: 101;
} }
.submit-exam-paper-btn{ .submit-exam-paper-btn {
font-size: 24px; font-size: 24px;
color: #333; color: #333;
height: 44*@len; height: 44 * @len;
line-height: 44*@len; line-height: 44 * @len;
position: fixed; position: fixed;
top: 0; top: 0;
right: 30px; right: 30px;
z-index: 101; z-index: 101;
img{ img {
width: 24px; width: 24px;
margin-right: 8px; margin-right: 8px;
margin-top: -5px; margin-top: -5px;
} }
} }
.occupy { .occupy {
width: 100%; width: 100%;
height: 44*@len; height: 44 * @len;
} }
.commonBtn { .commonBtn {
width: 100%; width: 100%;
height: .98rem; height: 0.98rem;
border-top: 2px solid #e4e4e4; border-top: 2px solid #e4e4e4;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
...@@ -256,19 +258,19 @@ ...@@ -256,19 +258,19 @@
background: #fff; background: #fff;
.flex-item-style { .flex-item-style {
flex: 1; flex: 1;
height: .98rem; height: 0.98rem;
display: flex; display: flex;
justify-content: flex-start justify-content: flex-start;
} }
.flex-item-btn { .flex-item-btn {
flex: 3; flex: 3;
height: .98rem; height: 0.98rem;
padding-top: 14px; padding-top: 14px;
} }
button.submit { button.submit {
width: 100%; width: 100%;
height: .98rem; height: 0.98rem;
line-height: .98rem; line-height: 0.98rem;
border: 0; border: 0;
background-color: #999; background-color: #999;
font-size: 0.32rem; font-size: 0.32rem;
...@@ -276,14 +278,14 @@ ...@@ -276,14 +278,14 @@
} }
button.active-submit { button.active-submit {
width: 100%; width: 100%;
height: .98rem; height: 0.98rem;
line-height: .98rem; line-height: 0.98rem;
border: 0; border: 0;
background-color: @common-blue; background-color: @common-blue;
font-size: 0.32rem; font-size: 0.32rem;
color: #fff; color: #fff;
} }
button.click-to-next{ button.click-to-next {
width: 212px; width: 212px;
height: 70px; height: 70px;
line-height: 68px; line-height: 68px;
...@@ -297,24 +299,24 @@ ...@@ -297,24 +299,24 @@
border: 0; border: 0;
} }
.questionCard { .questionCard {
padding-left: .26rem; padding-left: 0.26rem;
font-size: .24rem; font-size: 0.24rem;
color: #636363; color: #636363;
-ms-text-align-last: right; -ms-text-align-last: right;
background-color: #fff; background-color: #fff;
text-align: left; text-align: left;
border: 0; border: 0;
line-height: .98rem; line-height: 0.98rem;
} }
} }
} }
.question-score-result{ .question-score-result {
font-size: 36px; font-size: 36px;
margin-left: .2rem; margin-left: 0.2rem;
color: @common-blue; color: @common-blue;
position: relative; position: relative;
top: -10px; top: -10px;
.sub-info{ .sub-info {
position: inherit; position: inherit;
top: -4px; top: -4px;
font-size: 24px; font-size: 24px;
...@@ -340,23 +342,24 @@ ...@@ -340,23 +342,24 @@
border-top: 0.02rem solid #eee; border-top: 0.02rem solid #eee;
} }
.exam-question{ .exam-question {
// padding-top: 60px; // padding-top: 60px;
// background: rgba(243,243,243,1); // background: rgba(243,243,243,1);
} }
.sep-bottom{ .sep-bottom {
height:20px; height: 20px;
background-color: #fff; background-color: #fff;
} }
.exam-list-display-container,.am-list-view-scrollview{ .exam-list-display-container,
.sep-bottom{ .am-list-view-scrollview {
height:20px; .sep-bottom {
background-color:rgba(243, 243, 243, 1); height: 20px;
background-color: rgba(243, 243, 243, 1);
margin-bottom: -2px; margin-bottom: -2px;
} }
.question-block:last-child{ .question-block:last-child {
.sep-bottom{ .sep-bottom {
background-color: #fff; background-color: #fff;
} }
} }
......
src/components/globalsearch/component/GlobalSearchList/index.jsx
...@@ -588,8 +588,6 @@ class GlobalSearchResultListItem extends Component { ...@@ -588,8 +588,6 @@ class GlobalSearchResultListItem extends Component {
return intl.get("Research") || '调研'; return intl.get("Research") || '调研';
case 'lecturer': case 'lecturer':
return intl.get("Lecturer") || '讲师'; return intl.get("Lecturer") || '讲师';
case 'marketingCourse':
return intl.get("PublishKey131") || '营销';
case 'studentCase': case 'studentCase':
return intl.get("case") || '作品'; return intl.get("case") || '作品';
case 'albums': case 'albums':
......
src/components/globalsearch/component/GlobalSearchList/marketItem.jsx
...@@ -19,9 +19,7 @@ class MarketItem extends Component { ...@@ -19,9 +19,7 @@ class MarketItem extends Component {
case 3: case 3:
sourceText = intl.get("globalsearch5") || '外部采购'; sourceText = intl.get("globalsearch5") || '外部采购';
break; break;
case 4:
sourceText = intl.get("globalsearch6") || '课程营销';
break;
} }
console.log(rowData) console.log(rowData)
let accountId = sessionStorage.getItem("accountId"); let accountId = sessionStorage.getItem("accountId");
......
src/components/globalsearch/index.jsx
...@@ -46,7 +46,6 @@ class GlobalSearch extends Component { ...@@ -46,7 +46,6 @@ class GlobalSearch extends Component {
}, },
searchResultTabs: [ searchResultTabs: [
{ key: 'course', title: intl.get("Course") || '课程' }, { key: 'course', title: intl.get("Course") || '课程' },
{ key: 'marketingCourse', title: intl.get("PublishKey131") || '营销' },
{ key: 'trainingProject', title: intl.get("TrainingProgram2") || '项目' }, { key: 'trainingProject', title: intl.get("TrainingProgram2") || '项目' },
{ key: 'exam', title: intl.get("Exam") || '考试' }, { key: 'exam', title: intl.get("Exam") || '考试' },
{ key: 'assignment', title: intl.get("Assignment") || '作业' }, { key: 'assignment', title: intl.get("Assignment") || '作业' },
...@@ -115,12 +114,6 @@ class GlobalSearch extends Component { ...@@ -115,12 +114,6 @@ class GlobalSearch extends Component {
searchResultTabs.push({ key: 'course', title: intl.get("Course") || '课程' }); searchResultTabs.push({ key: 'course', title: intl.get("Course") || '课程' });
} }
if ( if (
searchResult.marketingCourses &&
searchResult.marketingCourses.length > 0
) {
searchResultTabs.push({ key: 'marketingCourse', title: intl.get("globalsearch1") || '营销' });
}
if (
searchResult.trainingProjects && searchResult.trainingProjects &&
searchResult.trainingProjects.length > 0 searchResult.trainingProjects.length > 0
) { ) {
......
src/components/indexComponent/indexBtnScroll/style.css
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
} }
.index-btn-scroll-container { .index-btn-scroll-container {
width: 100%; width: 100%;
padding: 16px 30px 0 30px; padding: 40px 10px 0 10px;
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.index-btn-scroll-container .index-simple-scroll-bar-wrap { .index-btn-scroll-container .index-simple-scroll-bar-wrap {
......
src/components/indexComponent/indexBtnScroll/style.less
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.index-btn-scroll-container { .index-btn-scroll-container {
width: 100%; width: 100%;
padding: 16px 30px 0 30px; padding: 40px 10px 0 10px;
background-color: @indexBgColor; background-color: @indexBgColor;
.index-simple-scroll-bar-wrap{ .index-simple-scroll-bar-wrap{
width: 100%; width: 100%;
......
src/components/indexComponent/indexComponent/index.jsx
...@@ -19,7 +19,6 @@ import moment from "moment"; ...@@ -19,7 +19,6 @@ import moment from "moment";
const IndexTitle = ({ title, onClick, hasMore, hasExchange }) => { const IndexTitle = ({ title, onClick, hasMore, hasExchange }) => {
return ( return (
<div className="index-module-title-container"> <div className="index-module-title-container">
<div className="index-module-title-text">{title}</div>
{hasMore ? ( {hasMore ? (
<div className="index-module-title-more-btn" onClick={onClick}> <div className="index-module-title-more-btn" onClick={onClick}>
{intl.get("course27")} {intl.get("course27")}
...@@ -138,7 +137,6 @@ const IndexModuleBg = ({ bgColor, children }) => { ...@@ -138,7 +137,6 @@ const IndexModuleBg = ({ bgColor, children }) => {
<div className="index-module-bg-container"> <div className="index-module-bg-container">
<div <div
className="index-module-inside-bg-container" className="index-module-inside-bg-container"
style={{ backgroundColor: bgColor ? bgColor : "#fff" }}
> >
{children} {children}
</div> </div>
...@@ -234,7 +232,7 @@ const IndexLiveItem = ({ data, onClick }) => { ...@@ -234,7 +232,7 @@ const IndexLiveItem = ({ data, onClick }) => {
// 首页新闻模块单项 // 首页新闻模块单项
const IndexNewsItem = ({ data, onClick }) => { const IndexNewsItem = ({ data, onClick }) => {
let imageWidth = Math.floor(document.body.clientWidth * (220 / 750)); let imageWidth = Math.floor(document.body.clientWidth * (55 / 187));
let imageHeight = Math.floor(imageWidth * (132 / 220)); let imageHeight = Math.floor(imageWidth * (132 / 220));
imageWidth = imageWidth < 220 ? 220 : imageWidth; imageWidth = imageWidth < 220 ? 220 : imageWidth;
imageHeight = imageHeight < 132 ? 132 : imageHeight; imageHeight = imageHeight < 132 ? 132 : imageHeight;
...@@ -246,7 +244,7 @@ const IndexNewsItem = ({ data, onClick }) => { ...@@ -246,7 +244,7 @@ const IndexNewsItem = ({ data, onClick }) => {
src={data.image} src={data.image}
alt="图片加载失败" alt="图片加载失败"
className="index-module-news-item-image" className="index-module-news-item-image"
style={{ width: imageWidth, height: imageHeight }} style={{ width: imageWidth, height: '180px' }}
/> />
<div <div
className="index-module-news-info-container" className="index-module-news-info-container"
......
src/components/indexComponent/indexComponent/style.css
...@@ -130,14 +130,11 @@ ...@@ -130,14 +130,11 @@
background-color: #f0f0f0; background-color: #f0f0f0;
} }
.index-module-bg-container { .index-module-bg-container {
width: 100%; width: 94%;
padding: 0 30px; margin: 0 auto;
} }
.index-module-bg-container .index-module-inside-bg-container { .index-module-bg-container .index-module-inside-bg-container {
background-color: #fff;
border-radius: 10px;
width: 100%; width: 100%;
padding: 8px 0;
} }
.index-module-scroll-bg-container { .index-module-scroll-bg-container {
width: 100%; width: 100%;
...@@ -303,7 +300,8 @@ ...@@ -303,7 +300,8 @@
} }
.index-module-news-item-container { .index-module-news-item-container {
width: 100%; width: 100%;
padding: 24px 30px; padding: 20px 30px;
padding-bottom: 16px;
} }
.index-module-news-item-container .index-module-news-item-content-container { .index-module-news-item-container .index-module-news-item-content-container {
width: 100%; width: 100%;
...@@ -311,7 +309,7 @@ ...@@ -311,7 +309,7 @@
justify-content: space-between; justify-content: space-between;
} }
.index-module-news-item-container .index-module-news-item-content-container .index-module-news-info-container { .index-module-news-item-container .index-module-news-item-content-container .index-module-news-info-container {
width: 60%; width: 64%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
...@@ -348,7 +346,7 @@ ...@@ -348,7 +346,7 @@
margin-top: -5px; margin-top: -5px;
} }
.index-module-news-item-container .index-module-news-item-content-container .index-module-news-item-image { .index-module-news-item-container .index-module-news-item-content-container .index-module-news-item-image {
border-radius: 10px; border-radius: 0px;
} }
.index-module-train-item-one-container { .index-module-train-item-one-container {
width: 100%; width: 100%;
......
src/components/indexComponent/indexComponent/style.less
...@@ -137,14 +137,11 @@ ...@@ -137,14 +137,11 @@
} }
.index-module-bg-container { .index-module-bg-container {
width: 100%; width: 94%;
padding: 0 30px; margin: 0 auto;
.index-module-inside-bg-container { .index-module-inside-bg-container {
background-color: #fff;
border-radius: 10px;
width: 100%; width: 100%;
padding: 8px 0;
} }
} }
...@@ -319,7 +316,8 @@ ...@@ -319,7 +316,8 @@
.index-module-news-item-container { .index-module-news-item-container {
width: 100%; width: 100%;
padding: 24px 30px; padding: 20px 30px;
padding-bottom: 16px;
.index-module-news-item-content-container { .index-module-news-item-content-container {
width: 100%; width: 100%;
...@@ -327,7 +325,7 @@ ...@@ -327,7 +325,7 @@
justify-content: space-between; justify-content: space-between;
.index-module-news-info-container { .index-module-news-info-container {
width: 60%; width: 64%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
...@@ -361,7 +359,7 @@ ...@@ -361,7 +359,7 @@
} }
.index-module-news-item-image { .index-module-news-item-image {
border-radius: 10px; border-radius: 0px;
} }
} }
} }
......
src/components/login/login.css
...@@ -41,41 +41,43 @@ ...@@ -41,41 +41,43 @@
} }
.login .login-container .login-form { .login .login-container .login-form {
width: 100%; width: 100%;
margin-top: 240px; margin-top: 240px !important;
padding-left: 40px; padding-left: 40px;
padding-right: 40px; padding-right: 40px;
} }
.login .login-container .login-form .login-form-item { .login .login-container .login-form .login-form-item {
width: 100%; width: 96%;
margin: 0 auto;
} }
.login .login-container .login-form .login-form-item .login-form-top-logo { .login .login-container .login-form .login-form-item .login-form-top-logo {
margin-bottom: 20px; margin-bottom: 60px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.login .login-container .login-form .login-form-item .login-form-top-logo .login-input-top-icon { .login .login-container .login-form .login-form-item .login-form-top-logo .login-input-top-icon {
width: 120px; width: 150px;
height: 120px; height: 150px;
margin-bottom: 60px; margin-bottom: 60px;
} }
.login .login-container .login-form .login-form-item .login-form-top-logo .login-input-top-font { .login .login-container .login-form .login-form-item .login-form-top-logo .login-input-top-font {
color: #F5222D; color: #f5222d;
font-weight: 600; font-weight: 600;
} }
.login .login-container .login-form .login-form-item .login-form-input-container { .login .login-container .login-form .login-form-item .login-form-input-container {
width: 100%; width: 100%;
margin: 0 auto;
border-radius: 12px; border-radius: 12px;
} }
.login .login-container .login-form .login-form-item .login-form-input-container .login-form-single-label { .login .login-container .login-form .login-form-item .login-form-input-container .login-form-single-label {
font-size: 36px; font-size: 32px;
font-weight: bold; font-weight: bold;
} }
.login .login-container .login-form .login-form-item .login-form-input-container .login-form-single-container { .login .login-container .login-form .login-form-item .login-form-input-container .login-form-single-container {
width: 100%; width: 100%;
padding: 30px 20px 20px 30px; padding: 30px 20px 20px 30px;
border: 1px solid #D23A29; border: 1px solid #d23a29;
border-radius: 5px; border-radius: 5px;
margin-top: 15px; margin-top: 15px;
background-color: #fff; background-color: #fff;
...@@ -93,7 +95,7 @@ ...@@ -93,7 +95,7 @@
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
color: #D23A29; color: #d23a29;
} }
.login .login-container .login-form .login-form-item .login-form-input-container .login-form-single-container .form-item input { .login .login-container .login-form .login-form-item .login-form-input-container .login-form-single-container .form-item input {
height: 47px; height: 47px;
...@@ -114,7 +116,7 @@ ...@@ -114,7 +116,7 @@
.login .login-container .login-form .login-form-item button { .login .login-container .login-form .login-form-item button {
width: 100%; width: 100%;
height: 96px; height: 96px;
margin-top: 56px; margin-top: 60px;
border-radius: 6px; border-radius: 6px;
font-size: 40px; font-size: 40px;
} }
...@@ -146,3 +148,13 @@ ...@@ -146,3 +148,13 @@
position: absolute; position: absolute;
top: 0.1rem; top: 0.1rem;
} }
.login .login-bot-text {
font-size: 28px;
position: fixed;
bottom: 60px;
left: 31%;
z-index: 99999;
padding: 8px 80px;
color: #fff;
background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.3) 50%, rgba(255, 255, 255, 0) 100%);
}
src/components/login/login.less
@import "../../static/theme.less"; @import "../../static/theme.less";
.login{ .login {
width: 100%; width: 100%;
height: 100%; height: 100%;
.login-bg{ .login-bg {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 1; z-index: 1;
img{ img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.login-aia-bg-image{ .login-aia-bg-image {
background-size: 100%; background-size: 100%;
} }
.login-container{ .login-container {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 2; z-index: 2;
.logo{ .logo {
width: 100%; width: 100%;
margin-top: 105px; margin-top: 105px;
text-align: center; text-align: center;
img{ img {
width: 160px; width: 160px;
} }
} }
.login-form{ .login-form {
width: 100%; width: 100%;
margin-top: 240px; margin-top: 240px !important;
padding-left: 40px; padding-left: 40px;
padding-right: 40px; padding-right: 40px;
.login-form-item{ .login-form-item {
width: 100%; width: 96%;
.login-form-top-logo{ margin: 0 auto;
margin-bottom: 20px; .login-form-top-logo {
margin-bottom: 60px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.login-input-top-icon{ .login-input-top-icon {
width: 120px; width: 150px;
height: 120px; height: 150px;
margin-bottom: 60px; margin-bottom: 60px;
} }
.login-input-top-font{ .login-input-top-font {
color:#F5222D; color: #f5222d;
font-weight: 600; font-weight: 600;
} }
} }
.login-form-input-container{ .login-form-input-container {
width: 100%; width: 100%;
margin: 0 auto;
border-radius: 12px; border-radius: 12px;
.login-form-single-label{ .login-form-single-label {
font-size:36px; font-size: 32px;
font-weight: bold; font-weight: bold;
} }
.login-form-single-container{ .login-form-single-container {
width: 100%; width: 100%;
padding: 30px 20px 20px 30px; padding: 30px 20px 20px 30px;
border: 1px solid #D23A29; border: 1px solid #d23a29;
border-radius: 5px; border-radius: 5px;
margin-top: 15px; margin-top: 15px;
background-color: #fff; background-color: #fff;
.form-item{ .form-item {
width: 100%; width: 100%;
height: 44px; height: 44px;
padding-left: 88px; padding-left: 88px;
padding-right: 44px; padding-right: 44px;
position: relative; position: relative;
.login-input-item-icon{ .login-input-item-icon {
width: 40px; width: 40px;
height: 40px; height: 40px;
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
color:#D23A29 ; color: #d23a29;
} }
input{ input {
height: 47px; height: 47px;
line-height: 1; line-height: 1;
font-size: 36px; font-size: 36px;
color:#333; color: #333;
background: transparent; background: transparent;
border:0; border: 0;
width: 100%; width: 100%;
} }
.login-password-eye{ .login-password-eye {
color: #c5c5c5; color: #c5c5c5;
font-size: 32px; font-size: 32px;
position: absolute; position: absolute;
...@@ -102,49 +104,62 @@ ...@@ -102,49 +104,62 @@
} }
} }
} }
} }
button {
button{
width: 100%; width: 100%;
height: 96px; height: 96px;
margin-top: 56px; margin-top: 60px;
border-radius: 6px; border-radius: 6px;
font-size: 40px; font-size: 40px;
} }
.remember-password{ .remember-password {
width: 100%; width: 100%;
margin-top: 40px; margin-top: 40px;
// display: flex; // display: flex;
.language-change{ .language-change {
line-height: 0.42rem; line-height: 0.42rem;
font-size: 0.28rem; font-size: 0.28rem;
color: #666; color: #666;
white-space: nowrap; white-space: nowrap;
} }
} }
} }
} }
.login-forget{ .login-forget {
width: 100%; width: 100%;
text-align: center; text-align: center;
margin-top: 74px; margin-top: 74px;
.forget-psd{ .forget-psd {
font-size: 28px; font-size: 28px;
color:@themeColor; color: @themeColor;
} }
} }
.paswDiv { .paswDiv {
position: relative; position: relative;
} }
.eye{ .eye {
font-size: 0.3rem; font-size: 0.3rem;
right: 0.2rem; right: 0.2rem;
position: absolute; position: absolute;
top: 0.1rem; top: 0.1rem;
} }
} }
}
\ No newline at end of file .login-bot-text {
font-size: 28px;
position: fixed;
bottom: 60px;
left: 31%;
z-index: 99999;
padding: 8px 80px;
color: #fff;
background: linear-gradient(
270deg,
rgba(255, 255, 255, 0) 0%,
rgba(255, 255, 255, 0.3) 50%,
rgba(255, 255, 255, 0) 100%
);
}
}
src/components/login/loginForm.jsx
...@@ -459,15 +459,15 @@ class LoginForm extends Component { ...@@ -459,15 +459,15 @@ class LoginForm extends Component {
<div className="login-form-item"> <div className="login-form-item">
<div className="login-form-top-logo"> <div className="login-form-top-logo">
<img src={loginTopLogoImg} alt="" className="login-input-top-icon" /> <img src={loginTopLogoImg} alt="" className="login-input-top-icon" />
<div className="login-input-top-font" style={{ fontSize: "52px" }}> <div className="login-input-top-font" style={{ fontSize: "56px" }}>
机电e先锋 机电e先锋
</div> </div>
<div className="login-input-top-font" style={{ fontSize: "32px" }}> <div className="login-input-top-font" style={{ fontSize: "34px" }}>
智慧党建平台 智慧党建平台
</div> </div>
</div> </div>
<div className="login-form-input-container"> <div className="login-form-input-container">
<div className="login-form-single-label">用户名：</div> <div className="login-form-single-label">用户名</div>
<div <div
className="login-form-single-container" className="login-form-single-container"
onClick={this.usernameInputClick} onClick={this.usernameInputClick}
...@@ -483,19 +483,15 @@ class LoginForm extends Component { ...@@ -483,19 +483,15 @@ class LoginForm extends Component {
value={this.state.account} value={this.state.account}
onChange={this.getAccount} onChange={this.getAccount}
style={{ fill: "unset" }} style={{ fill: "unset" }}
placeholder={ placeholder='请输入用户名'
loginNameDesc
? loginNameDesc
: intl.get("pleaseInputUsername")
}
/> />
</div> </div>
</div> </div>
<div <div
className="login-form-single-label" className="login-form-single-label"
style={{ marginTop: "15px" }} style={{ marginTop: "15px",marginTop:'40px' }}
> >
密码： 密码
</div> </div>
<div <div
className="login-form-single-container" className="login-form-single-container"
...@@ -513,9 +509,7 @@ class LoginForm extends Component { ...@@ -513,9 +509,7 @@ class LoginForm extends Component {
value={this.state.password} value={this.state.password}
type={passwordType} type={passwordType}
onChange={this.getPassword} onChange={this.getPassword}
placeholder={ placeholder='请输入密码'
loginPwdDesc ? loginPwdDesc : intl.get("Password")
}
/> />
</div> </div>
{passwordType === "text" ? ( {passwordType === "text" ? (
...@@ -544,7 +538,7 @@ class LoginForm extends Component { ...@@ -544,7 +538,7 @@ class LoginForm extends Component {
> >
{intl.get("LogIn")} {intl.get("LogIn")}
</Button> </Button>
<div className="remember-password"> {/* <div className="remember-password">
<CheckBox <CheckBox
rememberPassword={this.state.rememberPassword} rememberPassword={this.state.rememberPassword}
onRememberPassword={this.onRememberPassword} onRememberPassword={this.onRememberPassword}
...@@ -552,7 +546,7 @@ class LoginForm extends Component { ...@@ -552,7 +546,7 @@ class LoginForm extends Component {
<div className="language-change"> <div className="language-change">
<PickerCommon tipFalg={1} /> <PickerCommon tipFalg={1} />
</div> </div>
</div> </div> */}
</div> </div>
); );
} }
......
src/components/menulearn/menulearn.jsx
...@@ -37,6 +37,8 @@ import IndexFirstEnter from "../indexComponent/indexFirstEnter"; ...@@ -37,6 +37,8 @@ import IndexFirstEnter from "../indexComponent/indexFirstEnter";
import IndexTips from "./indexTip"; import IndexTips from "./indexTip";
import MessageIcon from './message-icon.png'
function mapStateToProps(state, ownProps) { function mapStateToProps(state, ownProps) {
return { return {
showInfo: state.home.homeShowInfo, showInfo: state.home.homeShowInfo,
...@@ -297,7 +299,7 @@ class Menulearn extends React.Component { ...@@ -297,7 +299,7 @@ class Menulearn extends React.Component {
}); });
}; };
render() { render() {
let bannerHeight = (document.body.clientWidth - 60) * (540 / 1125); let bannerHeight = (document.body.clientWidth) * (212 / 726);
//轮播图参数 //轮播图参数
const carouselparam = { const carouselparam = {
...@@ -331,7 +333,7 @@ class Menulearn extends React.Component { ...@@ -331,7 +333,7 @@ class Menulearn extends React.Component {
isFetching={this.state.isLoading} isFetching={this.state.isLoading}
imageUrl={OccupyIndexImage} imageUrl={OccupyIndexImage}
> >
<div style={{ width: "100%", overflowX: "hidden" }}> <div style={{ width: "100%", overflowX: "hidden" ,position:'relative'}}>
{viewConfig.navModel == 2 ? null : viewConfig.navModel == 1 ? ( {viewConfig.navModel == 2 ? null : viewConfig.navModel == 1 ? (
<div onClick={this.taixiangSearchClick}> <div onClick={this.taixiangSearchClick}>
<SearchBar placeholder={intl.get("keyword")} maxLength={8} /> <SearchBar placeholder={intl.get("keyword")} maxLength={8} />
...@@ -348,7 +350,7 @@ class Menulearn extends React.Component { ...@@ -348,7 +350,7 @@ class Menulearn extends React.Component {
{/* 轮播图 */} {/* 轮播图 */}
<div className="carouseldiv"> <div className="carouseldiv">
<div style={{ height: bannerHeight + 80, position: "relative" }}> <div style={{ height: '34%', position: "relative" }}>
{carouselData && carouselData.length > 0 ? ( {carouselData && carouselData.length > 0 ? (
<Mycarousel <Mycarousel
carouselparam={carouselparam} carouselparam={carouselparam}
...@@ -383,10 +385,11 @@ class Menulearn extends React.Component { ...@@ -383,10 +385,11 @@ class Menulearn extends React.Component {
style={{ style={{
display: "inline-block", display: "inline-block",
width: "9px", width: "9px",
height: "34px", height: "28px",
background: "linear-gradient(180deg,#fe742b, #fc5b2b 100%)", background: 'linear-gradient(180deg,#fe742b, #fc5b2b 100%)',
marginLeft: "4%", borderRadius:'8px',
marginRight: "1%", marginLeft: "40px",
marginRight: "15px",
}} }}
></span> ></span>
精选资讯 精选资讯
...@@ -396,6 +399,14 @@ class Menulearn extends React.Component { ...@@ -396,6 +399,14 @@ class Menulearn extends React.Component {
) : ( ) : (
"" ""
)} )}
{/* 新消息icon */}
<div style={{
position:'fixed',
top:'47%',
right:'0'
}}>
<img style={{width:'180px'}} src={MessageIcon} alt="" />
</div>
{/* 通知 :6月1号版本，隐藏首页的公告字段*/} {/* 通知 :6月1号版本，隐藏首页的公告字段*/}
{this.state.announceList && this.state.announceList.length > 0 ? ( {this.state.announceList && this.state.announceList.length > 0 ? (
<NoticeBlock <NoticeBlock
...@@ -446,7 +457,7 @@ class Menulearn extends React.Component { ...@@ -446,7 +457,7 @@ class Menulearn extends React.Component {
export default connect(mapStateToProps, mapDispatchToProps)(Menulearn); export default connect(mapStateToProps, mapDispatchToProps)(Menulearn);
const NewsItemList = ({ list, onClick }) => { const NewsItemList = ({ list, onClick }) => {
return ( return (
<div className="news-item-list-container"> <div className="news-item-list-container" style={{paddingLeft:'15px'}}>
{list.map((item, index) => { {list.map((item, index) => {
let data = { let data = {
id: item.id, id: item.id,
...@@ -492,16 +503,16 @@ const IndexNewsItem = ({ data, onClick }) => { ...@@ -492,16 +503,16 @@ const IndexNewsItem = ({ data, onClick }) => {
src={data.image} src={data.image}
alt="图片加载失败" alt="图片加载失败"
className="index-module-news-item-image" className="index-module-news-item-image"
style={{ width: imageWidth, height: imageHeight }} style={{ width: imageWidth, height: '180px' }}
/> />
<div <div
className="index-module-news-info-container" className="index-module-news-info-container"
style={{ height: imageHeight }} style={{ height: '180px' }}
> >
<div className="index-module-news-item-info-name">{data.name}</div> <div className="index-module-news-item-info-name">{data.name}</div>
<div className="index-module-news-item-info-text"> <div className="index-module-news-item-info-text">
<span style={{marginRight:'20px'}}>{data.author}</span> <span style={{marginRight:'20px'}}>{data.author}</span>
{moment(data.releaseTime).format("YYYY-MM-DD")} {moment(data.releaseTime).format("YYYY.MM.DD")}
</div> </div>
</div> </div>
</div> </div>
......
src/components/menutrain/MenuTrain.css 0 → 100644
.train-index-container {
width: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
}
.train-index-container .train-container {
flex: 1;
width: 100%;
overflow-y: auto;
}
.train-index-container .train-container .am-list-header {
padding: 0;
}
.train-index-container .train-container .my-carousel .slider-frame {
height: 230px !important;
}
.train-index-container .train-container .am-list-view-scrollview-content {
position: static !important;
}
.train-index-container .train-container .separator-box {
height: 0.2rem;
overflow: hidden;
}
.train-index-container .train-container .carousel {
padding: 16px 20px 0px 20px;
background-color: #ffffff;
}
.train-index-container .train-container .hotenroll {
padding: 0;
background-color: #ffffff;
overflow: hidden;
}
.train-index-container .train-container .train-item-card {
margin-left: 0.2rem;
height: 3.2rem;
width: 45.333%;
float: left;
}
.train-index-container .train-container .train-item-card-image {
height: 2.04rem;
width: 100%;
border-radius: 0.1rem;
}
.train-index-container .train-container .train-item-card-text {
margin-left: 0.16rem;
margin-top: 0.1rem;
width: 90.58%;
height: 0.4rem;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
font-size: 0.28rem;
color: #4A4A4A;
}
.train-index-container .train-container .train-item-card-time {
margin-top: 0.1rem;
height: 0.32rem;
margin-left: 0.16rem;
color: #9B9B9B;
}
.train-index-container .train-container .train-item-cardt {
margin-left: 0.3rem;
height: 3.2rem;
width: 45.333%;
float: left;
}
.train-index-container .train-container .enrolling {
padding: 0;
background-color: #ffffff;
}
.train-index-container .train-container .moreBtn {
width: 100%;
height: 0.4rem;
font-Size: 0.12rem;
background-color: #00aaff;
color: #fff;
}
src/components/menutrain/MenuTrain.jsx
...@@ -37,6 +37,7 @@ class MenuTrain extends Component { ...@@ -37,6 +37,7 @@ class MenuTrain extends Component {
refreshList: "", refreshList: "",
activeId: "", activeId: "",
activeList: [], activeList: [],
taskList:[],
nowData: "", nowData: "",
}; };
} }
...@@ -108,13 +109,14 @@ class MenuTrain extends Component { ...@@ -108,13 +109,14 @@ class MenuTrain extends Component {
this.props.getActiveList("", () => { this.props.getActiveList("", () => {
const { MenuTrainReducer } = _this.props; const { MenuTrainReducer } = _this.props;
let allClassify = MenuTrainReducer.activityType; let allClassify = MenuTrainReducer.activityType;
let taskList = MenuTrainReducer.theDay;
if (allClassify && allClassify.length > 0) { if (allClassify && allClassify.length > 0) {
allClassify.unshift({ allClassify.unshift({
activityType: "", activityType: "",
activityName: intl.get("AllActive"), activityName: intl.get("AllActive"),
}); });
} }
this.setState({ activeList: allClassify }); this.setState({ activeList: allClassify,taskList:taskList });
}); });
}; };
//更改日期,每次更改日期去获取新的任务列表,默认打开课程，第一页 //更改日期,每次更改日期去获取新的任务列表,默认打开课程，第一页
...@@ -133,14 +135,12 @@ class MenuTrain extends Component { ...@@ -133,14 +135,12 @@ class MenuTrain extends Component {
if (trainDataList.length > 0) { if (trainDataList.length > 0) {
_this.props.trainListData(params, () => { _this.props.trainListData(params, () => {
const { MenuTrainReducer } = _this.props; const { MenuTrainReducer } = _this.props;
console.log(MenuTrainReducer.trainList, "获取数据展示1111");
_this.setState({ _this.setState({
isLoading: false, isLoading: false,
pageNo: page, pageNo: page,
refreshList: new Date().getTime(), refreshList: new Date().getTime(),
trainDataList: MenuTrainReducer.trainList, trainDataList: MenuTrainReducer.trainList,
}); });
console.log(this.state.trainDataList,'33333')
}); });
} }
}; };
...@@ -167,11 +167,10 @@ class MenuTrain extends Component { ...@@ -167,11 +167,10 @@ class MenuTrain extends Component {
const { MenuTrainReducer } = _this.props; const { MenuTrainReducer } = _this.props;
trainDataList[thisMonth] = res; trainDataList[thisMonth] = res;
_this.setState({ _this.setState({
trainDataList:MenuTrainReducer.trainList, trainDataList: MenuTrainReducer.trainList,
isLoading: false, isLoading: false,
}); });
}); });
console.log(this.state.trainDataList,'33333')
} }
}; };
//获取年月信息 //获取年月信息
...@@ -183,37 +182,40 @@ class MenuTrain extends Component { ...@@ -183,37 +182,40 @@ class MenuTrain extends Component {
return thisMonth; return thisMonth;
}; };
render() { render() {
let { trainDataList, isLoading, refreshList, activeList, activeId } = let { trainDataList,taskList, isLoading, refreshList, activeList, activeId } =
this.state; this.state;
return ( return (
<div className="train-index-container" onScroll={this.listScroll}> <div className="train-index-container" onScroll={this.listScroll}>
<div className="train-container" id="train-scroll-listen-container"> <div className="train-container" id="train-scroll-listen-container">
<div style={{ backgroundColor: "#fff" }}> {/* 滚动页签 */}
<div>
<NewsClassifyList <NewsClassifyList
list={activeList} list={activeList}
activeId={activeId} activeId={activeId}
onClick={this.newsClassifyClick} onClick={this.newsClassifyClick}
/> />
</div> </div>
<div className="taskView"> {/* 日历 */}
<div className="taskView" style={{ backgroundColor: "#fff" }}>
<div className={"taskCalendarView moveDown"} id="taskCalendarView"> <div className={"taskCalendarView moveDown"} id="taskCalendarView">
<TaskCalendar <TaskCalendar
timestamp={this.state.today} timestamp={this.state.today}
onChangeDateListener={this.onChangeDateListener} onChangeDateListener={this.onChangeDateListener}
getCalendarTaskNum={this.getCalendarTaskNum} getCalendarTaskNum={this.getCalendarTaskNum}
isLoading={this.state.isLoading} isLoading={this.state.isLoading}
taskList={trainDataList} taskList={taskList}
/> />
</div> </div>
</div> </div>
{/* 数据列表 */}
<TrainIndexList <div style={{marginTop:'20px'}}>
key={refreshList} <TrainIndexList
list={trainDataList} key={refreshList}
itemClick={this.itemClick} list={trainDataList}
isLoading={isLoading} itemClick={this.itemClick}
/> isLoading={isLoading}
/>
</div>
</div> </div>
<div style={{ width: "100%", height: 100 }}></div> <div style={{ width: "100%", height: 100 }}></div>
</div> </div>
...@@ -233,13 +235,13 @@ class MenuTrain extends Component { ...@@ -233,13 +235,13 @@ class MenuTrain extends Component {
//list item //list item
itemClick = (item) => { itemClick = (item) => {
console.log(item,'555555555555'); console.log(item, "555555555555");
hashHistory.push({ hashHistory.push({
pathname: func.routerBefore() + "/trainingsteps", pathname: func.routerBefore() + "/trainingsteps",
query: { query: {
id: item.id, id: item.id,
finished: item.finished, finished: item.finished,
activityStateCode: item.activityStateCode activityStateCode: item.activityStateCode,
}, },
}); });
}; };
...@@ -277,6 +279,9 @@ const NewsClassifyItem = ({ data, isActive, onClick }) => { ...@@ -277,6 +279,9 @@ const NewsClassifyItem = ({ data, isActive, onClick }) => {
return ( return (
<div className="news-classify-item-container" onClick={onClick}> <div className="news-classify-item-container" onClick={onClick}>
{isActive ? <span>{data.activityName}</span> : data.activityName} {isActive ? <span>{data.activityName}</span> : data.activityName}
{
isActive ? <div className="active"></div> :''
}
</div> </div>
); );
}; };
src/components/menutrain/MenuTrain.less
...@@ -7,9 +7,6 @@ ...@@ -7,9 +7,6 @@
.train-container { .train-container {
flex: 1; flex: 1;
width: 100%; width: 100%;
background-color: #fff;
.am-list-header { .am-list-header {
padding: 0; padding: 0;
......
src/components/menutrain/MenuTrainAction.js
...@@ -60,7 +60,9 @@ function itemList(item) { ...@@ -60,7 +60,9 @@ function itemList(item) {
activityStateName:item.activityStateName, activityStateName:item.activityStateName,
period: item.period, period: item.period,
trainingDurationShow: item.trainingDurationShow, trainingDurationShow: item.trainingDurationShow,
enablePay: item.enablePay enablePay: item.enablePay,
canNumber: item.canNumber,
joinNumber: item.joinNumber,
}) })
}); });
return newItem; return newItem;
......
src/components/menutrain/TaskCalendar/CalenderMain.jsx
...@@ -36,17 +36,16 @@ class CalenderMain extends React.Component { ...@@ -36,17 +36,16 @@ class CalenderMain extends React.Component {
rowsInMonth.push(current_month_data.slice(index, index + 7)); rowsInMonth.push(current_month_data.slice(index, index + 7));
} }
}); });
let currentMonth = this.props.year + "_" + this.props.month; let currentTaskList = this.props.taskList;
let currentTaskList = this.props.taskList
? this.props.taskList[currentMonth]
: null;
if (currentTaskList) { if (currentTaskList) {
rowsInMonth.map((list, index) => { rowsInMonth.map((list, index) => {
if (list.length) { if (list.length) {
list.map((data) => { list.map((data) => {
if (currentTaskList[data.All_date] > 0) { currentTaskList.map((item) => {
data.hasTask = true; if (data.All_date == item) {
} data.hasTask = true;
}
});
}); });
} }
}); });
...@@ -55,6 +54,12 @@ class CalenderMain extends React.Component { ...@@ -55,6 +54,12 @@ class CalenderMain extends React.Component {
return rowsInMonth; return rowsInMonth;
}; };
// containsDate = (datesArray, dateToCheck) => {
// const formattedDateToCheck = dateToCheck.replace(/-/g, ""); // 将日期转换为字符串，如'20230325'
// return datesArray.some(
// (date) => date.replace(/-/g, "") === formattedDateToCheck
// );
// };
//获取当前日期在第几行 //获取当前日期在第几行
getCurrentRowIndex = () => { getCurrentRowIndex = () => {
let current_month_data = this.getCurrentMonth(); let current_month_data = this.getCurrentMonth();
......
src/components/menutrain/TaskCalendar/style/index.css
...@@ -86,9 +86,9 @@ ...@@ -86,9 +86,9 @@
color: #4285f4; color: #4285f4;
} }
.calendar_box_click_blue { .calendar_box_click_blue {
background: linear-gradient(135deg, #3666a6 0%, #454f5e 100%);
color: #ffffff;
border-radius: 50%; border-radius: 50%;
border: 2px solid #d23a29;
color: #d23a29;
} }
.calendar_box_other_gray { .calendar_box_other_gray {
color: #333333; color: #333333;
...@@ -98,18 +98,18 @@ ...@@ -98,18 +98,18 @@
} }
.calendar_today_pot { .calendar_today_pot {
display: block; display: block;
margin: 0.02rem auto; margin: 0.1rem auto;
width: 0.08rem; width: 0.1rem;
height: 0.08rem; height: 0.1rem;
background: #4285f4; background: #d23a29;
border-radius: 50%; border-radius: 50%;
} }
.calendar_pot { .calendar_pot {
display: block; display: block;
margin: 0.02rem auto; margin: 0.1rem auto;
width: 0.08rem; width: 0.1rem;
height: 0.08rem; height: 0.1rem;
background: #4285f4; background: #d23a29;
opacity: 0.5; opacity: 0.5;
border-radius: 50%; border-radius: 50%;
} }
......
src/components/menutrain/TaskCalendar/style/index.less
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
} }
.calendar_box_click_blue { .calendar_box_click_blue {
background: linear-gradient(135deg, rgba(54, 102, 166, 1) 0%, rgba(69, 79, 94, 1) 100%);
color: rgba(255, 255, 255, 1);
border-radius: 50%; border-radius: 50%;
border: 2px solid #d23a29;
color: #d23a29;
} }
.calendar_box_other_gray { .calendar_box_other_gray {
...@@ -114,19 +114,19 @@ ...@@ -114,19 +114,19 @@
.calendar_today_pot { .calendar_today_pot {
display: block; display: block;
margin: 0.02rem auto; margin: 0.1rem auto;
width: 0.08rem; width: 0.1rem;
height: 0.08rem; height: 0.1rem;
background: rgba(66, 133, 244, 1); background: #d23a29;
border-radius: 50%; border-radius: 50%;
} }
.calendar_pot { .calendar_pot {
display: block; display: block;
margin: 0.02rem auto; margin: 0.1rem auto;
width: 0.08rem; width: 0.1rem;
height: 0.08rem; height: 0.1rem;
background: rgba(66, 133, 244, 1); background: #d23a29;
opacity: 0.5; opacity: 0.5;
border-radius: 50%; border-radius: 50%;
} }
......
src/components/menutrain/style.css
...@@ -10,35 +10,31 @@ ...@@ -10,35 +10,31 @@
} }
.news-classify-list-container { .news-classify-list-container {
width: 100%; width: 100%;
height: 88px; height: 90px;
position: sticky;
background-color: #fff; background-color: #fff;
left: 0;
top: 0;
z-index: 9;
overflow-y: hidden; overflow-y: hidden;
overflow-x: auto; overflow-x: auto;
} }
.news-classify-list-container .news-classify-list-container-bg { .news-classify-list-container .news-classify-list-container-bg {
width: 100%; width: 100%;
height: 88px; height: 90px;
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
background-color: #D23A29; background-color: #d23a29;
z-index: 1; z-index: 1;
} }
.news-classify-list-container .news-classify-list-scroll-container { .news-classify-list-container .news-classify-list-scroll-container {
width: max-content; width: max-content;
height: 88px; height: 90px;
position: relative; position: relative;
z-index: 2; z-index: 2;
padding: 0 10px; padding: 0 10px;
} }
.news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container { .news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container {
max-width: 324px; max-width: 364px;
height: 88px; height: 90px;
line-height: 88px; line-height: 90px;
text-align: center; text-align: center;
margin: 0 25px; margin: 0 25px;
display: inline-block; display: inline-block;
...@@ -46,14 +42,18 @@ ...@@ -46,14 +42,18 @@
font-size: 32px; font-size: 32px;
color: #fff; color: #fff;
font-weight: 400; font-weight: 400;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-break: break-all;
} }
.news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container span { .news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container span {
border-bottom: 4px solid #fff;
padding-bottom: 12px; padding-bottom: 12px;
font-size: 36px;
}
.news-classify-list-container .news-classify-list-scroll-container .news-classify-item-container .active {
width: 65%;
margin: 0 auto;
margin-top: -13px;
height: 5px;
background-color: #fff;
border-radius: 5px;
} }
.news-classify-list-container .news-third-classify-list-scroll-container { .news-classify-list-container .news-third-classify-list-scroll-container {
width: max-content; width: max-content;
......
src/components/menutrain/style.less
@import "../../static/theme.less"; @import "../../static/theme.less";
.news-banner-carsouel-container { .news-banner-carsouel-container {
width: 100%; width: 100%;
padding: 24px 30px; padding: 24px 30px;
} }
.news-classify-list-container { .news-classify-list-container {
width: 100%;
height: 90px;
background-color: #fff;
overflow-y: hidden;
overflow-x: auto;
.news-classify-list-container-bg {
width: 100%; width: 100%;
height: 88px; height: 90px;
position: sticky; position: absolute;
background-color: #fff;
left: 0; left: 0;
top: 0; top: 0;
z-index: 9; background-color: #d23a29;
overflow-y: hidden; z-index: 1;
overflow-x: auto; }
.news-classify-list-scroll-container {
.news-classify-list-container-bg { width: max-content;
width: 100%; height: 90px;
height: 88px; position: relative;
position: absolute; z-index: 2;
left: 0; padding: 0 10px;
top: 0; .news-classify-item-container {
background-color: #D23A29; max-width: 364px;
z-index: 1; height: 90px;
line-height: 90px;
text-align: center;
margin: 0 25px;
display: inline-block;
vertical-align: middle;
font-size: 32px;
color: #fff;
font-weight: 400;
span {
padding-bottom: 12px;
font-size: 36px;
}
.active {
width: 65%;
margin: 0 auto;
margin-top: -13px;
height: 5px;
background-color: #fff;
border-radius: 5px;
}
} }
.news-classify-list-scroll-container{ }
width: max-content; .news-third-classify-list-scroll-container {
height: 88px; width: max-content;
position: relative; height: 60px;
z-index: 2; position: relative;
padding: 0 10px; z-index: 2;
.news-classify-item-container{ padding: 0 10px;
max-width: 324px; .news-third-classify-item-container {
height: 88px; max-width: 324px;
line-height: 88px; height: 60px;
text-align: center; line-height: 60px;
margin: 0 25px; text-align: center;
display: inline-block; margin: 0 25px;
vertical-align: middle; display: inline-block;
font-size: 32px; vertical-align: middle;
color:#fff; font-size: 30px;
font-weight:400; color: #666;
.singleLineOverflow; font-weight: 400;
span{ .singleLineOverflow;
border-bottom: 4px solid #fff; span {
padding-bottom: 12px; color: @themeColor;
} }
}
}
.news-third-classify-list-scroll-container{
width: max-content;
height: 60px;
position: relative;
z-index: 2;
padding: 0 10px;
.news-third-classify-item-container{
max-width: 324px;
height: 60px;
line-height: 60px;
text-align: center;
margin: 0 25px;
display: inline-block;
vertical-align: middle;
font-size: 30px;
color:#666;
font-weight:400;
.singleLineOverflow;
span{
color: @themeColor;
}
}
} }
}
} }
.news-item-list-container{ .news-item-list-container {
width: 100%; width: 100%;
} }
\ No newline at end of file
src/components/menutrain/trainIndexList/index.jsx
...@@ -3,13 +3,11 @@ import "./style.less"; ...@@ -3,13 +3,11 @@ import "./style.less";
import intl from "react-intl-universal"; import intl from "react-intl-universal";
import { import {
IndexTitle,
IndexModuleBg, IndexModuleBg,
IndexNotMore, IndexNotMore,
} from "../../indexComponent/indexComponent"; } from "../../indexComponent/indexComponent";
import IconfontD from "../../../common/iconfontd"; import peopleIcon from "./people-icon.png";
import TrigleTagComponent from "../../../common/trigleTag"; import timeIcon from "./time-icon.png";
class TrainIndexList extends Component { class TrainIndexList extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
...@@ -40,14 +38,13 @@ class TrainIndexList extends Component { ...@@ -40,14 +38,13 @@ class TrainIndexList extends Component {
if (day < 10) { if (day < 10) {
day = "0" + day; day = "0" + day;
} }
return year + "-" + month + "-" + day; return year + "." + month + "." + day;
}; };
render() { render() {
const { isLoading } = this.props; const { isLoading } = this.props;
return ( return (
<div className="train-index-list-container"> <div className="train-index-list-container">
<IndexTitle title={intl.get("studyActivity")} />
<IndexModuleBg>{this.renderTrainItemByItemList()}</IndexModuleBg> <IndexModuleBg>{this.renderTrainItemByItemList()}</IndexModuleBg>
<div style={{ width: "100%", backgroundColor: "#f5f5f5" }}> <div style={{ width: "100%", backgroundColor: "#f5f5f5" }}>
<IndexNotMore text={isLoading ? intl.get("PublishKey66") : ""} /> <IndexNotMore text={isLoading ? intl.get("PublishKey66") : ""} />
...@@ -61,16 +58,72 @@ export default TrainIndexList; ...@@ -61,16 +58,72 @@ export default TrainIndexList;
const TrainItem = ({ data, onClick }) => { const TrainItem = ({ data, onClick }) => {
return ( return (
<div className="train-index-list-item-container" onClick={onClick}> <div className="train-index-list-item-container" onClick={onClick}>
<img src={data.image} alt="" className="train-index-list-item-image" /> <div style={{ display: "flex", justifyContent: "space-between" }}>
<div style={{ display: "flex", alignItems: "end" }}> <img src={data.image} alt="" className="train-index-list-item-image" />
<div className="train-index-list-item-info" style={{display:'flex',flexDirection:'column',justifyContent:'space-between'}}>
<div className="train-index-list-item-info-name">{data.text}</div> <div
<div className="train-index-list-item-info"
className="train-index-list-item-info-text" style={{
> display: "flex",
<span style={{marginRight:'10px'}}>{data.activityName}</span> {data.trainTimeStr} flexDirection: "column",
justifyContent: "space-between",
}}
>
<div className="train-index-list-item-info-name">
<span
className={
data.activityName == "其他"
? "qt"
: data.activityName == "特色活动"
? "tshd"
: data.activityName == "献计献策"
? "xjxc"
: data.activityName == "支部主题党日"
? "ztdr"
: ""
}
>
{data.activityName}
</span>
{data.text}
</div>
<div className="train-index-list-item-info-text">
<span>
<img style={{ width: "24px" }} src={timeIcon} alt="" />{" "}
{data.trainTimeStr}
</span>
</div> </div>
</div> </div>
</div>
<div
style={{
marginTop: "25px",
paddingTop: "25px",
borderTop: "1px solid #e5e6e8",
display: "flex",
justifyContent: "space-between",
}}
>
<div
style={{
display: "flex",
alignItems: "center",
}}
>
<img
style={{ width: "28px", marginRight: "8px" }}
src={peopleIcon}
alt=""
/>
{data.canNumber != 0 ? (
<span style={{ fontSize: "28px", color: "#9E9E9E" }}>
{data.joinNumber} / {data.canNumber}
</span>
) : (
<span style={{ fontSize: "28px", color: "#9E9E9E" }}>无限制</span>
)}
</div>
<div <div
className={ className={
data.activityStateCode == 4 data.activityStateCode == 4
......
src/components/menutrain/trainIndexList/style.css
...@@ -9,23 +9,17 @@ ...@@ -9,23 +9,17 @@
} }
.train-index-list-container .train-index-list-item-container { .train-index-list-container .train-index-list-item-container {
width: 100%; width: 100%;
height: 160px; padding: 30px;
padding-left: 266px; background-color: #fff;
position: relative; margin-bottom: 25px;
margin-bottom: 32px;
} }
.train-index-list-container .train-index-list-item-container .train-index-list-item-image { .train-index-list-container .train-index-list-item-container .train-index-list-item-image {
width: 266px; width: 220px;
height: 160px; height: 180px;
border-radius: 10px; border-radius: 20px;
position: absolute;
left: 0;
top: 0;
} }
.train-index-list-container .train-index-list-item-container .train-index-list-item-info { .train-index-list-container .train-index-list-item-container .train-index-list-item-info {
width: 100%; width: 66%;
height: 160px;
padding-left: 20px;
} }
.train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-name { .train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-name {
width: 100%; width: 100%;
...@@ -33,41 +27,65 @@ ...@@ -33,41 +27,65 @@
line-height: 40px; line-height: 40px;
font-size: 32px; font-size: 32px;
color: #333; color: #333;
font-weight: 400; font-weight: 500;
overflow: hidden; }
text-overflow: ellipsis; .train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-name .qt {
white-space: nowrap; padding: 8px 20px;
word-break: break-all; background-color: #e7f7e8;
margin-right: 10px;
color: #53af5c;
font-size: 24px;
}
.train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-name .tshd {
padding: 8px 20px;
background-color: #fff5ed;
margin-right: 10px;
color: #f5912a;
font-size: 24px;
}
.train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-name .xjxc {
padding: 8px 20px;
background-color: #fef5ff;
margin-right: 10px;
color: #e943ff;
font-size: 24px;
}
.train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-name .ztdr {
padding: 8px 20px;
background-color: #ffebeb;
margin-right: 10px;
color: #e65858;
font-size: 24px;
} }
.train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-text { .train-index-list-container .train-index-list-item-container .train-index-list-item-info .train-index-list-item-info-text {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%; width: 100%;
height: 32px; height: 40px;
line-height: 32px; line-height: 40px;
font-size: 24px; font-size: 24px;
color: #999; color: #999;
font-weight: 400; font-weight: 400;
margin-top: 24px; margin-top: 24px;
} }
.train-index-list-container .train-index-list-item-container .train-status { .train-index-list-container .train-index-list-item-container .train-status {
width: 150px;
border-radius: 50px; border-radius: 50px;
padding: 5px 15px; padding: 8px 30px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
} }
.train-index-list-container .train-index-list-item-container .train-enroll-status { .train-index-list-container .train-index-list-item-container .train-enroll-status {
width: 160px;
border-radius: 50px; border-radius: 50px;
padding: 5px 15px; padding: 8px 30px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
border: 1px solid #d23a29; border: 1px solid #d23a29;
color: #d23a29; color: #d23a29;
} }
.train-index-list-container .train-index-list-item-container .train-sign-status { .train-index-list-container .train-index-list-item-container .train-sign-status {
width: 160px;
border-radius: 50px; border-radius: 50px;
padding: 5px 15px; padding: 8px 30px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
background: linear-gradient(90deg, #d23a29, #eb6c53 100%); background: linear-gradient(90deg, #d23a29, #eb6c53 100%);
......
src/components/menutrain/trainIndexList/style.less
...@@ -3,35 +3,59 @@ ...@@ -3,35 +3,59 @@
width: 100%; width: 100%;
.train-index-list-item-container { .train-index-list-item-container {
width: 100%; width: 100%;
height: 160px; padding: 30px;
padding-left: 266px; background-color: #fff;
position: relative; margin-bottom: 25px;
margin-bottom: 32px;
.train-index-list-item-image { .train-index-list-item-image {
width: 266px; width: 220px;
height: 160px; height: 180px;
border-radius: 10px; border-radius: 20px;
position: absolute;
left: 0;
top: 0;
} }
.train-index-list-item-info { .train-index-list-item-info {
width: 100%; width: 66%;
height: 160px;
padding-left: 20px;
.train-index-list-item-info-name { .train-index-list-item-info-name {
width: 100%; width: 100%;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
font-size: 32px; font-size: 32px;
color: #333; color: #333;
font-weight: 400; font-weight: 500;
.singleLineOverflow; .qt {
padding: 8px 20px;
background-color: #e7f7e8;
margin-right: 10px;
color: #53af5c;
font-size: 24px;
}
.tshd {
padding: 8px 20px;
background-color: #fff5ed;
margin-right: 10px;
color: #f5912a;
font-size: 24px;
}
.xjxc {
padding: 8px 20px;
background-color: #fef5ff;
margin-right: 10px;
color: #e943ff;
font-size: 24px;
}
.ztdr {
padding: 8px 20px;
background-color: #ffebeb;
margin-right: 10px;
color: #e65858;
font-size: 24px;
}
} }
.train-index-list-item-info-text { .train-index-list-item-info-text {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%; width: 100%;
height: 32px; height: 40px;
line-height: 32px; line-height: 40px;
font-size: 24px; font-size: 24px;
color: #999; color: #999;
font-weight: 400; font-weight: 400;
...@@ -39,25 +63,22 @@ ...@@ -39,25 +63,22 @@
} }
} }
.train-status { .train-status {
width: 150px;
border-radius: 50px; border-radius: 50px;
padding: 5px 15px; padding: 8px 30px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
} }
.train-enroll-status { .train-enroll-status {
width: 160px;
border-radius: 50px; border-radius: 50px;
padding: 5px 15px; padding: 8px 30px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
border: 1px solid #d23a29; border: 1px solid #d23a29;
color: #d23a29; color: #d23a29;
} }
.train-sign-status { .train-sign-status {
width: 160px;
border-radius: 50px; border-radius: 50px;
padding: 5px 15px; padding: 8px 30px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
background: linear-gradient(90deg, #d23a29, #eb6c53 100%); background: linear-gradient(90deg, #d23a29, #eb6c53 100%);
...@@ -69,8 +90,8 @@ ...@@ -69,8 +90,8 @@
padding: 5px 15px; padding: 5px 15px;
font-size: 30px; font-size: 30px;
text-align: center; text-align: center;
background: #f2f2f4; background: #f2f2f4;
color: #999; color: #999;
} }
} }
} }
src/components/nav/less/nav.css
...@@ -5,9 +5,12 @@ ...@@ -5,9 +5,12 @@
right: -9px; right: -9px;
} }
#hometitle .am-search-input { #hometitle .am-search-input {
background-color: #f5f5f5; background: #Eb7568;
border-radius: 56px; border-radius: 56px;
} }
#hometitle .am-search-input .am-search-value::placeholder {
color: #fff !important;
}
#example .am-search-input .am-search-synthetic-ph { #example .am-search-input .am-search-synthetic-ph {
text-align: left; text-align: left;
margin-left: 20px; margin-left: 20px;
...@@ -20,7 +23,7 @@ ...@@ -20,7 +23,7 @@
align-items: center; align-items: center;
} }
.menuhomeNav .am-search { .menuhomeNav .am-search {
background-color: #fff; background-color: #Eb7568;
border-radius: 45px; border-radius: 45px;
height: 70px !important; height: 70px !important;
line-height: 70px !important; line-height: 70px !important;
......
src/components/nav/less/nav.less
...@@ -7,8 +7,11 @@ ...@@ -7,8 +7,11 @@
} }
.am-search-input { .am-search-input {
background-color: #f5f5f5; background: #Eb7568;
border-radius: 56px; border-radius: 56px;
.am-search-value::placeholder{
color: #fff !important;
}
} }
} }
#example .am-search-input .am-search-synthetic-ph { #example .am-search-input .am-search-synthetic-ph {
...@@ -22,9 +25,10 @@ ...@@ -22,9 +25,10 @@
display: flex; display: flex;
align-items: center; align-items: center;
.am-search { .am-search {
background-color: #fff; background-color: #Eb7568;
border-radius: 45px; border-radius: 45px;
height: 70px !important; height: 70px !important;
line-height: 70px !important; line-height: 70px !important;
} }
} }
src/components/nav/menuCourseNav.jsx
...@@ -57,7 +57,7 @@ class mehomeNav extends React.Component { ...@@ -57,7 +57,7 @@ class mehomeNav extends React.Component {
type:"course" type:"course"
} }
})} > })} >
<SearchBar placeholder={intl.get('Search')||"搜索"} <SearchBar placeholder='搜索'
style={{ width: "100%", float: 'left', marginLeft: ".1rem",paddingRight:100 }} /> style={{ width: "100%", float: 'left', marginLeft: ".1rem",paddingRight:100 }} />
</div> </div>
<span style={{ <span style={{
......
src/components/nav/menuhomeNav.jsx
...@@ -130,11 +130,11 @@ class mehomeNav extends React.Component { ...@@ -130,11 +130,11 @@ class mehomeNav extends React.Component {
// }); // });
// } // }
// } // }
// closeSignResultModal() { // closeSignResultModal() {
// this.setState({ // this.setState({
// signResultVisible: false, // signResultVisible: false,
// }); // });
// } // }
render() { render() {
return ( return (
...@@ -150,7 +150,12 @@ class mehomeNav extends React.Component { ...@@ -150,7 +150,12 @@ class mehomeNav extends React.Component {
> >
<div id="hometitle" iconname={""} className="menuhomeNav"> <div id="hometitle" iconname={""} className="menuhomeNav">
<div <div
style={{ width: "25%", fontSize: "36px", marginRight: "20px",paddingLeft:'40px' }} style={{
width: "25%",
fontSize: "36px",
marginRight: "20px",
paddingLeft: "20px",
}}
> >
智慧党建 智慧党建
</div> </div>
...@@ -163,36 +168,7 @@ class mehomeNav extends React.Component { ...@@ -163,36 +168,7 @@ class mehomeNav extends React.Component {
maxLength={8} maxLength={8}
/> />
</div> </div>
{/* <div
style={{
textAlign: "center",
width: "10%",
alignSelf: "center",
marginRight: ".2rem",
}}
onClick={() =>
hashHistory.push(func.routerBefore() + "/sendmessage")
}
>
{this.state.noreadCount == 0 ||
isNaN(parseInt(this.state.noreadCount)) ? (
<Badge>
<img style={{ width: 50, height: 50 }} src={xiaoxi} />
</Badge>
) : (
<Badge dot>
<img style={{ width: 50, height: 50 }} src={xiaoxi} />
</Badge>
)}
</div> */}
</div> </div>
{/* <SignResultModal
visible={this.state.signResultVisible}
status={this.state.signResultCode}
reasonFromApi={this.state.reasonFromApi}
closeSignResultModal={this.closeSignResultModal}
/> */}
</div> </div>
<div style={{ width: "100%", height: 90 }}></div> <div style={{ width: "100%", height: 90 }}></div>
</Fragment> </Fragment>
......
src/components/newsMessage/NewsMessageResult.css
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
color: blue; color: blue;
} }
.train-info .train-info-contain p { .train-info .train-info-contain p {
font-size: 24px !important; font-size: 32px !important;
padding: 0 !important; padding: 0 !important;
color: #4A4A4A !important; color: #4A4A4A !important;
} }
......
src/components/newsMessage/NewsMessageResult.less
...@@ -623,7 +623,7 @@ ...@@ -623,7 +623,7 @@
} }
p { p {
font-size: 24px !important; font-size: 32px !important;
padding: 0 !important; padding: 0 !important;
color: #4A4A4A !important; color: #4A4A4A !important;
} }
......
src/index.less
...@@ -1544,8 +1544,8 @@ p { ...@@ -1544,8 +1544,8 @@ p {
.am-button-primary { .am-button-primary {
color: #fff; color: #fff;
background-color: #108ee9; background-color: #EB6C53;
border: 1PX solid #108ee9; border: 1PX solid #EB6C53;
} }
.am-button-primary.am-button-active { .am-button-primary.am-button-active {
......
src/main.js
...@@ -168,6 +168,10 @@ const DataPreView = LazyLoad(() => ...@@ -168,6 +168,10 @@ const DataPreView = LazyLoad(() =>
import('./components/common/dataPreView/index') import('./components/common/dataPreView/index')
) )
//详情中转页面
const AllDescribe = LazyLoad(() =>
import('./components/AllDescribe/index')
)
const MediaPreview = LazyLoad(() => const MediaPreview = LazyLoad(() =>
import('./common/preview/preview') import('./common/preview/preview')
...@@ -342,6 +346,8 @@ class AppRouter extends React.Component { ...@@ -342,6 +346,8 @@ class AppRouter extends React.Component {
<Route path="/*/*/dataView" component={DataPreView} /> <Route path="/*/*/dataView" component={DataPreView} />
<Route path="/*/*/mediapreview" component={MediaPreview} /> <Route path="/*/*/mediapreview" component={MediaPreview} />
{/* 详情中转页面 AllDescribe*/}
<Route path="/*/*/allDescribe" component={AllDescribe} />
{/*empty*/} {/*empty*/}
<Route path="/*/*/empty" component={Empty} /> <Route path="/*/*/empty" component={Empty} />
......
src/static/icon/demo_index 2.html deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/util/urlconfig.js
...@@ -441,5 +441,7 @@ const url = { ...@@ -441,5 +441,7 @@ const url = {
practiceStartSave: `${baseUrl}${CHATPRACTICE}student/chat/start/practice/save`, //陪练开始,新增一条陪练记录 practiceStartSave: `${baseUrl}${CHATPRACTICE}student/chat/start/practice/save`, //陪练开始,新增一条陪练记录
practiceChatEnd: `${baseUrl}${CHATPRACTICE}student/chat/end/save`, //陪练，获取结果评分 practiceChatEnd: `${baseUrl}${CHATPRACTICE}student/chat/end/save`, //陪练，获取结果评分
practiceTabIndex: `${baseUrl}${CHATPRACTICE}student/practice/list/tab/index/get`, //陪练列表，默认显示哪个tab(未开始,进行中,已结束) practiceTabIndex: `${baseUrl}${CHATPRACTICE}student/practice/list/tab/index/get`, //陪练列表，默认显示哪个tab(未开始,进行中,已结束)
//进入详情页面
allDescribeUrl:`${baseUrl}${WEBSTUDENT}api/research/details`,
}; };
export default url; export default url;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment