周年庆

src/App.js

@@ -28,7 +28,8 @@ class App extends Component {
     super(props)
     this.state = {
       isShowActivityEntry: 0,
-      isShowChannel: 0,
+      jumpUrl: '',
+      entryImage: '',
     }
   }
 
@@ -108,16 +109,14 @@ class App extends Component {
   // 获取宝箱阶段
   getStage = () => {
     let ccode = cookie.get('ccode')
-    http.get(`${API.home}/activity/stage?ccode=${ccode}`).then(res => {
+    http.get(`${API.home}/sys/anniversary/floating?ccode=${ccode}`).then(res => {
       const {code, data, msg} = res.data
       if (code === 200) {
-        // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
         this.setState({
-          isShowActivityEntry: data.treasure_stage,
-          isShowChannel: data.is_show_site_window_by_channel,
+          isShowActivityEntry: data.is_show,
+          jumpUrl: data.jump_url,
+          entryImage: data.image_path,
         })
-
-        window.sessionStorage.setItem('isShowSiteWindowByChannel', data.is_show_site_window_by_channel)
       } else {
         Toast.info(msg, 2)
       }
@@ -328,16 +327,16 @@ class App extends Component {
   }
 
   render() {
+    const {isShowActivityEntry, entryImage, jumpUrl} = this.state
     return <>
       <Routes/>
       {
-        !!this.state.isShowActivityEntry && !!this.state.isShowChannel &&
+        isShowActivityEntry &&
         <div className="year19-index">
           <i className={'iconfont iconiconfront-2'} onClick={this.closeGlobalEntry}></i>
-          <Link to={'/box/boxActive'}>
-            <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/treasure-active/m/global-entry.png"
-                 alt=""/>
-          </Link>
+          <a href={jumpUrl}>
+            <img src={entryImage} alt=""/>
+          </a>
         </div>
       }
     </>

src/components/activity/2020-717/activity/index.scss

@@ -2,9 +2,13 @@
   background-color: #2E00DC;
   padding: 0 10px 75px;
 
+  & + .year19-index {
+    display: none;
+  }
+
   .banner {
     position: relative;
-    height: 220px;
+    height: 300px;
 
     img {
       width: 100%;
@@ -829,7 +833,7 @@
   .audition {
     margin-bottom: 20px;
 
-    h4{
+    h4 {
       color: #fff;
       font-size: 12px;
       margin: 10px 0 15px;
@@ -1200,10 +1204,11 @@
 }
 
 .members {
-  ul{
+  ul {
     max-height: 230px;
     overflow: auto;
   }
+
   li {
     display: flex;
     align-items: center;

src/components/activity/2020-717/invitation/index.scss

@@ -8,6 +8,11 @@ html, body, #root {
   padding-bottom: 60px;
   background: #2E00DC;
 
+  & + .year19-index {
+    display: none;
+  }
+
+
   .banner {
     height: 67px;
     margin: 20px 0;

src/components/activity/2020-717/question/index.scss

@@ -3,6 +3,11 @@
   min-height: 100%;
   padding-bottom: 55px;
 
+  & + .year19-index {
+    display: none;
+  }
+
+
   .banner {
     height: 94px;
     background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/active20_717/m/question-banner.png");
@@ -273,6 +278,6 @@
 }
 
 
-.captcha-container{
+.captcha-container {
   padding: 40vh 30px;
 }
\ No newline at end of file