Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00

src/App.js

@@ -3,7 +3,7 @@ import Routes from './router'
 import cookie from 'js-cookie'
 import { connect } from "react-redux"
 import { setCurrentUser, startFetchUser } from "@/store/userAction"
-import { withRouter } from 'react-router-dom'
+import { withRouter, Link } from 'react-router-dom'
 import { compose } from 'redux'
 import { getParam, http, browser } from "@/utils"
 import { Toast } from "antd-mobile"
@@ -262,7 +262,12 @@ class App extends Component {
     }
 
     render() {
-        return <Routes/>
+        return <>
+            <Routes/>
+            <Link className={'year19-index'} to="/year/yearindex">
+                <img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/gift-package.png" alt=""/>
+            </Link>
+        </>
     }
 }
 

src/assets/css/index.scss

@@ -511,4 +511,19 @@ input[type="radio"]:checked:before {
 .am-modal-alert-content, .am-modal-propmt-content{
   color: #333;
   font-size: 15px;
+}
+
+.year19-index {
+  display: block;
+  width: 58px;
+  height: 70px;
+  position: fixed;
+  top: 50%;
+  right: 0;
+  margin-top: -35px;
+  z-index: 9;
+  img {
+    width: 100%;
+    height: 100%;
+  }
 }
\ No newline at end of file

src/components/Index/index.scss

@@ -740,6 +740,10 @@
   //  //}
 }
 
+.index-box + .nav-bar + .year19-index{
+  display: none;
+}
+
 .borderTop {
   width: 100%;
   height: 8px;

src/components/activity/newyear-2019/preheat/index.scss

@@ -57,4 +57,8 @@
       margin-bottom: 5px;
     }
   }
+}
+
+.year-index + .year19-index{
+  display: none;
 }
\ No newline at end of file