Commit 674ec0b1 by xuzhenghua

宝箱

parent 23c6b56d
...@@ -82,15 +82,15 @@ ...@@ -82,15 +82,15 @@
"detail.css": "/mrstatic/css/detail.fd3511d3.chunk.css", "detail.css": "/mrstatic/css/detail.fd3511d3.chunk.css",
"detail.js": "/mrstatic/js/detail.44589fbd.chunk.js", "detail.js": "/mrstatic/js/detail.44589fbd.chunk.js",
"detail.js.map": "/mrstatic/js/detail.44589fbd.chunk.js.map", "detail.js.map": "/mrstatic/js/detail.44589fbd.chunk.js.map",
"main.css": "/mrstatic/css/main.33e6e6e3.chunk.css", "main.css": "/mrstatic/css/main.22eaa155.chunk.css",
"main.js": "/mrstatic/js/main.7b44ddeb.chunk.js", "main.js": "/mrstatic/js/main.43bbbb72.chunk.js",
"main.js.map": "/mrstatic/js/main.7b44ddeb.chunk.js.map", "main.js.map": "/mrstatic/js/main.43bbbb72.chunk.js.map",
"myorders.css": "/mrstatic/css/myorders.179a42fc.chunk.css", "myorders.css": "/mrstatic/css/myorders.179a42fc.chunk.css",
"myorders.js": "/mrstatic/js/myorders.122809d7.chunk.js", "myorders.js": "/mrstatic/js/myorders.122809d7.chunk.js",
"myorders.js.map": "/mrstatic/js/myorders.122809d7.chunk.js.map", "myorders.js.map": "/mrstatic/js/myorders.122809d7.chunk.js.map",
"newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css", "newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css",
"newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.4642c1af.chunk.js", "newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.d43f8992.chunk.js",
"newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.4642c1af.chunk.js.map", "newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.d43f8992.chunk.js.map",
"newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.50beb090.chunk.css", "newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.50beb090.chunk.css",
"newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js", "newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js",
"newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js.map", "newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js.map",
...@@ -103,8 +103,8 @@ ...@@ -103,8 +103,8 @@
"python-class.css": "/mrstatic/css/python-class.1fe9d108.chunk.css", "python-class.css": "/mrstatic/css/python-class.1fe9d108.chunk.css",
"python-class.js": "/mrstatic/js/python-class.5cca1ffb.chunk.js", "python-class.js": "/mrstatic/js/python-class.5cca1ffb.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.5cca1ffb.chunk.js.map", "python-class.js.map": "/mrstatic/js/python-class.5cca1ffb.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.5882beb5.js", "runtime~main.js": "/mrstatic/js/runtime~main.cf07b0e4.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.5882beb5.js.map", "runtime~main.js.map": "/mrstatic/js/runtime~main.cf07b0e4.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css", "search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.20bbab86.chunk.js", "search.js": "/mrstatic/js/search.20bbab86.chunk.js",
"search.js.map": "/mrstatic/js/search.20bbab86.chunk.js.map", "search.js.map": "/mrstatic/js/search.20bbab86.chunk.js.map",
...@@ -121,11 +121,11 @@ ...@@ -121,11 +121,11 @@
"togroup.js": "/mrstatic/js/togroup.a2d9f8b7.chunk.js", "togroup.js": "/mrstatic/js/togroup.a2d9f8b7.chunk.js",
"togroup.js.map": "/mrstatic/js/togroup.a2d9f8b7.chunk.js.map", "togroup.js.map": "/mrstatic/js/togroup.a2d9f8b7.chunk.js.map",
"treasure-box-home.css": "/mrstatic/css/treasure-box-home.d7bb8063.chunk.css", "treasure-box-home.css": "/mrstatic/css/treasure-box-home.d7bb8063.chunk.css",
"treasure-box-home.js": "/mrstatic/js/treasure-box-home.4dde5fb2.chunk.js", "treasure-box-home.js": "/mrstatic/js/treasure-box-home.911fee53.chunk.js",
"treasure-box-home.js.map": "/mrstatic/js/treasure-box-home.4dde5fb2.chunk.js.map", "treasure-box-home.js.map": "/mrstatic/js/treasure-box-home.911fee53.chunk.js.map",
"treasure-box-mybox.css": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css", "treasure-box-mybox.css": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css",
"treasure-box-mybox.js": "/mrstatic/js/treasure-box-mybox.6f9cffd8.chunk.js", "treasure-box-mybox.js": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js",
"treasure-box-mybox.js.map": "/mrstatic/js/treasure-box-mybox.6f9cffd8.chunk.js.map", "treasure-box-mybox.js.map": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js.map",
"video.css": "/mrstatic/css/video.e614ee3d.chunk.css", "video.css": "/mrstatic/css/video.e614ee3d.chunk.css",
"video.js": "/mrstatic/js/video.740c74ff.chunk.js", "video.js": "/mrstatic/js/video.740c74ff.chunk.js",
"video.js.map": "/mrstatic/js/video.740c74ff.chunk.js.map", "video.js.map": "/mrstatic/js/video.740c74ff.chunk.js.map",
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
"mrstatic/css/deposit-order.5ea077aa.chunk.css.map": "/mrstatic/css/deposit-order.5ea077aa.chunk.css.map", "mrstatic/css/deposit-order.5ea077aa.chunk.css.map": "/mrstatic/css/deposit-order.5ea077aa.chunk.css.map",
"mrstatic/css/deposit-pay-order.ecfb0a9d.chunk.css.map": "/mrstatic/css/deposit-pay-order.ecfb0a9d.chunk.css.map", "mrstatic/css/deposit-pay-order.ecfb0a9d.chunk.css.map": "/mrstatic/css/deposit-pay-order.ecfb0a9d.chunk.css.map",
"mrstatic/css/detail.fd3511d3.chunk.css.map": "/mrstatic/css/detail.fd3511d3.chunk.css.map", "mrstatic/css/detail.fd3511d3.chunk.css.map": "/mrstatic/css/detail.fd3511d3.chunk.css.map",
"mrstatic/css/main.33e6e6e3.chunk.css.map": "/mrstatic/css/main.33e6e6e3.chunk.css.map", "mrstatic/css/main.22eaa155.chunk.css.map": "/mrstatic/css/main.22eaa155.chunk.css.map",
"mrstatic/css/myorders.179a42fc.chunk.css.map": "/mrstatic/css/myorders.179a42fc.chunk.css.map", "mrstatic/css/myorders.179a42fc.chunk.css.map": "/mrstatic/css/myorders.179a42fc.chunk.css.map",
"mrstatic/css/newyear-2019-landing.57b46b09.chunk.css.map": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css.map", "mrstatic/css/newyear-2019-landing.57b46b09.chunk.css.map": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css.map",
"mrstatic/css/newyear-yearIndex.50beb090.chunk.css.map": "/mrstatic/css/newyear-yearIndex.50beb090.chunk.css.map", "mrstatic/css/newyear-yearIndex.50beb090.chunk.css.map": "/mrstatic/css/newyear-yearIndex.50beb090.chunk.css.map",
...@@ -244,6 +244,6 @@ ...@@ -244,6 +244,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.woff", "mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.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.6cfd5e802285e504501f69d9b352381a.js": "/precache-manifest.6cfd5e802285e504501f69d9b352381a.js", "precache-manifest.4d78873684f9c11fbf78c21958bf468a.js": "/precache-manifest.4d78873684f9c11fbf78c21958bf468a.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.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -24,16 +24,16 @@ self.__precacheManifest = [ ...@@ -24,16 +24,16 @@ self.__precacheManifest = [
"url": "/mrstatic/js/3.4a2be69d.chunk.js" "url": "/mrstatic/js/3.4a2be69d.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": "1a055f495ab8956bb3a1", "revision": "1a055f495ab8956bb3a1",
"url": "/mrstatic/js/4.f291e0c7.chunk.js" "url": "/mrstatic/js/4.f291e0c7.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": "f45e0ec050e9f14e39d4", "revision": "f45e0ec050e9f14e39d4",
...@@ -220,8 +220,8 @@ self.__precacheManifest = [ ...@@ -220,8 +220,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/50.41881c23.chunk.js" "url": "/mrstatic/js/50.41881c23.chunk.js"
}, },
{ {
"revision": "f3c27c2f7156807075f2", "revision": "1d6852d1c16e63d72b7f",
"url": "/mrstatic/js/main.7b44ddeb.chunk.js" "url": "/mrstatic/js/main.43bbbb72.chunk.js"
}, },
{ {
"revision": "c524204d27fb998820d1", "revision": "c524204d27fb998820d1",
...@@ -236,8 +236,8 @@ self.__precacheManifest = [ ...@@ -236,8 +236,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/48.5ce7e070.chunk.js" "url": "/mrstatic/js/48.5ce7e070.chunk.js"
}, },
{ {
"revision": "e3f7ba7edae21d59dc72", "revision": "4d975309ae2aa022bc0d",
"url": "/mrstatic/js/newyear-2019-landing.4642c1af.chunk.js" "url": "/mrstatic/js/newyear-2019-landing.d43f8992.chunk.js"
}, },
{ {
"revision": "0c92200a7bb344715069", "revision": "0c92200a7bb344715069",
...@@ -272,20 +272,20 @@ self.__precacheManifest = [ ...@@ -272,20 +272,20 @@ self.__precacheManifest = [
"url": "/mrstatic/js/python-class.5cca1ffb.chunk.js" "url": "/mrstatic/js/python-class.5cca1ffb.chunk.js"
}, },
{ {
"revision": "4ee0ae8754c3e57967d7", "revision": "db24a933e588942d7113",
"url": "/mrstatic/js/runtime~main.5882beb5.js" "url": "/mrstatic/js/runtime~main.cf07b0e4.js"
}, },
{ {
"revision": "44e19dbadbb28c2fd444", "revision": "734674d9a8b8cfd19d5d",
"url": "/mrstatic/js/treasure-box-mybox.6f9cffd8.chunk.js" "url": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js"
}, },
{ {
"revision": "0723110b47af657e05ae", "revision": "0723110b47af657e05ae",
"url": "/mrstatic/js/search.20bbab86.chunk.js" "url": "/mrstatic/js/search.20bbab86.chunk.js"
}, },
{ {
"revision": "e565225f5e27bbfb3eee", "revision": "8928f35adff28bc8e44a",
"url": "/mrstatic/js/treasure-box-home.4dde5fb2.chunk.js" "url": "/mrstatic/js/treasure-box-home.911fee53.chunk.js"
}, },
{ {
"revision": "a50a87d4623731173d76", "revision": "a50a87d4623731173d76",
...@@ -316,7 +316,7 @@ self.__precacheManifest = [ ...@@ -316,7 +316,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/togroup.f08bc5f3.chunk.css" "url": "/mrstatic/css/togroup.f08bc5f3.chunk.css"
}, },
{ {
"revision": "e565225f5e27bbfb3eee", "revision": "8928f35adff28bc8e44a",
"url": "/mrstatic/css/treasure-box-home.d7bb8063.chunk.css" "url": "/mrstatic/css/treasure-box-home.d7bb8063.chunk.css"
}, },
{ {
...@@ -324,7 +324,7 @@ self.__precacheManifest = [ ...@@ -324,7 +324,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/video.e614ee3d.chunk.css" "url": "/mrstatic/css/video.e614ee3d.chunk.css"
}, },
{ {
"revision": "44e19dbadbb28c2fd444", "revision": "734674d9a8b8cfd19d5d",
"url": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css" "url": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css"
}, },
{ {
...@@ -364,7 +364,7 @@ self.__precacheManifest = [ ...@@ -364,7 +364,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/48.ae54e35c.chunk.css" "url": "/mrstatic/css/48.ae54e35c.chunk.css"
}, },
{ {
"revision": "e3f7ba7edae21d59dc72", "revision": "4d975309ae2aa022bc0d",
"url": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css" "url": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css"
}, },
{ {
...@@ -380,8 +380,8 @@ self.__precacheManifest = [ ...@@ -380,8 +380,8 @@ self.__precacheManifest = [
"url": "/mrstatic/css/50.820320a6.chunk.css" "url": "/mrstatic/css/50.820320a6.chunk.css"
}, },
{ {
"revision": "f3c27c2f7156807075f2", "revision": "1d6852d1c16e63d72b7f",
"url": "/mrstatic/css/main.33e6e6e3.chunk.css" "url": "/mrstatic/css/main.22eaa155.chunk.css"
}, },
{ {
"revision": "2127bc08c26b65e7368c", "revision": "2127bc08c26b65e7368c",
...@@ -528,7 +528,7 @@ self.__precacheManifest = [ ...@@ -528,7 +528,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/1.037b510f.chunk.css" "url": "/mrstatic/css/1.037b510f.chunk.css"
}, },
{ {
"revision": "a308da20c2680d9addbdd465b06bcc70", "revision": "5b9b2186adf7f39cf6c6a30234f12599",
"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.6cfd5e802285e504501f69d9b352381a.js" "/precache-manifest.4d78873684f9c11fbf78c21958bf468a.js"
); );
workbox.clientsClaim(); workbox.clientsClaim();
......
...@@ -25,6 +25,13 @@ import './assets/font/iconfont.css' ...@@ -25,6 +25,13 @@ import './assets/font/iconfont.css'
class App extends Component { class App extends Component {
constructor(props) {
super(props)
this.state = {
isShowActivityEntry: 0,
}
}
static displayName = 'App' static displayName = 'App'
previousLocation = {pathname: '/', search: '', hash: ''} previousLocation = {pathname: '/', search: '', hash: ''}
...@@ -43,6 +50,7 @@ class App extends Component { ...@@ -43,6 +50,7 @@ class App extends Component {
} }
componentDidMount() { componentDidMount() {
this.getStage()
this.umengStatistic() this.umengStatistic()
//平台信息 //平台信息
!getParam('version') && cookie.set('plat', '5', {domain: '.julyedu.com'}) !getParam('version') && cookie.set('plat', '5', {domain: '.julyedu.com'})
...@@ -91,6 +99,21 @@ class App extends Component { ...@@ -91,6 +99,21 @@ class App extends Component {
}) })
} }
// 获取宝箱阶段
getStage = () => {
http.get(`${API.home}/activity/stage`).then(res => {
const {code, data, msg} = res.data
if (code === 200) {
// treasure_stage,宝箱阶段,0-不在活动时间,1-活动时间内
this.setState({
isShowActivityEntry: data.treasure_stage
})
} else {
Toast.info(msg, 2)
}
})
}
umengStatistic = () => { umengStatistic = () => {
// 友盟统计 // 友盟统计
const script = document.createElement('script') const script = document.createElement('script')
...@@ -275,10 +298,10 @@ class App extends Component { ...@@ -275,10 +298,10 @@ class App extends Component {
return <> return <>
<Routes/> <Routes/>
{ {
/*this.state.isShowActivityEntry && !!this.state.isShowActivityEntry &&
<Link className={'year19-index'} to="/box/boxActive"> <Link className={'year19-index'} to="/box/boxActive">
<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/treasure-active/m/global-entry.png" alt=""/> <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/treasure-active/m/global-entry.png" alt=""/>
</Link>*/ </Link>
} }
</> </>
} }
......
...@@ -633,3 +633,7 @@ ...@@ -633,3 +633,7 @@
height: 8px; height: 8px;
background-color: #F3F4F8; background-color: #F3F4F8;
} }
.index-box ~ .year19-index {
display: none;
}
\ No newline at end of file
...@@ -89,7 +89,7 @@ class Landing extends Component { ...@@ -89,7 +89,7 @@ class Landing extends Component {
http.get(`${API.home}/activity/stage`).then(res => { http.get(`${API.home}/activity/stage`).then(res => {
const {code, data, msg} = res.data const {code, data, msg} = res.data
if (code === 200) { if (code === 200) {
if (Number(data.activity_stage) === 0) { if (Number(data.treasure_stage) === 0) {
this.props.history.push('/'); this.props.history.push('/');
return; return;
} }
......
...@@ -309,7 +309,7 @@ class MyTreasure extends Component { ...@@ -309,7 +309,7 @@ class MyTreasure extends Component {
http.get(`${API.home}/activity/stage`).then(res => { http.get(`${API.home}/activity/stage`).then(res => {
const {code, data} = res.data const {code, data} = res.data
if (code === 200) { if (code === 200) {
if(Number(data.activity_stage) === 0) { if(Number(data.treasure_stage) === 0) {
this.props.history.push('/'); this.props.history.push('/');
return; return;
} }
......
...@@ -110,7 +110,7 @@ export default class index extends Component { ...@@ -110,7 +110,7 @@ export default class index extends Component {
http.get(`${API.home}/activity/stage`).then(res => { http.get(`${API.home}/activity/stage`).then(res => {
const {code, data, msg} = res.data const {code, data, msg} = res.data
if (code === 200) { if (code === 200) {
if(Number(data.activity_stage) === 0) { if(Number(data.treasure_stage) === 0) {
this.props.history.push('/'); this.props.history.push('/');
return; return;
} }
......
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