Commit f61f8135 by xuzhenghua

11

parent b6786289
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
"aist-share.js": "/mrstatic/js/aist-share.3a04b022.chunk.js", "aist-share.js": "/mrstatic/js/aist-share.3a04b022.chunk.js",
"aist-share.js.map": "/mrstatic/js/aist-share.3a04b022.chunk.js.map", "aist-share.js.map": "/mrstatic/js/aist-share.3a04b022.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css", "blessing-preheat.css": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.b5be3df1.chunk.js", "blessing-preheat.js": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.b5be3df1.chunk.js.map", "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js.map",
"blessing-rank.css": "/mrstatic/css/blessing-rank.edf00bf8.chunk.css", "blessing-rank.css": "/mrstatic/css/blessing-rank.edf00bf8.chunk.css",
"blessing-rank.js": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js", "blessing-rank.js": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js",
"blessing-rank.js.map": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js.map", "blessing-rank.js.map": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js.map",
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
"purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css", "purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css",
"purchased.js": "/mrstatic/js/purchased.a38723f4.chunk.js", "purchased.js": "/mrstatic/js/purchased.a38723f4.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.a38723f4.chunk.js.map", "purchased.js.map": "/mrstatic/js/purchased.a38723f4.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.a90d2552.js", "runtime~main.js": "/mrstatic/js/runtime~main.5c966386.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.a90d2552.js.map", "runtime~main.js.map": "/mrstatic/js/runtime~main.5c966386.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css", "search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.589ab26a.chunk.js", "search.js": "/mrstatic/js/search.589ab26a.chunk.js",
"search.js.map": "/mrstatic/js/search.589ab26a.chunk.js.map", "search.js.map": "/mrstatic/js/search.589ab26a.chunk.js.map",
...@@ -166,6 +166,6 @@ ...@@ -166,6 +166,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff", "mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png", "mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.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" "service-worker.js": "/service-worker.js"
} }
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -84,8 +84,8 @@ self.__precacheManifest = [ ...@@ -84,8 +84,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/MyEdit.fea133fd.chunk.js" "url": "/mrstatic/js/MyEdit.fea133fd.chunk.js"
}, },
{ {
"revision": "7aa984cefad739ea18edb76c541aa1fd", "revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.7aa984ce.eot" "url": "/mrstatic/media/iconfont.258b4b11.ttf"
}, },
{ {
"revision": "a28bdbb65926824a31b2", "revision": "a28bdbb65926824a31b2",
...@@ -96,8 +96,8 @@ self.__precacheManifest = [ ...@@ -96,8 +96,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Orderinfo.57e0641d.chunk.js" "url": "/mrstatic/js/Orderinfo.57e0641d.chunk.js"
}, },
{ {
"revision": "258b4b114d3d9be3018cd113b2470a13", "revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.258b4b11.ttf" "url": "/mrstatic/media/iconfont.7aa984ce.eot"
}, },
{ {
"revision": "17e2d9973e72bb3206ae", "revision": "17e2d9973e72bb3206ae",
...@@ -148,8 +148,8 @@ self.__precacheManifest = [ ...@@ -148,8 +148,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/38.6484232f.chunk.js" "url": "/mrstatic/js/38.6484232f.chunk.js"
}, },
{ {
"revision": "768eadfeb1af18d29fd9", "revision": "b7eccfcdfebdd4a0dafa",
"url": "/mrstatic/js/blessing-preheat.b5be3df1.chunk.js" "url": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js"
}, },
{ {
"revision": "ce643559cbe26713d628", "revision": "ce643559cbe26713d628",
...@@ -208,8 +208,8 @@ self.__precacheManifest = [ ...@@ -208,8 +208,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.5b24e8bb.chunk.js" "url": "/mrstatic/js/myorders.5b24e8bb.chunk.js"
}, },
{ {
"revision": "a2a844ef45792902ce28", "revision": "2173ee46d857c1d29381",
"url": "/mrstatic/js/runtime~main.a90d2552.js" "url": "/mrstatic/js/runtime~main.5c966386.js"
}, },
{ {
"revision": "480dec355e65b21ce336", "revision": "480dec355e65b21ce336",
...@@ -288,7 +288,7 @@ self.__precacheManifest = [ ...@@ -288,7 +288,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/38.bff100af.chunk.css" "url": "/mrstatic/css/38.bff100af.chunk.css"
}, },
{ {
"revision": "768eadfeb1af18d29fd9", "revision": "b7eccfcdfebdd4a0dafa",
"url": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css" "url": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css"
}, },
{ {
...@@ -372,7 +372,7 @@ self.__precacheManifest = [ ...@@ -372,7 +372,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.bf839917.chunk.css" "url": "/mrstatic/css/2.bf839917.chunk.css"
}, },
{ {
"revision": "10c51bfabf5a917b62e99f59f40e2a6f", "revision": "03421c21e6899c8f60de1468a443fab9",
"url": "/index.html" "url": "/index.html"
} }
]; ];
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts( importScripts(
"/precache-manifest.344e4edc263651e6308305cf7e216c97.js" "/precache-manifest.d46e99695e7f288aa585f81cd582827f.js"
); );
workbox.clientsClaim(); workbox.clientsClaim();
......
...@@ -62,27 +62,6 @@ class CourseList extends Component { ...@@ -62,27 +62,6 @@ class CourseList extends Component {
this.fetchAICourse('four'); 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) => { fetchAICourse = (key) => {
const { basic, advanced, higher, expand } = this.state; const { basic, advanced, higher, expand } = this.state;
http.get(`${API.home}/sys/ai_grow_up_courses/${key}`).then(res => { http.get(`${API.home}/sys/ai_grow_up_courses/${key}`).then(res => {
...@@ -242,7 +221,8 @@ class CourseList extends Component { ...@@ -242,7 +221,8 @@ class CourseList extends Component {
} }
toReceiveCoupon(id, key = '') { toReceiveCoupon(id, key = '') {
const {isLogin, toLogin} = this.props; const {isLogin, toLogin,uid} = this.props;
alert(uid)
if(isLogin) { if(isLogin) {
http.post(`${API.home}/sys/activity/coupon/receive`, { http.post(`${API.home}/sys/activity/coupon/receive`, {
course_id: id course_id: id
......
...@@ -81,8 +81,7 @@ class BlessingPreheat extends Component { ...@@ -81,8 +81,7 @@ class BlessingPreheat extends Component {
}, },
], ],
index: 0, index: 0,
userHasError: props.user.hasError, userHasError: props.user.hasError
isApp: false
} }
} }
...@@ -111,7 +110,7 @@ class BlessingPreheat extends Component { ...@@ -111,7 +110,7 @@ class BlessingPreheat extends Component {
this.handleToAddBlessing(result); this.handleToAddBlessing(result);
} }
this.appLogin()
} }
...@@ -139,9 +138,6 @@ class BlessingPreheat extends Component { ...@@ -139,9 +138,6 @@ class BlessingPreheat extends Component {
if (cookie.get("token") && cookie.get("uid")) { if (cookie.get("token") && cookie.get("uid")) {
this.fetchUserBlessing(); this.fetchUserBlessing();
this.setState({
isApp: true
})
} }
this.props.setCurrentUser(this.transformUser(this.state.userInfoList)) this.props.setCurrentUser(this.transformUser(this.state.userInfoList))
...@@ -423,11 +419,11 @@ class BlessingPreheat extends Component { ...@@ -423,11 +419,11 @@ class BlessingPreheat extends Component {
isSign, isSign,
showRecordList, showRecordList,
shareMark, shareMark,
index, index
isApp
} = this.state; } = this.state;
const {history} = this.props; const {history} = this.props;
const isLogin = !this.props.user.hasError const isLogin = !this.props.user.hasError
const uid = this.props.user.data.uid
return ( return (
<div id={'blessing-preheat'}> <div id={'blessing-preheat'}>
<Banner <Banner
...@@ -477,9 +473,9 @@ class BlessingPreheat extends Component { ...@@ -477,9 +473,9 @@ class BlessingPreheat extends Component {
{/* 精品课程特惠专区 */} {/* 精品课程特惠专区 */}
<ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/> <ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
<CourseList <CourseList
isApp={isApp}
isFormal={isFormal} isFormal={isFormal}
isLogin={isLogin} isLogin={isLogin}
uid={uid}
history={this.props.history} history={this.props.history}
toLogin={this.toLogin} 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