Skip to content

M
mr-julyedu
Commit f61f8135 by xuzhenghua
Options

11

parent b6786289
Showing with 66 additions and 88 deletions
build/asset-manifest.json
......@@ -56,8 +56,8 @@
"aist-share.js": "/mrstatic/js/aist-share.3a04b022.chunk.js",
"aist-share.js.map": "/mrstatic/js/aist-share.3a04b022.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.b5be3df1.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.b5be3df1.chunk.js.map",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js.map",
"blessing-rank.css": "/mrstatic/css/blessing-rank.edf00bf8.chunk.css",
"blessing-rank.js": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js",
"blessing-rank.js.map": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js.map",
......@@ -85,8 +85,8 @@
"purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css",
"purchased.js": "/mrstatic/js/purchased.a38723f4.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.a38723f4.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.a90d2552.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.a90d2552.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.5c966386.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.5c966386.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.589ab26a.chunk.js",
"search.js.map": "/mrstatic/js/search.589ab26a.chunk.js.map",
......@@ -166,6 +166,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.344e4edc263651e6308305cf7e216c97.js": "/precache-manifest.344e4edc263651e6308305cf7e216c97.js",
"precache-manifest.d46e99695e7f288aa585f81cd582827f.js": "/precache-manifest.d46e99695e7f288aa585f81cd582827f.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/blessing-preheat.1aa114da.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/blessing-preheat.b5be3df1.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.344e4edc263651e6308305cf7e216c97.js → build/precache-manifest.d46e99695e7f288aa585f81cd582827f.js
......@@ -84,8 +84,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/MyEdit.fea133fd.chunk.js"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "a28bdbb65926824a31b2",
......@@ -96,8 +96,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Orderinfo.57e0641d.chunk.js"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "17e2d9973e72bb3206ae",
......@@ -148,8 +148,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/38.6484232f.chunk.js"
},
{
"revision": "768eadfeb1af18d29fd9",
"url": "/mrstatic/js/blessing-preheat.b5be3df1.chunk.js"
"revision": "b7eccfcdfebdd4a0dafa",
"url": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js"
},
{
"revision": "ce643559cbe26713d628",
......@@ -208,8 +208,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.5b24e8bb.chunk.js"
},
{
"revision": "a2a844ef45792902ce28",
"url": "/mrstatic/js/runtime~main.a90d2552.js"
"revision": "2173ee46d857c1d29381",
"url": "/mrstatic/js/runtime~main.5c966386.js"
},
{
"revision": "480dec355e65b21ce336",
......@@ -288,7 +288,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/38.bff100af.chunk.css"
},
{
"revision": "768eadfeb1af18d29fd9",
"revision": "b7eccfcdfebdd4a0dafa",
"url": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css"
},
{
......@@ -372,7 +372,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.bf839917.chunk.css"
},
{
"revision": "10c51bfabf5a917b62e99f59f40e2a6f",
"revision": "03421c21e6899c8f60de1468a443fab9",
"url": "/index.html"
}
];
\ No newline at end of file
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.344e4edc263651e6308305cf7e216c97.js"
"/precache-manifest.d46e99695e7f288aa585f81cd582827f.js"
);
workbox.clientsClaim();
......
src/components/blessingPreheat/collectBlessing/index.js
import React, {Component} from 'react';
import {connect} from 'react-redux';
import {Link} from 'react-router-dom';
import {http, getParam, SendMessageToApp} from '@/utils';
import {Toast} from "antd-mobile";
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { Link } from 'react-router-dom';
import { http, getParam, SendMessageToApp } from '@/utils';
import { Toast } from "antd-mobile";
import ListFrame from './../listFrame/index';
import ListHeader from './../listHeader';
import './index.scss';
@connect(({user}) => ({
uid: user && user.data && user.data.uid ? user.data.uid :''
@connect(({user})=> ({
uid: user.data.uid || ''
}))
class CollectBlessing extends Component {
......@@ -56,11 +56,11 @@ class CollectBlessing extends Component {
}
qqToShare = () => {
const {uid, history} = this.props;
if (getParam('version')) {
if (!uid) {
const { uid, history } = this.props;
if(getParam('version')) {
if(!uid) {
SendMessageToApp("toLogin");
} else {
}else {
SendMessageToApp("QQshare", {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
......@@ -68,10 +68,10 @@ class CollectBlessing extends Component {
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
});
}
} else {
if (!uid) {
}else {
if(!uid) {
history.push('/passport');
} else {
}else {
history.push('/blessingPreheat?utm_source=qq&utm_medium=11&utm_campaign=QQ11&utm_content=11&utm_term=11')
this.fetchUserBlessing(3, () => {
this.handleToAddBlessing(3);
......@@ -81,11 +81,11 @@ class CollectBlessing extends Component {
}
wechatToShare = () => {
const {uid, history} = this.props;
if (getParam('version')) {
if (!uid) {
const { uid, history } = this.props;
if(getParam('version')) {
if(!uid) {
SendMessageToApp("toLogin");
} else {
}else {
SendMessageToApp("WXshare", {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
......@@ -93,10 +93,10 @@ class CollectBlessing extends Component {
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
});
}
} else {
if (!uid) {
}else {
if(!uid) {
history.push('/passport');
} else {
}else {
history.push('/blessingPreheat?utm_source=1&utm_medium=1&utm_campaign=11&utm_content=1&utm_term=1');
this.fetchUserBlessing(1, () => {
this.handleToAddBlessing(1);
......@@ -106,11 +106,11 @@ class CollectBlessing extends Component {
}
weiboToShare = () => {
const {uid, history} = this.props;
if (getParam('version')) {
if (!uid) {
const { uid, history } = this.props;
if(getParam('version')) {
if(!uid) {
SendMessageToApp("toLogin");
} else {
}else {
SendMessageToApp("WBshare", {
title: 'AI充电节，积福气享1折秒课，超10万元奖品来就送！！',
desc: '把这门超5万人报名的【Python基础入门 升级版】课程送给你，附200元红包，请笑纳！--七月在线',
......@@ -118,10 +118,10 @@ class CollectBlessing extends Component {
imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active19_1111/m/index-share-img.png',
});
}
} else {
if (!uid) {
}else {
if(!uid) {
history.push('/passport');
} else {
}else {
history.push('/blessingPreheat?utm_source=sina&utm_medium=11&utm_campaign=sina11&utm_content=1&utm_term=11');
this.fetchUserBlessing(2, () => {
this.handleToAddBlessing(2);
......@@ -131,14 +131,14 @@ class CollectBlessing extends Component {
}
fetchUserBlessing(key, cb) {
const {handleToShowShare, handleToHideShare} = this.props;
let {seconds} = this.state;
const { handleToShowShare, handleToHideShare } = this.props;
let { seconds } = this.state;
http.get(`${API.home}/sys/user/blessing`).then(res => {
const {code, data} = res.data;
if (code === 200) {
if (data.today_shared_platforms.some(item => item === key)) {
const { code, data } = res.data;
if(code === 200) {
if(data.today_shared_platforms.some(item => item === key)) {
Toast.info('今日已分享，记得明天来~', 2, null, false);
} else {
}else {
handleToShowShare();
this.shareTimer = setInterval(() => {
this.setState(
......@@ -164,7 +164,7 @@ class CollectBlessing extends Component {
share_platform: key, // 1 朋友圈 2 微博 3 qq
type: 3 // 1：签到；3：分享；4：浏览课程；
}).then(res => {
const {code} = res.data;
const {code } = res.data;
if (code === 200) {
Toast.info('+2点福气值~', 2, null, false);
}
......@@ -174,7 +174,7 @@ class CollectBlessing extends Component {
render() {
const {
isSign,
userInfo: {blessingVal = 0, buyBlessing = 0, inviteBlessing = 0},
userInfo: {blessingVal = 0, buyBlessing = 0, inviteBlessing = 0 },
isLogin,
handleToShowNotice,
handleToShowList,
......@@ -183,16 +183,16 @@ class CollectBlessing extends Component {
toLogin,
toSection
} = this.props;
const {rules, welfareRuleList, seconds} = this.state;
const { rules, welfareRuleList, seconds } = this.state;
return (
<div className="collect-blessing">
{
isLogin
? (
<ListHeader text={`我的福气值： ${blessingVal}分`} size="middle" styles={{margin: '20px 0 0 0'}}/>
<ListHeader text={`我的福气值： ${blessingVal}分`} size="middle" styles={{margin: '20px 0 0 0'}} />
)
: (
<ListHeader size="middle" styles={{margin: '20px 0 0 0'}}>
<ListHeader size="middle" styles={{margin: '20px 0 0 0'}} >
<span className="text_nologin">我的福气值：</span>
<span onClick={toLogin} className="login__btn">登录</span>
</ListHeader>
......@@ -224,11 +224,11 @@ class CollectBlessing extends Component {
</div>
))
}
<ListHeader text="福气值积攒规则" size="middle" styles={{margin: '30px 0 0'}}/>
<ListHeader text="福气值积攒规则" size="middle" styles={{margin: '30px 0 0'}} />
{
rules.map((item, index) => (
<div className="collect-blessing__item" key={index}>
<i className="collect-blessing__num">{index + 1}</i>
<i className="collect-blessing__num">{index+1}</i>
<p className="collect-blessing__title">{item}</p>
{
index === 0 &&
......
src/components/blessingPreheat/courseList/index.js
......@@ -62,27 +62,6 @@ class CourseList extends Component {
this.fetchAICourse('four');
}
shouldComponentUpdate(nextProps, nextState, nextContext) {
if(this.props.isApp !== nextProps.isApp) {
// 精品课程-集训营、就业班/AI特训营
this.fetchCourseData();
// AI之路-基础
this.fetchAICourse('one');
// AI之路-进阶
this.fetchAICourse('two');
// AI之路-高阶
this.fetchAICourse('three');
// AI之路-拓展
this.fetchAICourse('four');
return false;
}
return true;
}
fetchAICourse = (key) => {
const { basic, advanced, higher, expand } = this.state;
http.get(`${API.home}/sys/ai_grow_up_courses/${key}`).then(res => {
......@@ -242,7 +221,8 @@ class CourseList extends Component {
}
toReceiveCoupon(id, key = '') {
const {isLogin, toLogin} = this.props;
const {isLogin, toLogin,uid} = this.props;
alert(uid)
if(isLogin) {
http.post(`${API.home}/sys/activity/coupon/receive`, {
course_id: id
......
src/components/blessingPreheat/index.js
......@@ -81,8 +81,7 @@ class BlessingPreheat extends Component {
},
],
index: 0,
userHasError: props.user.hasError,
isApp: false
userHasError: props.user.hasError
}
}
......@@ -111,7 +110,7 @@ class BlessingPreheat extends Component {
this.handleToAddBlessing(result);
}
this.appLogin()
}
......@@ -139,9 +138,6 @@ class BlessingPreheat extends Component {
if (cookie.get("token") && cookie.get("uid")) {
this.fetchUserBlessing();
this.setState({
isApp: true
})
}
this.props.setCurrentUser(this.transformUser(this.state.userInfoList))
......@@ -423,11 +419,11 @@ class BlessingPreheat extends Component {
isSign,
showRecordList,
shareMark,
index,
isApp
index
} = this.state;
const {history} = this.props;
const isLogin = !this.props.user.hasError
const uid = this.props.user.data.uid
return (
<div id={'blessing-preheat'}>
<Banner
......@@ -477,9 +473,9 @@ class BlessingPreheat extends Component {
{/* 精品课程特惠专区 */}
<ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
<CourseList
isApp={isApp}
isFormal={isFormal}
isLogin={isLogin}
uid={uid}
history={this.props.history}
toLogin={this.toLogin}
/>
......
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