push

build/asset-manifest.json

@@ -82,9 +82,9 @@
   "detail.css": "/mrstatic/css/detail.fd3511d3.chunk.css",
   "detail.js": "/mrstatic/js/detail.6ad5e869.chunk.js",
   "detail.js.map": "/mrstatic/js/detail.6ad5e869.chunk.js.map",
-  "main.css": "/mrstatic/css/main.33e6e6e3.chunk.css",
-  "main.js": "/mrstatic/js/main.84b78dcf.chunk.js",
-  "main.js.map": "/mrstatic/js/main.84b78dcf.chunk.js.map",
+  "main.css": "/mrstatic/css/main.c8eb5297.chunk.css",
+  "main.js": "/mrstatic/js/main.94a8c920.chunk.js",
+  "main.js.map": "/mrstatic/js/main.94a8c920.chunk.js.map",
   "myorders.css": "/mrstatic/css/myorders.179a42fc.chunk.css",
   "myorders.js": "/mrstatic/js/myorders.9f9fb0cd.chunk.js",
   "myorders.js.map": "/mrstatic/js/myorders.9f9fb0cd.chunk.js.map",
@@ -225,7 +225,7 @@
   "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/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.c8eb5297.chunk.css.map": "/mrstatic/css/main.c8eb5297.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-yearIndex.50beb090.chunk.css.map": "/mrstatic/css/newyear-yearIndex.50beb090.chunk.css.map",
@@ -244,6 +244,6 @@
   "mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.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.1608719568e8efbd8af53bacc1ad2d64.js": "/precache-manifest.1608719568e8efbd8af53bacc1ad2d64.js",
+  "precache-manifest.7a8b27586be9e30749c3c47f9b7309b2.js": "/precache-manifest.7a8b27586be9e30749c3c47f9b7309b2.js",
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

build/precache-manifest.1608719568e8efbd8af53bacc1ad2d64.js → build/precache-manifest.7a8b27586be9e30749c3c47f9b7309b2.js

@@ -220,8 +220,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/50.41881c23.chunk.js"
   },
   {
-    "revision": "2d053663594542f4fb28",
-    "url": "/mrstatic/js/main.84b78dcf.chunk.js"
+    "revision": "0c9537dc8993571d7525",
+    "url": "/mrstatic/js/main.94a8c920.chunk.js"
   },
   {
     "revision": "c524204d27fb998820d1",
@@ -380,8 +380,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/50.820320a6.chunk.css"
   },
   {
-    "revision": "2d053663594542f4fb28",
-    "url": "/mrstatic/css/main.33e6e6e3.chunk.css"
+    "revision": "0c9537dc8993571d7525",
+    "url": "/mrstatic/css/main.c8eb5297.chunk.css"
   },
   {
     "revision": "2127bc08c26b65e7368c",
@@ -528,7 +528,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/1.037b510f.chunk.css"
   },
   {
-    "revision": "19893b3afe4dfcbb23e1cf59bf135543",
+    "revision": "122e1cd3aa4ec91de5aabaac7ec6d3b3",
     "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.1608719568e8efbd8af53bacc1ad2d64.js"
+  "/precache-manifest.7a8b27586be9e30749c3c47f9b7309b2.js"
 );
 
 workbox.clientsClaim();

src/App.js

-import React, { Component } from 'react'
+import React, {Component} from 'react'
 import Routes from './router'
 import cookie from 'js-cookie'
-import { connect } from "react-redux"
-import { setCurrentUser, startFetchUser } from "@/store/userAction"
-import { initialState } from "@/store/userReducer"
-import { withRouter, Link } from 'react-router-dom'
-import { compose } from 'redux'
-import { getParam, http, browser } from "@/utils"
-import { Toast } from "antd-mobile"
-import { addDays } from 'date-fns'
+import {connect} from "react-redux"
+import {setCurrentUser, startFetchUser} from "@/store/userAction"
+import {initialState} from "@/store/userReducer"
+import {withRouter, Link} from 'react-router-dom'
+import {compose} from 'redux'
+import {getParam, http, browser} from "@/utils"
+import {Toast} from "antd-mobile"
+import {addDays} from 'date-fns'
 import stringify from 'json-stringify-safe'
 
 
@@ -24,6 +24,12 @@ import './assets/css/index.scss'
 import './assets/font/iconfont.css'
 
 class App extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            isShowActivityEntry: 0,
+        }
+    }
 
     static displayName = 'App'
 
@@ -36,6 +42,8 @@ class App extends Component {
     firstLoad = true
 
     componentDidMount() {
+        this.getStage()
+
         this.umengStatistic()
         //平台信息
         !getParam('version') && cookie.set('plat', '5', {domain: '.julyedu.com'})
@@ -84,6 +92,22 @@ 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
+                    isShowActivityEntry: 1
+                })
+            } else {
+                Toast.info(msg, 2)
+            }
+        })
+    }
+
     umengStatistic = () => {
         // 友盟统计
         const script = document.createElement('script')
@@ -269,10 +293,11 @@ class App extends Component {
         return <>
             <Routes/>
             {
-        /*this.state.isShowActivityEntry &&
+               !!this.state.isShowActivityEntry &&
                 <Link className={'year19-index'} to="/box/boxActive">
-          <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/treasure-active/m/global-entry.png" alt=""/>
-        </Link>*/
+                    <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/treasure-active/m/global-entry.png"
+                         alt=""/>
+                </Link>
             }
         </>
     }

src/components/Index/index.scss

@@ -633,3 +633,8 @@
   height: 8px;
   background-color: #F3F4F8;
 }
+
+
+.index-box ~ .year19-index {
+  display: none;
+}
\ No newline at end of file