pull

build/asset-manifest.json

 {
   "mrstatic/js/0.36354099.chunk.js": "/mrstatic/js/0.36354099.chunk.js",
   "mrstatic/js/0.36354099.chunk.js.map": "/mrstatic/js/0.36354099.chunk.js.map",
-  "mrstatic/css/1.89062c55.chunk.css": "/mrstatic/css/1.89062c55.chunk.css",
-  "mrstatic/js/1.8966fcd2.chunk.js": "/mrstatic/js/1.8966fcd2.chunk.js",
-  "mrstatic/js/1.8966fcd2.chunk.js.map": "/mrstatic/js/1.8966fcd2.chunk.js.map",
+  "mrstatic/css/1.cfa24c1c.chunk.css": "/mrstatic/css/1.cfa24c1c.chunk.css",
+  "mrstatic/js/1.4948562b.chunk.js": "/mrstatic/js/1.4948562b.chunk.js",
+  "mrstatic/js/1.4948562b.chunk.js.map": "/mrstatic/js/1.4948562b.chunk.js.map",
   "mrstatic/css/2.5ed15c7e.chunk.css": "/mrstatic/css/2.5ed15c7e.chunk.css",
   "mrstatic/js/2.26e8b987.chunk.js": "/mrstatic/js/2.26e8b987.chunk.js",
   "mrstatic/js/2.26e8b987.chunk.js.map": "/mrstatic/js/2.26e8b987.chunk.js.map",
@@ -87,8 +87,8 @@
   "myorders.js": "/mrstatic/js/myorders.5b6a69d2.chunk.js",
   "myorders.js.map": "/mrstatic/js/myorders.5b6a69d2.chunk.js.map",
   "newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.a33f1982.chunk.css",
-  "newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.7691884c.chunk.js",
-  "newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.7691884c.chunk.js.map",
+  "newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.4c1e00f0.chunk.js",
+  "newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.4c1e00f0.chunk.js.map",
   "newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.37a9fc8c.chunk.css",
   "newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.ba0c1132.chunk.js",
   "newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.ba0c1132.chunk.js.map",
@@ -101,8 +101,8 @@
   "python-class.css": "/mrstatic/css/python-class.38fe0012.chunk.css",
   "python-class.js": "/mrstatic/js/python-class.966bbc97.chunk.js",
   "python-class.js.map": "/mrstatic/js/python-class.966bbc97.chunk.js.map",
-  "runtime~main.js": "/mrstatic/js/runtime~main.a7f598ef.js",
-  "runtime~main.js.map": "/mrstatic/js/runtime~main.a7f598ef.js.map",
+  "runtime~main.js": "/mrstatic/js/runtime~main.ab4ca1a5.js",
+  "runtime~main.js.map": "/mrstatic/js/runtime~main.ab4ca1a5.js.map",
   "search.css": "/mrstatic/css/search.fab97849.chunk.css",
   "search.js": "/mrstatic/js/search.fcf0dbe3.chunk.js",
   "search.js.map": "/mrstatic/js/search.fcf0dbe3.chunk.js.map",
@@ -162,7 +162,7 @@
   "mrstatic/js/55.c0179f91.chunk.js": "/mrstatic/js/55.c0179f91.chunk.js",
   "mrstatic/js/55.c0179f91.chunk.js.map": "/mrstatic/js/55.c0179f91.chunk.js.map",
   "index.html": "/index.html",
-  "mrstatic/css/1.89062c55.chunk.css.map": "/mrstatic/css/1.89062c55.chunk.css.map",
+  "mrstatic/css/1.cfa24c1c.chunk.css.map": "/mrstatic/css/1.cfa24c1c.chunk.css.map",
   "mrstatic/css/2.5ed15c7e.chunk.css.map": "/mrstatic/css/2.5ed15c7e.chunk.css.map",
   "mrstatic/css/3.0fbd0802.chunk.css.map": "/mrstatic/css/3.0fbd0802.chunk.css.map",
   "mrstatic/css/42.0e107785.chunk.css.map": "/mrstatic/css/42.0e107785.chunk.css.map",
@@ -216,6 +216,6 @@
   "mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.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.266f94dab27d942e3c79251dd437b109.js": "/precache-manifest.266f94dab27d942e3c79251dd437b109.js",
+  "precache-manifest.bbb209343da4dc03482e1de4ebb00a97.js": "/precache-manifest.bbb209343da4dc03482e1de4ebb00a97.js",
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

build/precache-manifest.266f94dab27d942e3c79251dd437b109.js → build/precache-manifest.bbb209343da4dc03482e1de4ebb00a97.js

@@ -8,8 +8,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/0.36354099.chunk.js"
   },
   {
-    "revision": "87a7489f2ef5f96f3310",
-    "url": "/mrstatic/js/1.8966fcd2.chunk.js"
+    "revision": "05bd29593b0d51331a94",
+    "url": "/mrstatic/js/1.4948562b.chunk.js"
   },
   {
     "revision": "8edaf2ff2566ed17e2dd22cf4f8ad7ae",
@@ -20,16 +20,16 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/2.26e8b987.chunk.js"
   },
   {
-    "revision": "6902434f8f18a23319d57d0ac8aaea8c",
-    "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
+    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
+    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
   },
   {
     "revision": "fd19020bd405baa0f152",
     "url": "/mrstatic/js/3.ff94d6f0.chunk.js"
   },
   {
-    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
-    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
+    "revision": "6902434f8f18a23319d57d0ac8aaea8c",
+    "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
   },
   {
     "revision": "3a87c9b92bb349cb3159",
@@ -232,8 +232,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/video.465a7a06.chunk.js"
   },
   {
-    "revision": "86ea44ba0c4fe2df320d",
-    "url": "/mrstatic/js/newyear-2019-landing.7691884c.chunk.js"
+    "revision": "904d23e4081bd7aab6e1",
+    "url": "/mrstatic/js/newyear-2019-landing.4c1e00f0.chunk.js"
   },
   {
     "revision": "58af0668a6793a900fed",
@@ -268,8 +268,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/python-class.966bbc97.chunk.js"
   },
   {
-    "revision": "9207e872144b0279b7ba",
-    "url": "/mrstatic/js/runtime~main.a7f598ef.js"
+    "revision": "06748d2c424471959db6",
+    "url": "/mrstatic/js/runtime~main.ab4ca1a5.js"
   },
   {
     "revision": "f6823fec2544565f5f75",
@@ -376,7 +376,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/blessing-preheat.30803ca5.chunk.css"
   },
   {
-    "revision": "86ea44ba0c4fe2df320d",
+    "revision": "904d23e4081bd7aab6e1",
     "url": "/mrstatic/css/newyear-2019-landing.a33f1982.chunk.css"
   },
   {
@@ -468,11 +468,11 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/2.5ed15c7e.chunk.css"
   },
   {
-    "revision": "87a7489f2ef5f96f3310",
-    "url": "/mrstatic/css/1.89062c55.chunk.css"
+    "revision": "05bd29593b0d51331a94",
+    "url": "/mrstatic/css/1.cfa24c1c.chunk.css"
   },
   {
-    "revision": "443ac0c380a21c587de2b7209a7f3f3b",
+    "revision": "1f4ef5a93f57eb3b32e70d09b956c2a8",
     "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.266f94dab27d942e3c79251dd437b109.js"
+  "/precache-manifest.bbb209343da4dc03482e1de4ebb00a97.js"
 );
 
 workbox.clientsClaim();

