Commit 5dc25768 by xuzhenghua

登录

parent b116c899
...@@ -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.e897c984.chunk.js", "blessing-preheat.js": "/mrstatic/js/blessing-preheat.dadc0252.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.e897c984.chunk.js.map", "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.dadc0252.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.b8db1102.js", "runtime~main.js": "/mrstatic/js/runtime~main.30eaa37c.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.b8db1102.js.map", "runtime~main.js.map": "/mrstatic/js/runtime~main.30eaa37c.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",
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
"togroup.js": "/mrstatic/js/togroup.59f6d7fd.chunk.js", "togroup.js": "/mrstatic/js/togroup.59f6d7fd.chunk.js",
"togroup.js.map": "/mrstatic/js/togroup.59f6d7fd.chunk.js.map", "togroup.js.map": "/mrstatic/js/togroup.59f6d7fd.chunk.js.map",
"video.css": "/mrstatic/css/video.1c1131c9.chunk.css", "video.css": "/mrstatic/css/video.1c1131c9.chunk.css",
"video.js": "/mrstatic/js/video.ee79f0c1.chunk.js", "video.js": "/mrstatic/js/video.5b3754da.chunk.js",
"video.js.map": "/mrstatic/js/video.ee79f0c1.chunk.js.map", "video.js.map": "/mrstatic/js/video.5b3754da.chunk.js.map",
"mrstatic/css/36.2c78a65e.chunk.css": "/mrstatic/css/36.2c78a65e.chunk.css", "mrstatic/css/36.2c78a65e.chunk.css": "/mrstatic/css/36.2c78a65e.chunk.css",
"mrstatic/js/36.be086e62.chunk.js": "/mrstatic/js/36.be086e62.chunk.js", "mrstatic/js/36.be086e62.chunk.js": "/mrstatic/js/36.be086e62.chunk.js",
"mrstatic/js/36.be086e62.chunk.js.map": "/mrstatic/js/36.be086e62.chunk.js.map", "mrstatic/js/36.be086e62.chunk.js.map": "/mrstatic/js/36.be086e62.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.e1b050fa0efbb6f4526894ae0d52c4d7.js": "/precache-manifest.e1b050fa0efbb6f4526894ae0d52c4d7.js", "precache-manifest.f6076862d5191c1033983d25b3603037.js": "/precache-manifest.f6076862d5191c1033983d25b3603037.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.
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.
...@@ -16,16 +16,16 @@ self.__precacheManifest = [ ...@@ -16,16 +16,16 @@ self.__precacheManifest = [
"url": "/mrstatic/js/2.f02a0573.chunk.js" "url": "/mrstatic/js/2.f02a0573.chunk.js"
}, },
{ {
"revision": "c79abf5cb7ae8a82009cf68fe44d1078", "revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png" "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
}, },
{ {
"revision": "f8b11e0088ed6e17f173", "revision": "f8b11e0088ed6e17f173",
"url": "/mrstatic/js/Activity.73c8f0a9.chunk.js" "url": "/mrstatic/js/Activity.73c8f0a9.chunk.js"
}, },
{ {
"revision": "6902434f8f18a23319d57d0ac8aaea8c", "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png" "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
}, },
{ {
"revision": "9a7afeee0f7f7550064e", "revision": "9a7afeee0f7f7550064e",
...@@ -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": "e0282a9c0c1a1d37c5e2", "revision": "2624bab4ee536a0bf7ba",
"url": "/mrstatic/js/blessing-preheat.e897c984.chunk.js" "url": "/mrstatic/js/blessing-preheat.dadc0252.chunk.js"
}, },
{ {
"revision": "ce643559cbe26713d628", "revision": "ce643559cbe26713d628",
...@@ -168,8 +168,8 @@ self.__precacheManifest = [ ...@@ -168,8 +168,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/coupons.9328617e.chunk.js" "url": "/mrstatic/js/coupons.9328617e.chunk.js"
}, },
{ {
"revision": "380bfd4ec90c28d03f1b", "revision": "63013a04c083466a8c9c",
"url": "/mrstatic/js/video.ee79f0c1.chunk.js" "url": "/mrstatic/js/video.5b3754da.chunk.js"
}, },
{ {
"revision": "85d7bdf68a1cd0ca73e4", "revision": "85d7bdf68a1cd0ca73e4",
...@@ -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": "9858e3402f6b3b845034", "revision": "f69da9266c2a6e83aa4f",
"url": "/mrstatic/js/runtime~main.b8db1102.js" "url": "/mrstatic/js/runtime~main.30eaa37c.js"
}, },
{ {
"revision": "480dec355e65b21ce336", "revision": "480dec355e65b21ce336",
...@@ -232,7 +232,7 @@ self.__precacheManifest = [ ...@@ -232,7 +232,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/search.5716d9b3.chunk.css" "url": "/mrstatic/css/search.5716d9b3.chunk.css"
}, },
{ {
"revision": "380bfd4ec90c28d03f1b", "revision": "63013a04c083466a8c9c",
"url": "/mrstatic/css/video.1c1131c9.chunk.css" "url": "/mrstatic/css/video.1c1131c9.chunk.css"
}, },
{ {
...@@ -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": "e0282a9c0c1a1d37c5e2", "revision": "2624bab4ee536a0bf7ba",
"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": "f68864c50428193e3cc56a6ed011070f", "revision": "fe2e1f201d13297d9f6a69ef44c71468",
"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.e1b050fa0efbb6f4526894ae0d52c4d7.js" "/precache-manifest.f6076862d5191c1033983d25b3603037.js"
); );
workbox.clientsClaim(); workbox.clientsClaim();
......
...@@ -221,8 +221,8 @@ class CourseList extends Component { ...@@ -221,8 +221,8 @@ class CourseList extends Component {
} }
toReceiveCoupon(id, key = '') { toReceiveCoupon(id, key = '') {
const {isLogin, toLogin} = this.props; const {isLogin, toLogin,uid} = this.props;
alert(isLogin) 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
......
...@@ -135,6 +135,11 @@ class BlessingPreheat extends Component { ...@@ -135,6 +135,11 @@ class BlessingPreheat extends Component {
cookie.set("uname", item.uname, {expires, path: '/', domain: 'julyedu.com'}); cookie.set("uname", item.uname, {expires, path: '/', domain: 'julyedu.com'});
cookie.set("avatar_file", item.avatar_file, {expires, path: '/', domain: 'julyedu.com'}); cookie.set("avatar_file", item.avatar_file, {expires, path: '/', domain: 'julyedu.com'});
}); });
if (cookie.get("token") && cookie.get("uid")) {
window.location.reload()
}
this.props.setCurrentUser(this.transformUser(this.state.userInfoList)) this.props.setCurrentUser(this.transformUser(this.state.userInfoList))
} }
transformUser = res => { transformUser = res => {
...@@ -418,6 +423,7 @@ class BlessingPreheat extends Component { ...@@ -418,6 +423,7 @@ class BlessingPreheat extends Component {
} = 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
...@@ -469,6 +475,7 @@ class BlessingPreheat extends Component { ...@@ -469,6 +475,7 @@ class BlessingPreheat extends Component {
<CourseList <CourseList
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