Skip to content

M
mr-julyedu
Commit 6c1d62be by dazhou
Options

resolve conflict

parent 2cbf5e70
Showing with 82 additions and 63 deletions
build/mrstaticjs/2.a170db71.chunk.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/detail.722ff7cb.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/detail.722ff7cb.chunk.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/main.4253cbf4.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/main.4253cbf4.chunk.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstaticjs/treasure-box-home.4ca21867.chunk.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Index/course-list/index.js
......@@ -45,9 +45,13 @@ const Module = function CourseList({ module, toDetail }) {
return (
<div className="category home-course-list">
{module.name !== "双11秒杀课"?<h2 className="title">
{module.name}
</h2>:(<h2 className="bq"><img className="hot2" src={require('./../image/11.png')} alt=""/></h2>)}
{module.name !== "双11秒杀课" ? (
<h2 className="title">{module.name}</h2>
) : (
<h2 className="bq">
<img className="hot2" src={require("./../image/11.png")} alt="" />
</h2>
)}
{module.name === "限时免费" && <span className={"hot"}>hot</span>}
{module.show_more === 1 && (
......@@ -67,7 +71,7 @@ const Module = function CourseList({ module, toDetail }) {
</Link>
)
) : null}
{module.name==="初级入门课"?(
{module.name === "初级入门课" ? (
<ul className="index-course-detail">
{module.name !== "限时免费" &&
!isOdd &&
......@@ -120,18 +124,26 @@ const Module = function CourseList({ module, toDetail }) {
})}
<div className="vip">
<Link to={"/vip/newvip"}>
<img src="https://julyedu-img.oss-cn-beijing.aliyuncs.com/huiyuanganggaowei.png" alt=""/>
<img
src="https://julyedu-img.oss-cn-beijing.aliyuncs.com/huiyuanganggaowei.png"
alt=""
/>
</Link>
<a href="http://q.url.cn/s/Vbkup6m?_type=wpa" className="consult" target="_blank">
<img className="govip" src={require('./../image/kt.png')} alt=""/>
<a
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
className="consult"
target="_blank"
>
<img
className="govip"
src={require("./../image/kt.png")}
alt=""
/>
</a>
</div>
</ul>
):(<ul className="index-course-detail">
) : (
<ul className="index-course-detail">
{module.name !== "限时免费" &&
!isOdd &&
module.list[0].course_img !== module.list[0].course_img_small && (
......@@ -182,10 +194,7 @@ const Module = function CourseList({ module, toDetail }) {
)
})}
</ul>
)
}
)}
{/* <LazyLoad offset={50}> */}
{/* </LazyLoad> */}
......@@ -222,7 +231,7 @@ function LimitFree({ course }) {
}
//课程底部
function Bottom({ course,course1 }) {
function Bottom({ course, course1 }) {
if (course.is_buy) {
if (course.is_limit_free && course.limit_free_status === 1) {
return <div className={"isbuy"}>已领取</div>
......@@ -239,13 +248,13 @@ function Bottom({ course,course1 }) {
<span className="new">特惠价：¥{course.discounts_price}</span>
<span className="old">¥{course.price}</span>
</p>
) :<p className="course-price">
) : (
<p className="course-price">
<span className="new">¥{course.discounts_price}</span>
<span className="old">¥{course.price}</span>
</p>}
</p>
)}
</div>
)
}
}
......
src/components/Index/index.js
......@@ -238,7 +238,7 @@ class Index extends Component {
<HomeCourseList modules={this.state.modules} />
<TeacherList />
<p className="borderTop" />
{/* <botton className="fix"><a href="http://q.url.cn/s/Vbkup6m?_type=wpa"><span>点击</span><span>咨询</span></a></botton> */}
{/* <botton className="fix"><a href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"><span>点击</span><span>咨询</span></a></botton> */}
<Teaching />
{/* <AllCourseNavigation /> */}
......
src/components/Index/tercher/index.js
......@@ -8,64 +8,72 @@ class TeacherList extends Component {
constructor(props) {
super(props)
this.state = {
data:[],
active: '',
data: [],
active: "",
isToggleOn: false,
liClass1:''
liClass1: "",
}
}
bgChange = index => {
console.log(index,999)
bgChange = (index) => {
console.log(index, 999)
this.setState({
active: index,
});
this.setState(prevState => ({
})
this.setState((prevState) => ({
isToggleOn: !prevState.isToggleOn,
liClass1: prevState.isToggleOn ? '': 'active1'
}));
};
liClass1: prevState.isToggleOn ? "" : "active1",
}))
}
componentDidMount() {
http.get(`${API.home}/m/mobTeachers`).then((res) => {
if (res.data.code === 200) {
this.setState({
data:res.data.data
});
data: res.data.data,
})
} else {
Toast.info(res.data.msg, 2)
}
})
}
render() {
const { active,liClass1,isToggleOn } = this.state;
const { active, liClass1, isToggleOn } = this.state
return (
<div className="teacher">
<p className="cont">超强师资团队</p>
<div className="teabox">
{this.state.data.map((item, i) => {
const liClass = active === i && isToggleOn? 'active1' : '';
const liClass = active === i && isToggleOn ? "active1" : ""
// const liClass1 = isToggleOn ? 'active1' : '';
return <div key={i} className={`tealist ${liClass}`} onClick={() => {
this.bgChange(i);
}}>
return (
<div
key={i}
className={`tealist ${liClass}`}
onClick={() => {
this.bgChange(i)
}}
>
<div className="pic">
<img src={item.thumb_img} alt=""/>
<img src={item.thumb_img} alt="" />
</div>
<div className="detail">
<h2 className="name"><b>{item.teacher_name}</b></h2>
<p><span className="title">{item.title}</span></p>
<h2 className="name">
<b>{item.teacher_name}</b>
</h2>
<p>
<span className="title">{item.title}</span>
</p>
<p className="desc">{item.desc} </p>
</div>
</div>
)
})}
</div>
<div className="consult">
<a href="http://q.url.cn/s/Vbkup6m?_type=wpa">咨询更多师资信息</a>
<a href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372">
咨询更多师资信息
</a>
</div>
</div>
)
......@@ -73,6 +81,3 @@ class TeacherList extends Component {
}
export default TeacherList
src/components/activity/newyear-2019/preheat/YearCourse/index.js
......@@ -236,7 +236,8 @@ class YearCourse extends Component {
toQQque = () => {
if (!getParam("version")) {
window.location.href = "http://q.url.cn/s/Vbkup6m?_type=wpa"
window.location.href =
"https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
} else {
SendMessageToApp("toQQ", "https://q.url.cn/AB8aue?_type=wpa&qidian=true")
}
......
src/components/activity/treasure-box/preheat/YearCourse/index.js
......@@ -233,7 +233,8 @@ class YearCourse extends Component {
toQQque = () => {
if (!getParam("version")) {
window.location.href = "http://q.url.cn/s/Vbkup6m?_type=wpa"
window.location.href =
"https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
} else {
SendMessageToApp("toQQ", "https://q.url.cn/AB8aue?_type=wpa&qidian=true")
}
......
src/components/detail/btnstatus/index.js
......@@ -370,7 +370,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-s"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
......@@ -402,7 +402,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-m"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji" />
<span>课程咨询</span>
......@@ -421,7 +421,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-m"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji" />
<span>课程咨询</span>
......@@ -439,7 +439,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-s"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
......@@ -461,7 +461,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-s"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
......@@ -482,7 +482,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-s"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
......@@ -511,7 +511,10 @@ class BtnStatus extends Component {
{/*特殊课程*/}
{this.state.isbuy === 20 && (
<div className="btns-box">
<a className="consult-l" href="http://q.url.cn/s/Vbkup6m?_type=wpa">
<a
className="consult-l"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
</a>
......@@ -523,7 +526,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-m"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
......@@ -542,7 +545,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-m"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
......@@ -590,7 +593,7 @@ class BtnStatus extends Component {
<div className="btns-box">
<a
className="consult consult-m"
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
>
<i className="iconfont iconerji"></i>
<span>课程咨询</span>
......
src/components/intelligent-recommend/index.js
......@@ -288,7 +288,7 @@ class IntelligentRecommend extends Component {
{item.c_type === 2 && (
<React.Fragment key={item.course_id}>
<a
href="http://q.url.cn/s/Vbkup6m?_type=wpa"
href="https://live.easyliao.com/live/chat.do?c=27526&g=53481&config=81372"
className={"contact"}
onClick={this.consult}
>
......
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