src/components/activity/newyear-2019/common/prizes/index.js

@@ -114,7 +114,7 @@ class Prizes extends Component {
                         item.grant_max
                           ?
                           <div className='bottom-bar'>
-                            <div className="progress-bar"><span className={'progress'}/></div>
+                            <div className="progress-bar"><span className={'progress'} style={{width: `${(item.surplus / item.grant_max) * 100}%`}}/></div>
                             <span>限量{item.grant_max}份</span>
                           </div>
                           : <span className='no-limit'>不限量</span>

src/components/activity/newyear-2019/common/prizes/prizes.scss

@@ -178,7 +178,7 @@
                     position: absolute;
                     right: 0;
                     top: 0;
-                    width: 80%;
+                    //width: 80%;
                     height: 100%;
                     background: linear-gradient(-90deg, rgba(255, 140, 0, 1) 0%, rgba(255, 23, 0, 1) 100%);
                     border-radius: 1px;

src/components/activity/newyear-2019/landing/index.js

@@ -41,7 +41,7 @@ class Landing extends Component {
     this.getStage();
     this.fetchPageData()
     window.showFollowAlert = this.remind.bind(this, 'create')
-    document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！'
+    document.title = '七月在线新春献礼，幸运宝箱随你开，100%有奖！“薪”年好课免费学，精品课程1分秒！'
     const landing = document.querySelector('#landing')
     const boxContainer = document.querySelector('.box-container')
     if (boxContainer.offsetHeight < window.innerHeight) {

src/components/activity/newyear-2019/preheat/YearCourse/index.js

@@ -75,7 +75,7 @@ class YearCourse extends Component {
         this.getTeamInfo()
         this.getLength()
         this.fetchBigCourse()
-        this.fetchFreeCourse()
+        // this.fetchFreeCourse()
         this.fetchGroupCourse()
         // AI之路-基础
         this.fetchAICourse('one', false)