Skip to content

M
mr-julyedu
Commit fe0518b7 by xuzhenghua
Options

旧版app

parents eabfd915 9b06f2b7
Showing with 89 additions and 37 deletions
src/components/activity/invite.js
...@@ -16,6 +16,7 @@ class Invite extends Component { ...@@ -16,6 +16,7 @@ class Invite extends Component {
hot_schedule: '', hot_schedule: '',
userList: [], userList: [],
inviteCode: '', inviteCode: '',
isshowAppTip:false
} }
} }
...@@ -28,8 +29,28 @@ class Invite extends Component { ...@@ -28,8 +29,28 @@ class Invite extends Component {
this.props.history.push(`/activity?shareuid=${shareuid}&inviteCode=${getParam('inviteCode')}`); this.props.history.push(`/activity?shareuid=${shareuid}&inviteCode=${getParam('inviteCode')}`);
} }
} }
this.distinguishVersion()
} }
distinguishVersion = () => {
// plat_form 1ios 2android
// version 1->3.704 2->4.5.1.20191105
if(getParam('plat_form') == 1){
let version = Number(getParam('version'))
this.setState({
isshowAppTip: version < 3.704 ? true : false
});
}
if(getParam('plat_form') == 2){
let version = getParam('version').replace(/\./g, '').slice(0, 3)
this.setState({
isshowAppTip: Number(version) < 451 ? true:false
});
}
}
componentDidMount() { componentDidMount() {
if(!this.props.user.hasError) { if(!this.props.user.hasError) {
this.getUserList(); this.getUserList();
...@@ -100,19 +121,23 @@ class Invite extends Component { ...@@ -100,19 +121,23 @@ class Invite extends Component {
inviteFriends = () => { inviteFriends = () => {
const { user, history } = this.props; const { user, history } = this.props;
const {inviteCode} = this.state; const {inviteCode,isshowAppTip} = this.state;
// 未登录先去登录 // 未登录先去登录
if (getParam('version')) { if (getParam('version')) {
if(user.hasError) { if(user.hasError) {
SendMessageToApp("toLogin"); SendMessageToApp("toLogin");
}else { }else {
let data = { if(isshowAppTip){
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！', Toast.info('请前往h5/pc端使用该功能', 2);
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线', } else {
link: API.m + `/invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`, let data = {
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png', title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
link: API.m + `/invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`,
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
}
SendMessageToApp("toShare", data)
} }
SendMessageToApp("toShare", data)
} }
}else { }else {
if(user.hasError) { if(user.hasError) {
......
src/components/blessingPreheat/ReserveCourse/index.js
...@@ -105,11 +105,7 @@ class ReserveCourse extends Component { ...@@ -105,11 +105,7 @@ class ReserveCourse extends Component {
if (!getParam('version')) { if (!getParam('version')) {
this.props.history.push(`/getDetail?id=${courseId}`) this.props.history.push(`/getDetail?id=${courseId}`)
} else { } else {
let data = { SendMessageToApp("toCourse", courseId);
courseId: courseId,
type: 0 // 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
}
SendMessageToApp("toCourse", data);
} }
} }
// 查看更多 // 查看更多
......
src/components/blessingPreheat/collectBlessing/index.js
...@@ -181,7 +181,7 @@ class CollectBlessing extends Component { ...@@ -181,7 +181,7 @@ class CollectBlessing extends Component {
} }
}else { }else {
if(getParam('version')) { if(getParam('version')) {
history.push('/invite?version=' + getParam('version')) history.push('/invite?version=' + getParam('version') + '&plat_form='+ getParam('plat_form'))
} else { } else {
history.push('/invite') history.push('/invite')
} }
...@@ -264,7 +264,7 @@ class CollectBlessing extends Component { ...@@ -264,7 +264,7 @@ class CollectBlessing extends Component {
</> </>
} }
{ {
index === 1 && index === 1 &&
<> <>
{ {
isFollow === 1 isFollow === 1
......
src/components/blessingPreheat/courseList/index.js
...@@ -301,11 +301,7 @@ class CourseList extends Component { ...@@ -301,11 +301,7 @@ class CourseList extends Component {
if (!getParam('version')) { if (!getParam('version')) {
history.push(`/detail?id=${courseId}`); history.push(`/detail?id=${courseId}`);
} else { } else {
let data = { SendMessageToApp("toCourse", courseId);
courseId: courseId,
type: 0 // 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
};
SendMessageToApp("toCourse", data);
} }
} }
......
src/components/blessingPreheat/coursePopup/index.js
...@@ -8,14 +8,33 @@ class CoursePopup extends Component { ...@@ -8,14 +8,33 @@ class CoursePopup extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
courseList: [] courseList: [],
isshowAppTip:false
}; };
} }
componentDidMount() { componentDidMount() {
this.fetchCourseData(); this.fetchCourseData();
this.distinguishVersion();
} }
distinguishVersion = () => {
// plat_form 1ios 2android
// version 1->3.704 2->4.5.1.20191105
if(getParam('plat_form') == 1){
let version = Number(getParam('version'))
this.setState({
isshowAppTip: version < 3.704 ? true : false
});
}
if(getParam('plat_form') == 2){
let version = getParam('version').replace(/\./g, '').slice(0, 3)
this.setState({
isshowAppTip: Number(version) < 451 ? true:false
});
}
}
fetchCourseData = () => { fetchCourseData = () => {
Promise.all([ Promise.all([
http.get(`${API.home}/sys/browse/blessing/courses`), http.get(`${API.home}/sys/browse/blessing/courses`),
...@@ -41,22 +60,24 @@ class CoursePopup extends Component { ...@@ -41,22 +60,24 @@ class CoursePopup extends Component {
toCourseDetail = (item) => { toCourseDetail = (item) => {
console.log(this.props); console.log(this.props);
const {isLogin, history, toLogin} = this.props; const {isLogin, history, toLogin} = this.props;
// to={`/detail?id=${item.course_id}&ac=11`} // to={`/detail?id=${item.course_id}&ac=11`}
if(isLogin) { if(isLogin) {
if(!getParam('version')) { if(!getParam('version')) {
history.push(`/detail?id=${item.course_id}&ac=11`); history.push(`/detail?id=${item.course_id}&ac=11`);
}else{ }else{
let type = 0;
if(item.blessing) { if(item.blessing) {
type = 2; let data = {
courseId: item.course_id,
type: 2
}
SendMessageToApp("toBlessingCourse", data);
}else{ }else{
type = 1; let data = {
courseId: item.course_id,
type: 1 // 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
}
SendMessageToApp("toBlessingCourse", data);
} }
let data = {
courseId: item.course_id,
type: type // 正常跳课程详情页type:0,积福气浏览课程详情页-没有浏览过type:1 已浏览过type:2
}
SendMessageToApp("toCourse", data);
} }
}else{ }else{
toLogin(); toLogin();
...@@ -64,7 +85,7 @@ class CoursePopup extends Component { ...@@ -64,7 +85,7 @@ class CoursePopup extends Component {
} }
render() { render() {
const { courseList } = this.state; const { courseList,isshowAppTip } = this.state;
const { handleToHide } = this.props; const { handleToHide } = this.props;
return ( return (
<div className="course-popup__container"> <div className="course-popup__container">
...@@ -76,19 +97,26 @@ class CoursePopup extends Component { ...@@ -76,19 +97,26 @@ class CoursePopup extends Component {
<span <span
className={classnames("course-popup__item", { className={classnames("course-popup__item", {
"course-popup__item--active": item.blessing "course-popup__item--active": item.blessing
})} })}
key={item.course_id} key={item.course_id}
onClick={()=>{this.toCourseDetail(item)}} onClick={()=>{this.toCourseDetail(item)}}
> >
<span className="course-popup__name">{item.course_title}</span> <span className="course-popup__name">{item.course_title}</span>
{ {
item.blessing && item.blessing &&
<span>+2点</span> <span>+2点</span>
} }
</span> </span>
)) ))
} }
</div> </div>
{
isshowAppTip &&
<div className="course-popup-apptip">
当前版本浏览课程暂不能增加福气值，可以前往h5/pc端浏览课程增加福气值
</div>
}
</div> </div>
<i className="iconfont iconiconfront-2" onClick={handleToHide}></i> <i className="iconfont iconiconfront-2" onClick={handleToHide}></i>
</div> </div>
......
src/components/blessingPreheat/coursePopup/index.scss
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, .5); background-color: rgba(0, 0, 0, .5);
z-index: 2;
.iconfont { .iconfont {
margin: 16px 0 0; margin: 16px 0 0;
...@@ -20,8 +21,7 @@ ...@@ -20,8 +21,7 @@
.course-popup { .course-popup {
width: 300px; width: 300px;
height: 275px; padding: 20px 0;
padding: 20px 0 0;
border-radius: 10px; border-radius: 10px;
box-sizing: border-box; box-sizing: border-box;
background-color: #fff; background-color: #fff;
...@@ -78,4 +78,10 @@ ...@@ -78,4 +78,10 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
}
.course-popup-apptip{
padding: 10px 15px 0 15px;
color: #FF0000;
text-align: center;
} }
\ No newline at end of file
src/components/blessingPreheat/live/index.js
...@@ -166,7 +166,7 @@ class Live extends Component { ...@@ -166,7 +166,7 @@ class Live extends Component {
return ( return (
<div key={index}> <div key={index}>
{ {
todayLives.map((item, index) => { todayLives && todayLives.map((item, index) => {
return ( return (
<LiveContent item={item} key={index} makeSubscribe={this.makeSubscribe} <LiveContent item={item} key={index} makeSubscribe={this.makeSubscribe}
toLiveRoom={this.toLiveRoom}/> toLiveRoom={this.toLiveRoom}/>
...@@ -181,7 +181,7 @@ class Live extends Component { ...@@ -181,7 +181,7 @@ class Live extends Component {
return ( return (
<div key={index}> <div key={index}>
{ {
todayLives.map((item, index) => { todayLives && todayLives.map((item, index) => {
return ( return (
<LiveContent item={item} key={index} makeSubscribe={this.makeSubscribe} <LiveContent item={item} key={index} makeSubscribe={this.makeSubscribe}
toLiveRoom={this.toLiveRoom}/> toLiveRoom={this.toLiveRoom}/>
......
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