Skip to content

S
saas-weichat
Commit 92a20ec6 by yanglang123
Options

修改代码

parent bcffe1a2
Showing with 87 additions and 74 deletions
src/components/Training/TrainingSteps/TrainingSteps.jsx
...@@ -483,7 +483,7 @@ class TrainingSteps extends Component { ...@@ -483,7 +483,7 @@ class TrainingSteps extends Component {
!introductionVo.description.trim() ? null : ( !introductionVo.description.trim() ? null : (
<div> <div>
<div className="product-info-view"> <div className="product-info-view">
<div className="train-info-view"> <div className="train-info-view" style={{borderRadius:'12px'}}>
<div <div
style={{ style={{
marginBottom: "20px", marginBottom: "20px",
...@@ -571,7 +571,7 @@ class TrainingSteps extends Component { ...@@ -571,7 +571,7 @@ class TrainingSteps extends Component {
</p> </p>
<div <div
style={{ style={{
fontSize: "26px", fontSize: "28px",
paddingLeft: "40px", paddingLeft: "40px",
color: "#659EFE", color: "#659EFE",
textDecoration: "underline", textDecoration: "underline",
......
src/components/exam/MyExam.jsx
...@@ -164,7 +164,6 @@ class MyExam extends Component { ...@@ -164,7 +164,6 @@ class MyExam extends Component {
}; };
render() { render() {
const { my, test } = this.props.location.query; const { my, test } = this.props.location.query;
console.log(my, test, "1111111112222222");
const tabsData = [ const tabsData = [
{ {
key: "1", key: "1",
...@@ -186,7 +185,6 @@ class MyExam extends Component { ...@@ -186,7 +185,6 @@ class MyExam extends Component {
swipeable={false} swipeable={false}
onChange={(event) => this.tabsChange(event)} onChange={(event) => this.tabsChange(event)}
tabs={tabsData} tabs={tabsData}
// renderTabBar={(props) => this.renderTabBar(props)}
className="my-exam-tab-container" className="my-exam-tab-container"
> >
{this.renderContent} {this.renderContent}
...@@ -218,7 +216,7 @@ class MyExam extends Component { ...@@ -218,7 +216,7 @@ class MyExam extends Component {
className="examItem" className="examItem"
onClick={() => this.listItemClick(item, key)} onClick={() => this.listItemClick(item, key)}
> >
<p className="exam-title">{item.name}</p> <p className="exam-title" style={{fontSize:'34px'}}>{item.name}</p>
<p className="exam-time"> <p className="exam-time">
{`${moment(item.startTime).format("YYYY-MM-DD")} ${"-"} ${moment( {`${moment(item.startTime).format("YYYY-MM-DD")} ${"-"} ${moment(
item.endTime item.endTime
......
src/components/exam/less/myexam.css
...@@ -4,6 +4,15 @@ ...@@ -4,6 +4,15 @@
.myExamBody .am-list-body::after { .myExamBody .am-list-body::after {
height: 0 !important; height: 0 !important;
} }
.myExamBody .am-tabs-default-bar-content {
background: linear-gradient(270deg, #ee4e3c 0%, #d23a29);
color: #fff;
}
.myExamBody .am-tabs-default-bar-content .am-tabs-default-bar-tab-active {
border-bottom: 1px solid red !important;
color: #fff;
font-weight: bold;
}
.list-view-header { .list-view-header {
width: 96%; width: 96%;
margin: 0 auto; margin: 0 auto;
......
src/components/exam/less/myexam.less
...@@ -6,27 +6,36 @@ ...@@ -6,27 +6,36 @@
.am-list-body::after { .am-list-body::after {
height: 0 !important; height: 0 !important;
} }
.am-tabs-default-bar-content {
background: linear-gradient(270deg, #ee4e3c 0%, #d23a29);
color: #fff;
.am-tabs-default-bar-tab-active {
border-bottom: 1px solid red !important;
color: #fff;
font-weight: bold;
}
}
} }
.list-view-header{ .list-view-header {
width:96%; width: 96%;
margin: 0 auto; margin: 0 auto;
margin-bottom: 20px; margin-bottom: 20px;
.list-view-bg{ .list-view-bg {
width: 100%; width: 100%;
height: 4rem; height: 4rem;
} }
h3{ h3 {
color:#4a4a4a; color: #4a4a4a;
margin: 15px 0; margin: 15px 0;
} }
.list-view-header-cont{ .list-view-header-cont {
display: flex; display: flex;
align-items: center; align-items: center;
img{ img {
width: 28px; width: 28px;
height: 28px; height: 28px;
} }
p{ p {
font-size: 30px; font-size: 30px;
margin-right: 20px; margin-right: 20px;
} }
......
src/components/indexComponent/indexComponent/index.jsx
...@@ -258,11 +258,7 @@ const IndexNewsItem = ({ data, onClick }) => { ...@@ -258,11 +258,7 @@ const IndexNewsItem = ({ data, onClick }) => {
className="index-module-news-item-info-icon" className="index-module-news-item-info-icon"
/> />
{func.dateFormat(data.releaseTime, false, true)} {func.dateFormat(data.releaseTime, false, true)}
<Icon
type="eye"
style={{ fontSize: 24, marginRight: 10, marginLeft: 60 }}
/>
{data.number}
</div> </div>
</div> </div>
</div> </div>
......
src/components/menulearn/menulearn.jsx
...@@ -402,7 +402,7 @@ class Menulearn extends React.Component { ...@@ -402,7 +402,7 @@ class Menulearn extends React.Component {
{/* 新消息icon */} {/* 新消息icon */}
<div style={{ <div style={{
position:'fixed', position:'fixed',
top:'50%', top:'55%',
right:'0' right:'0'
}}> }}>
<img style={{width:'180px'}} src={MessageIcon} alt="" /> <img style={{width:'180px'}} src={MessageIcon} alt="" />
......
src/components/menume/image/menumeBg.png
src/components/menume/image/menumeBg.png

35.1 KB | W: | H:

src/components/menume/image/menumeBg.png

65.4 KB | W: | H:

src/components/menume/image/menumeBg.png
src/components/menume/image/menumeBg.png
src/components/menume/image/menumeBg.png
src/components/menume/image/menumeBg.png
  • 2-up
  • Swipe
  • Onion skin
src/components/menume/menume.css
...@@ -9,16 +9,15 @@ ...@@ -9,16 +9,15 @@
background: #f7f7f7; background: #f7f7f7;
} }
.my-menu-body .header-info-box { .my-menu-body .header-info-box {
padding: 16px 30px;
background: linear-gradient(180deg, #f8f8f8 0%, #f8f8f8 32%, #ffffff 39%, #ffffff 100%);
}
.my-menu-body .header-info-box .personal-info-main {
background: url("image/menumeBg.png") no-repeat; background: url("image/menumeBg.png") no-repeat;
background-size: 100%; background-size: 100%;
box-shadow: 0px 2px 12px 2px rgba(0, 0, 0, 0.1); background-repeat: no-repeat;
margin-bottom: 100px;
}
.my-menu-body .header-info-box .personal-info-main {
border-radius: 10px; border-radius: 10px;
height: 300px; height: 240px;
padding: 34px 30px; padding: 40px 30px;
position: relative; position: relative;
} }
.my-menu-body .header-info-box .personal-info-main .playcard-entry { .my-menu-body .header-info-box .personal-info-main .playcard-entry {
...@@ -134,7 +133,7 @@ ...@@ -134,7 +133,7 @@
background: #ffffff; background: #ffffff;
box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.1);
position: relative; position: relative;
top: -40px; top: 65px;
} }
.my-menu-body .header-info-box .study-record-info .study-item { .my-menu-body .header-info-box .study-record-info .study-item {
width: 90%; width: 90%;
...@@ -175,8 +174,8 @@ ...@@ -175,8 +174,8 @@
margin: 28px 0; margin: 28px 0;
} }
.my-menu-body .list-box .list-item .item-img { .my-menu-body .list-box .list-item .item-img {
width: 100px; width: 88px;
height: 100px; height: 88px;
} }
.my-menu-body .list-box .list-item .item-name { .my-menu-body .list-box .list-item .item-name {
color: #333; color: #333;
......
src/components/menume/menume.jsx
...@@ -320,7 +320,6 @@ class Menume extends React.Component { ...@@ -320,7 +320,6 @@ class Menume extends React.Component {
quantity = item.quantity; quantity = item.quantity;
} }
}); });
console.log("this.state==", myWallet, reMylistData);
return ( return (
<div className="my-menu-body"> <div className="my-menu-body">
......
src/components/menume/menume.less
...@@ -5,22 +5,14 @@ ...@@ -5,22 +5,14 @@
background: rgba(247, 247, 247, 1); background: rgba(247, 247, 247, 1);
.header-info-box { .header-info-box {
padding: 16px 30px;
background: linear-gradient(
180deg,
rgba(248, 248, 248, 1) 0%,
rgba(248, 248, 248, 1) 32%,
rgba(255, 255, 255, 1) 39%,
rgba(255, 255, 255, 1) 100%
);
.personal-info-main {
background: url("./image/menumeBg.png") no-repeat; background: url("./image/menumeBg.png") no-repeat;
background-size: 100%; background-size: 100%;
box-shadow: 0px 2px 12px 2px rgba(0, 0, 0, 0.1); background-repeat: no-repeat;
margin-bottom: 100px;
.personal-info-main {
border-radius: 10px; border-radius: 10px;
height: 300px; height: 240px;
padding: 34px 30px; padding: 40px 30px;
position: relative; position: relative;
.playcard-entry { .playcard-entry {
...@@ -156,7 +148,7 @@ ...@@ -156,7 +148,7 @@
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.1);
position: relative; position: relative;
top: -40px; top: 65px;
.study-item { .study-item {
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
...@@ -196,8 +188,8 @@ ...@@ -196,8 +188,8 @@
align-items: center; align-items: center;
margin: 28px 0; margin: 28px 0;
.item-img { .item-img {
width: 100px; width: 88px;
height: 100px; height: 88px;
} }
.item-name { .item-name {
color: #333; color: #333;
......
src/components/mycontribute/index.jsx
...@@ -51,7 +51,9 @@ class Mycontribute extends Component { ...@@ -51,7 +51,9 @@ class Mycontribute extends Component {
<div className="mycontribute-box"> <div className="mycontribute-box">
{mapList.map((item) => { {mapList.map((item) => {
return ( return (
<div className="item-box"> <div className="item-box" onClick={() => {
this.handleSumbit(voteNum, oldVoteNum);
}}>
<div className="item-name">{item.name}</div> <div className="item-name">{item.name}</div>
</div> </div>
); );
......
src/components/mysurvey/list.jsx
...@@ -133,7 +133,7 @@ class list extends Component { ...@@ -133,7 +133,7 @@ class list extends Component {
}} }}
> >
<p className="exam-title" style={{paddingTop:'20px'}}>{item.name}</p> <p className="exam-title" style={{paddingTop:'20px'}}>{item.name}</p>
<p {/* <p
className={ className={
item.finishState == "0" || item.finishState == "3" item.finishState == "0" || item.finishState == "3"
? "exam-over" ? "exam-over"
...@@ -153,7 +153,8 @@ class list extends Component { ...@@ -153,7 +153,8 @@ class list extends Component {
: item.finishState == "4" : item.finishState == "4"
? "参与调查" ? "参与调查"
: ""} : ""}
</p> </p> */}
<p className="exam-start">进行中</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -200,23 +201,28 @@ class list extends Component { ...@@ -200,23 +201,28 @@ class list extends Component {
} }
}; };
listItemClick = (item) => { listItemClick = (item) => {
if (item.finishState != 3 || item.finishState != 0) {
if (item.finishState == 1) {
if (item.finishTime) {
hashHistory.push({ hashHistory.push({
pathname: func.routerBefore() + "/SurveyAnswer", pathname: func.routerBefore() + "/allDescribe",
//pathname: func.routerBefore() + '/SurveyDetails',
query: { id: item.id, answerId: item.answerId },
});
}
} else {
hashHistory.push({
pathname: func.routerBefore() + "/SurveyDetails",
// pathname:func.routerBefore()+'/InvestigateFinish', // pathname:func.routerBefore()+'/InvestigateFinish',
query: { id: item.id }, query: { id: item.id,type:'投票' },
}); });
} // if (item.finishState != 3 || item.finishState != 0) {
} // if (item.finishState == 1) {
// if (item.finishTime) {
// hashHistory.push({
// pathname: func.routerBefore() + "/SurveyAnswer",
// //pathname: func.routerBefore() + '/SurveyDetails',
// query: { id: item.id, answerId: item.answerId },
// });
// }
// } else {
// hashHistory.push({
// pathname: func.routerBefore() + "/allDescribe",
// // pathname:func.routerBefore()+'/InvestigateFinish',
// query: { id: item.id,type:'投票' },
// });
// }
// }
}; };
} }
export default connect((state) => { export default connect((state) => {
......
src/components/newsMessage/NewsMessageResult.less
...@@ -560,7 +560,6 @@ ...@@ -560,7 +560,6 @@
padding: 0.22rem 0.3rem; padding: 0.22rem 0.3rem;
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
p { p {
line-height: .46rem; line-height: .46rem;
.line-hidden; .line-hidden;
......
src/components/vote/index.jsx
...@@ -109,9 +109,9 @@ class Vote extends Component { ...@@ -109,9 +109,9 @@ class Vote extends Component {
> >
{item.actived ? "投票" : "已投票"} {item.actived ? "投票" : "已投票"}
</div> </div>
<div className="score"> {/* <div className="score">
{item.score} {item.score}
</div> </div> */}
<Modal <Modal
title="" title=""
visible={this.state.modalStatu} visible={this.state.modalStatu}
......
src/components/vote/style.css
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
padding-bottom: 40px;
} }
.vote-out .vote-box .vote-top { .vote-out .vote-box .vote-top {
width: 45%; width: 45%;
...@@ -135,14 +136,15 @@ ...@@ -135,14 +136,15 @@
background: linear-gradient(270deg, #eb6c53, #d23a29); background: linear-gradient(270deg, #eb6c53, #d23a29);
} }
.vote-out .sumbit-btn { .vote-out .sumbit-btn {
width: 92%; width: 100%;
margin: 0 auto;
text-align: center; text-align: center;
padding: 20px 0; padding: 20px 0;
background: linear-gradient(270deg, #eb6c53 0%, #d23a29); background: linear-gradient(270deg, #eb6c53 0%, #d23a29);
border-radius: 5px; border-radius: 5px;
color: #fff; color: #fff;
font-size: 36px; font-size: 36px;
position: fixed;
bottom: 0px;
} }
.vote-out .detail-box { .vote-out .detail-box {
width: 90%; width: 90%;
......
src/components/vote/style.less
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
padding-bottom: 40px;
.vote-top { .vote-top {
width: 45%; width: 45%;
height: 480px; height: 480px;
...@@ -143,14 +144,15 @@ ...@@ -143,14 +144,15 @@
} }
} }
.sumbit-btn { .sumbit-btn {
width: 92%; width: 100%;
margin: 0 auto;
text-align: center; text-align: center;
padding: 20px 0; padding: 20px 0;
background: linear-gradient(270deg, #eb6c53 0%, #d23a29); background: linear-gradient(270deg, #eb6c53 0%, #d23a29);
border-radius: 5px; border-radius: 5px;
color: #fff; color: #fff;
font-size: 36px; font-size: 36px;
position:fixed;
bottom: 0px;
} }
//详情 //详情
......
src/components/vote/theCharts.jsx
...@@ -197,16 +197,16 @@ class TheCharts extends Component { ...@@ -197,16 +197,16 @@ class TheCharts extends Component {
<div className="detail-content"> <div className="detail-content">
<span <span
className={ className={
keywords2 == "精石之美" item.keywords == "精石之美"
? "cont-icon1" ? "cont-icon1"
: keywords2 == "突破之美" : item.keywords == "突破之美"
? "cont-icon2" ? "cont-icon2"
: keywords2 == "进取之美" : item.keywords == "进取之美"
? "cont-icon3" ? "cont-icon3"
: "cont-icon4" : "cont-icon4"
} }
> >
{keywords2} {item.keywords}
</span> </span>
</div> </div>
</div> </div>
......
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