pull

build/asset-manifest.json

@@ -2,8 +2,13 @@
   "mrstatic/js/0.bc874a24.chunk.js": "/mrstatic/js/0.bc874a24.chunk.js",
   "mrstatic/js/0.bc874a24.chunk.js.map": "/mrstatic/js/0.bc874a24.chunk.js.map",
   "mrstatic/css/1.037b510f.chunk.css": "/mrstatic/css/1.037b510f.chunk.css",
+<<<<<<< HEAD
   "mrstatic/js/1.43b770f2.chunk.js": "/mrstatic/js/1.43b770f2.chunk.js",
   "mrstatic/js/1.43b770f2.chunk.js.map": "/mrstatic/js/1.43b770f2.chunk.js.map",
+=======
+  "mrstatic/js/1.bc21c983.chunk.js": "/mrstatic/js/1.bc21c983.chunk.js",
+  "mrstatic/js/1.bc21c983.chunk.js.map": "/mrstatic/js/1.bc21c983.chunk.js.map",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "mrstatic/js/2.0417c21c.chunk.js": "/mrstatic/js/2.0417c21c.chunk.js",
   "mrstatic/js/2.0417c21c.chunk.js.map": "/mrstatic/js/2.0417c21c.chunk.js.map",
   "mrstatic/css/3.bf839917.chunk.css": "/mrstatic/css/3.bf839917.chunk.css",
@@ -82,18 +87,30 @@
   "detail.css": "/mrstatic/css/detail.fd3511d3.chunk.css",
   "detail.js": "/mrstatic/js/detail.44589fbd.chunk.js",
   "detail.js.map": "/mrstatic/js/detail.44589fbd.chunk.js.map",
+<<<<<<< HEAD
   "main.css": "/mrstatic/css/main.c8eb5297.chunk.css",
+=======
+  "main.css": "/mrstatic/css/main.22eaa155.chunk.css",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "main.js": "/mrstatic/js/main.43bbbb72.chunk.js",
   "main.js.map": "/mrstatic/js/main.43bbbb72.chunk.js.map",
   "myorders.css": "/mrstatic/css/myorders.179a42fc.chunk.css",
   "myorders.js": "/mrstatic/js/myorders.122809d7.chunk.js",
   "myorders.js.map": "/mrstatic/js/myorders.122809d7.chunk.js.map",
   "newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css",
+<<<<<<< HEAD
   "newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.2c04ad11.chunk.js",
   "newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.2c04ad11.chunk.js.map",
   "newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.50beb090.chunk.css",
   "newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.c57affdf.chunk.js",
   "newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.c57affdf.chunk.js.map",
+=======
+  "newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.d43f8992.chunk.js",
+  "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.js": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js",
+  "newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js.map",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "prize-winner-list.css": "/mrstatic/css/prize-winner-list.3eee90af.chunk.css",
   "prize-winner-list.js": "/mrstatic/js/prize-winner-list.47d0e4b3.chunk.js",
   "prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.47d0e4b3.chunk.js.map",
@@ -103,8 +120,13 @@
   "python-class.css": "/mrstatic/css/python-class.1fe9d108.chunk.css",
   "python-class.js": "/mrstatic/js/python-class.5cca1ffb.chunk.js",
   "python-class.js.map": "/mrstatic/js/python-class.5cca1ffb.chunk.js.map",
+<<<<<<< HEAD
   "runtime~main.js": "/mrstatic/js/runtime~main.3709cb81.js",
   "runtime~main.js.map": "/mrstatic/js/runtime~main.3709cb81.js.map",
+=======
+  "runtime~main.js": "/mrstatic/js/runtime~main.cf07b0e4.js",
+  "runtime~main.js.map": "/mrstatic/js/runtime~main.cf07b0e4.js.map",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
   "search.js": "/mrstatic/js/search.20bbab86.chunk.js",
   "search.js.map": "/mrstatic/js/search.20bbab86.chunk.js.map",
@@ -126,7 +148,11 @@
   "treasure-box-mybox.css": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css",
   "treasure-box-mybox.js": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js",
   "treasure-box-mybox.js.map": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js.map",
+<<<<<<< HEAD
   "video.css": "/mrstatic/css/video.da74d427.chunk.css",
+=======
+  "video.css": "/mrstatic/css/video.e614ee3d.chunk.css",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "video.js": "/mrstatic/js/video.740c74ff.chunk.js",
   "video.js.map": "/mrstatic/js/video.740c74ff.chunk.js.map",
   "mrstatic/css/45.c8db8c90.chunk.css": "/mrstatic/css/45.c8db8c90.chunk.css",
@@ -225,7 +251,11 @@
   "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",
+<<<<<<< HEAD
   "mrstatic/css/main.c8eb5297.chunk.css.map": "/mrstatic/css/main.c8eb5297.chunk.css.map",
+=======
+  "mrstatic/css/main.22eaa155.chunk.css.map": "/mrstatic/css/main.22eaa155.chunk.css.map",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "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",
@@ -239,11 +269,19 @@
   "mrstatic/css/togroup.f08bc5f3.chunk.css.map": "/mrstatic/css/togroup.f08bc5f3.chunk.css.map",
   "mrstatic/css/treasure-box-home.d7bb8063.chunk.css.map": "/mrstatic/css/treasure-box-home.d7bb8063.chunk.css.map",
   "mrstatic/css/treasure-box-mybox.b5f40384.chunk.css.map": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css.map",
+<<<<<<< HEAD
   "mrstatic/css/video.da74d427.chunk.css.map": "/mrstatic/css/video.da74d427.chunk.css.map",
+=======
+  "mrstatic/css/video.e614ee3d.chunk.css.map": "/mrstatic/css/video.e614ee3d.chunk.css.map",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "mrstatic/media/index.scss": "/mrstatic/media/redb_sp_bj@2x.6902434f.png",
   "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",
+<<<<<<< HEAD
   "precache-manifest.f96eca1e36d5545342bd870cf81f084c.js": "/precache-manifest.f96eca1e36d5545342bd870cf81f084c.js",
+=======
+  "precache-manifest.4d78873684f9c11fbf78c21958bf468a.js": "/precache-manifest.4d78873684f9c11fbf78c21958bf468a.js",
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

build/mrstatic/css/61.11f70350.chunk.css~HEAD

+.python-container{padding:13.333333vw 2.133333vw 7.733333vw;background-image:url(https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/h5/python-bg.png);background-size:cover}.python-header{position:relative;height:26.666667vw;padding-top:9.6vw;box-sizing:border-box}.python-header .iconfont{position:absolute;top:2.666667vw;right:10.666667vw;font-size:10.133333vw;color:#fff;width:13.333333vw;height:10.133333vw;background:url(https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/h5/share_arrow.png) 50% no-repeat;background-size:100% 100%}.python-wechat__title{margin:0;font-size:4.533333vw;color:#fff;text-align:center;line-height:1}.python-content{padding-bottom:9.866667vw;background-image:url(https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/h5/python-content-bg.png);background-size:cover}.python-user{position:relative;margin:0 1.333333vw;padding-top:12vw;border-bottom:1px dashed #000}.python-user__portrait{position:absolute;top:-8vw;left:0;right:0;width:16vw;height:16vw;margin:auto;padding:1.333333vw;border-radius:50%;box-sizing:border-box;background-color:#fff;background-size:cover}.python-user__portrait img{display:block;width:100%}.python-user__id{margin:0;font-size:4vw;font-weight:500;color:#111;text-align:center;line-height:1}.python-user__desc{height:12.8vw;margin:1.066667vw 0;font-size:4.266667vw;color:#333;text-align:center}.python-user__desc span{color:#2d57f0}.python-code__title{position:relative;margin:8.533333vw 4.266667vw 5.6vw;padding-left:4.266667vw;font-size:4.533333vw;font-weight:600;color:#2d56f0;line-height:1}.python-code__title:after{content:"";position:absolute;top:0;left:0;bottom:0;width:1.066667vw;height:3.2vw;margin:auto 0;background-color:#2d56f0}.python-code__content{position:relative;height:45.6vw;margin:0 4.266667vw;padding:0 2.666667vw;border-radius:1.333333vw;border:1px solid #67e4ff;box-sizing:border-box;font-size:3.733333vw;color:#fff;background-color:#272822}.python-button{padding:0;border-style:none;cursor:pointer;outline:none}.python-button__study{display:block;width:62.133333vw;height:11.733333vw;margin:9.333333vw auto 0;border-radius:5.866667vw;font-size:4.266667vw;color:#2d56f0;background-color:#fff95b;box-shadow:0 1.333333vw 0 #ffd200}.python-button__study,.python-button__tip{font-weight:500;line-height:11.733333vw;text-align:center}.python-button__tip{margin:9.333333vw 0 0;font-size:4vw;color:#fff}.python-button__execute{position:absolute;top:0;left:0;bottom:0;right:0;width:29.333333vw;height:8.533333vw;margin:auto;border-radius:4.266667vw;font-size:4vw;color:#fff;line-height:8.533333vw;background-color:#09f}.python-popup{position:fixed;top:0;left:0;width:100%;height:100%;background-color:rgba(0,0,0,.6);z-index:99}.ace_mobile-menu{display:none}
+/*# sourceMappingURL=61.11f70350.chunk.css.map */
\ No newline at end of file

build/mrstatic/css/62.d1a52318.chunk.css~HEAD

+.python-container{padding:13.333333vw 2.133333vw 7.733333vw;background-image:url(https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/h5/python-bg.png);background-size:cover}.python-header{position:relative;height:26.666667vw;padding-top:9.6vw;box-sizing:border-box}.python-header .iconfont{position:absolute;top:2.666667vw;right:10.666667vw;font-size:10.133333vw;color:#fff;width:13.333333vw;height:10.133333vw;background:url(https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/h5/share_arrow.png) 50% no-repeat;background-size:100% 100%}.python-wechat__title{margin:0;font-size:4.533333vw;color:#fff;text-align:center;line-height:1}.python-content{padding-bottom:9.866667vw;background-image:url(https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/pythonCourse/h5/python-content-bg.png);background-size:cover}.python-user{position:relative;margin:0 1.333333vw;padding-top:12vw;border-bottom:1px dashed #000}.python-user__portrait{position:absolute;top:-8vw;left:0;right:0;width:16vw;height:16vw;margin:auto;padding:1.333333vw;border-radius:50%;box-sizing:border-box;background-color:#fff;background-size:cover}.python-user__portrait img{display:block;width:100%}.python-user__id{margin:0;font-size:4vw;font-weight:500;color:#111;text-align:center;line-height:1}.python-user__desc{height:12.8vw;margin:1.066667vw 0;font-size:4.266667vw;color:#333;text-align:center}.python-user__desc span{color:#2d57f0}.python-code__title{position:relative;margin:8.533333vw 4.266667vw 5.6vw;padding-left:4.266667vw;font-size:4.533333vw;font-weight:600;color:#2d56f0;line-height:1}.python-code__title:after{content:"";position:absolute;top:0;left:0;bottom:0;width:1.066667vw;height:3.2vw;margin:auto 0;background-color:#2d56f0}.python-code__content{position:relative;height:45.6vw;margin:0 4.266667vw;padding:0 2.666667vw;border-radius:1.333333vw;border:1px solid #67e4ff;box-sizing:border-box;font-size:3.733333vw;color:#fff;background-color:#272822}.python-button{padding:0;border-style:none;cursor:pointer;outline:none}.python-button__study{display:block;width:62.133333vw;height:11.733333vw;margin:9.333333vw auto 0;border-radius:5.866667vw;font-size:4.266667vw;color:#2d56f0;background-color:#fff95b;box-shadow:0 1.333333vw 0 #ffd200}.python-button__study,.python-button__tip{font-weight:500;line-height:11.733333vw;text-align:center}.python-button__tip{margin:9.333333vw 0 0;font-size:4vw;color:#fff}.python-button__execute{position:absolute;top:0;left:0;bottom:0;right:0;width:29.333333vw;height:8.533333vw;margin:auto;border-radius:4.266667vw;font-size:4vw;color:#fff;line-height:8.533333vw;background-color:#09f}.python-popup{position:fixed;top:0;left:0;width:100%;height:100%;background-color:rgba(0,0,0,.6);z-index:99}.ace_mobile-menu{display:none}
+/*# sourceMappingURL=62.d1a52318.chunk.css.map */
\ No newline at end of file

build/mrstatic/js/runtime~main.cf07b0e4.js

+!function(e){function r(r){for(var a,n,d=r[0],f=r[1],i=r[2],s=0,b=[];s<d.length;s++)n=d[s],o[n]&&b.push(o[n][0]),o[n]=0;for(a in f)Object.prototype.hasOwnProperty.call(f,a)&&(e[a]=f[a]);for(u&&u(r);b.length;)b.shift()();return c.push.apply(c,i||[]),t()}function t(){for(var e,r=0;r<c.length;r++){for(var t=c[r],a=!0,n=1;n<t.length;n++){var f=t[n];0!==o[f]&&(a=!1)}a&&(c.splice(r--,1),e=d(d.s=t[0]))}return e}var a={},n={36:0},o={36:0},c=[];function d(r){if(a[r])return a[r].exports;var t=a[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,d),t.l=!0,t.exports}d.e=function(e){var r=[];n[e]?r.push(n[e]):0!==n[e]&&{1:1,3:1,4:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,14:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1,26:1,27:1,28:1,30:1,31:1,32:1,33:1,34:1,35:1,37:1,38:1,39:1,40:1,41:1,42:1,43:1,44:1,47:1,48:1,49:1,50:1,51:1,52:1,53:1,54:1,55:1,56:1,57:1,58:1,59:1,60:1,61:1,62:1}[e]&&r.push(n[e]=new Promise(function(r,t){for(var a="mrstatic/css/"+({5:"Activity",6:"BargainMiddlePage",7:"Classify",8:"Country",9:"CourseList",10:"DrawDocument",11:"Examination",12:"Invite",13:"MyEdit",14:"Order",15:"Orderinfo",16:"PayOrder",17:"Preferential",18:"SearchResult",19:"ShareCourse",20:"ShopCart",21:"aist-share",22:"blessing-getPrize",23:"blessing-preheat",24:"blessing-rank",25:"coupons",26:"deposit-order",27:"deposit-pay-order",28:"detail",30:"myorders",31:"newyear-2019-landing",32:"newyear-yearIndex",33:"prize-winner-list",34:"purchased",35:"python-class",37:"search",38:"shareposter",39:"study",40:"system-notices",41:"togroup",42:"treasure-box-home",43:"treasure-box-mybox",44:"video"}[e]||e)+"."+{0:"31d6cfe0",1:"037b510f",2:"31d6cfe0",3:"bf839917",4:"6dfb7e21",5:"6260646a",6:"eb686c74",7:"fb4bedde",8:"2d34330b",9:"f284a443",10:"aeb3f822",11:"7bb0622b",12:"f0f99418",13:"31d6cfe0",14:"8c058a7a",15:"31d6cfe0",16:"7eb7d317",17:"12a8297c",18:"cdf852c1",19:"8046fb41",20:"92ab48a3",21:"40873df0",22:"5a935f68",23:"07827c59",24:"91e559d5",25:"466858c7",26:"5ea077aa",27:"ecfb0a9d",28:"fd3511d3",30:"179a42fc",31:"57b46b09",32:"50beb090",33:"3eee90af",34:"288d035b",35:"1fe9d108",37:"5716d9b3",38:"76774ba4",39:"8b54592d",40:"fd23e5fc",41:"f08bc5f3",42:"d7bb8063",43:"b5f40384",44:"e614ee3d",46:"31d6cfe0",47:"2fd45d08",48:"ae54e35c",49:"bff100af",50:"820320a6",51:"35e22f8c",52:"6a988500",53:"cf875b17",54:"866df084",55:"96cd221b",56:"213ef0c8",57:"3a7f5a83",58:"d06494b6",59:"a69e6a9c",60:"b02d1de6",61:"11f70350",62:"d1a52318"}[e]+".chunk.css",o=d.p+a,c=document.getElementsByTagName("link"),f=0;f<c.length;f++){var i=(u=c[f]).getAttribute("data-href")||u.getAttribute("href");if("stylesheet"===u.rel&&(i===a||i===o))return r()}var s=document.getElementsByTagName("style");for(f=0;f<s.length;f++){var u;if((i=(u=s[f]).getAttribute("data-href"))===a||i===o)return r()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=r,b.onerror=function(r){var a=r&&r.target&&r.target.src||o,c=new Error("Loading CSS chunk "+e+" failed.\n("+a+")");c.request=a,delete n[e],b.parentNode.removeChild(b),t(c)},b.href=o,document.getElementsByTagName("head")[0].appendChild(b)}).then(function(){n[e]=0}));var t=o[e];if(0!==t)if(t)r.push(t[2]);else{var a=new Promise(function(r,a){t=o[e]=[r,a]});r.push(t[2]=a);var c,f=document.createElement("script");f.charset="utf-8",f.timeout=120,d.nc&&f.setAttribute("nonce",d.nc),f.src=function(e){return d.p+"mrstatic/js/"+({5:"Activity",6:"BargainMiddlePage",7:"Classify",8:"Country",9:"CourseList",10:"DrawDocument",11:"Examination",12:"Invite",13:"MyEdit",14:"Order",15:"Orderinfo",16:"PayOrder",17:"Preferential",18:"SearchResult",19:"ShareCourse",20:"ShopCart",21:"aist-share",22:"blessing-getPrize",23:"blessing-preheat",24:"blessing-rank",25:"coupons",26:"deposit-order",27:"deposit-pay-order",28:"detail",30:"myorders",31:"newyear-2019-landing",32:"newyear-yearIndex",33:"prize-winner-list",34:"purchased",35:"python-class",37:"search",38:"shareposter",39:"study",40:"system-notices",41:"togroup",42:"treasure-box-home",43:"treasure-box-mybox",44:"video"}[e]||e)+"."+{0:"bc874a24",1:"bc21c983",2:"0417c21c",3:"4a2be69d",4:"f291e0c7",5:"c809bb7b",6:"c1cb9f94",7:"caf45f11",8:"aeb80b54",9:"6c515c34",10:"cb4e04da",11:"003c1591",12:"e6d47ce7",13:"7a287fd0",14:"5ab5c003",15:"3ad57444",16:"da5e9a14",17:"8bad9f73",18:"afb95af0",19:"4cb0d9de",20:"dc030457",21:"077bdd8e",22:"792701bc",23:"d8b9eaff",24:"63ec5cac",25:"84d0bf7d",26:"94391d11",27:"b0286349",28:"44589fbd",30:"122809d7",31:"d43f8992",32:"ecc6b24e",33:"47d0e4b3",34:"279006f4",35:"5cca1ffb",37:"20bbab86",38:"76cba1ff",39:"622e8489",40:"736d4af5",41:"a2d9f8b7",42:"911fee53",43:"5d14604c",44:"740c74ff",46:"44f38ed3",47:"4ef49615",48:"5ce7e070",49:"0dfc3020",50:"41881c23",51:"38a8cd5c",52:"a9165147",53:"63fffc38",54:"85c8b90a",55:"03b8c755",56:"5198f441",57:"4cc0daaf",58:"86365e8c",59:"bf51ed27",60:"a23a3eec",61:"2292e5e8",62:"f50c12ff"}[e]+".chunk.js"}(e),c=function(r){f.onerror=f.onload=null,clearTimeout(i);var t=o[e];if(0!==t){if(t){var a=r&&("load"===r.type?"missing":r.type),n=r&&r.target&&r.target.src,c=new Error("Loading chunk "+e+" failed.\n("+a+": "+n+")");c.type=a,c.request=n,t[1](c)}o[e]=void 0}};var i=setTimeout(function(){c({type:"timeout",target:f})},12e4);f.onerror=f.onload=c,document.head.appendChild(f)}return Promise.all(r)},d.m=e,d.c=a,d.d=function(e,r,t){d.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,r){if(1&r&&(e=d(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(d.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var a in e)d.d(t,a,function(r){return e[r]}.bind(null,a));return t},d.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(r,"a",r),r},d.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},d.p="/",d.oe=function(e){throw console.error(e),e};var f=window.webpackJsonp=window.webpackJsonp||[],i=f.push.bind(f);f.push=r,f=f.slice();for(var s=0;s<f.length;s++)r(f[s]);var u=i;t()}([]);
+//# sourceMappingURL=runtime~main.cf07b0e4.js.map
\ No newline at end of file

build/service-worker.js

@@ -14,7 +14,11 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
 
 importScripts(
+<<<<<<< HEAD
   "/precache-manifest.f96eca1e36d5545342bd870cf81f084c.js"
+=======
+  "/precache-manifest.4d78873684f9c11fbf78c21958bf468a.js"
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
 );
 
 workbox.clientsClaim();

package-lock.json

@@ -3099,9 +3099,9 @@
       "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
     },
     "base64id": {
       "version": "1.0.0",
@@ -6267,8 +6267,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6286,13 +6285,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6305,18 +6302,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6419,8 +6413,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6430,7 +6423,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6443,20 +6435,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -6473,7 +6462,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6546,8 +6534,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6557,7 +6544,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6633,8 +6619,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6664,7 +6649,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6682,7 +6666,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6721,13 +6704,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },

src/App.js

@@ -31,7 +31,18 @@ class App extends Component {
         }
     }
 
+<<<<<<< HEAD
     static displayName = 'App'
+=======
+  constructor(props) {
+    super(props)
+    this.state = {
+      isShowActivityEntry: 0,
+    }
+  }
+
+  static displayName = 'App'
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
 
     previousLocation = {pathname: '/', search: '', hash: ''}
 
@@ -41,6 +52,14 @@ class App extends Component {
 
     firstLoad = true
 
+<<<<<<< HEAD
+    componentWillMount() {
+        let url = window.location.href;
+        if(url.indexOf('ccode')) {
+            cookie.set('ccode', getParam('ccode'), { expires: 1, domain: '.julyedu.com', path: '/' })
+        }
+    }
+=======
   componentWillMount() {
     let url = window.location.href;
     if(url.indexOf('ccode')) {
@@ -50,6 +69,13 @@ class App extends Component {
 
   componentDidMount() {
     this.getStage()
+    this.umengStatistic()
+    //平台信息
+    !getParam('version') && cookie.set('plat', '5', {domain: '.julyedu.com'})
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
+
+    componentDidMount() {
+        this.getStage()
 
         this.umengStatistic()
         //平台信息
@@ -78,6 +104,7 @@ class App extends Component {
             if (cookie.get('uid') && this.props.user.hasError) {
                 this.getUser()
             }
+<<<<<<< HEAD
             if (location.pathname === '/passport') {
                 window.localStorage.setItem('binding_redirect', stringify(this.previousLocation))
             }
@@ -112,6 +139,61 @@ class App extends Component {
                 Toast.info(msg, 2)
             }
         })
+=======
+          }
+        }
+      } else {
+        this.removeShareCodeCookie()
+      }
+    })
+  }
+
+  // 获取宝箱阶段
+  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 = () => {
+    // 友盟统计
+    const script = document.createElement('script')
+    script.src = 'https://s22.cnzz.com/z_stat.php?id=1265696973&web_id=1265696973'
+    script.language = 'JavaScript'
+    document.body.appendChild(script)
+  }
+
+  removeShareCodeCookie = () => {
+    cookie.remove('share_code', {path: '/', domain: '.julyedu.com'})
+  }
+
+  setNavigationRecord = (location, action) => {
+    const {pathname, search, hash} = location
+    let isLastRecord = location.pathname === (this.records.length && this.records[this.records.length - 1].pathname)
+    let needHistoryMutation = location.pathname !== this.previousLocation.pathname
+
+    switch (action) {
+      case 'POP':
+        if (needHistoryMutation) {
+          this.firstLoad ? this.records.push({pathname, search, hash}) : this.records.pop()
+        } else {
+          this.records[this.records.length - 1] = location
+        }
+        break
+      case 'REPLACE':
+        this.records.length > 1 && (this.records[this.records.length - 1] = {pathname, search, hash})
+        break
+      default:
+        !isLastRecord && this.records.push({pathname, search, hash})
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
     }
 
     umengStatistic = () => {
@@ -307,6 +389,22 @@ class App extends Component {
             }
         </>
     }
+<<<<<<< HEAD
+=======
+  }
+
+  render() {
+    return <>
+      <Routes/>
+      {
+        !!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>
+      }
+    </>
+  }
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
 }
 
 export default compose(

src/components/Index/index.scss

@@ -634,7 +634,10 @@
   background-color: #F3F4F8;
 }
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 674ec0b1fa7d72561a2e9f51ca5b5cc74371c4d8
 .index-box ~ .year19-index {
   display: none;
 }
\ No newline at end of file

src/components/activity/newyear-2019/common/user-bullet-screen/index.js

@@ -16,6 +16,7 @@ class UserBulletScreen extends Component {
     this.getBulletScreenData(true)
   }
 
+  componentWillUpdate() {}
   componentWillUnmount() {
     this.swiper && this.swiper.destroy()
   }

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

@@ -81,7 +81,27 @@ class Landing extends Component {
   }
 
   createMeta = (title,dec,imgname) => {
-    let meta = document.createElement('meta');
+    let meta = document.createElement('meta')
+    meta.setAttribute('name', 'description')
+    meta.setAttribute('itemprop', 'description')
+    meta.setAttribute('content', '这里是自定义分享的描述')
+
+    let meta2 = document.createElement('meta');
+    meta2.setAttribute('itemprop', 'name')
+    meta2.setAttribute('content', '这里是标题')
+
+    let meta3 = document.createElement('meta');
+    meta3.setAttribute('itemprop', 'image')
+    meta3.setAttribute('content', 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png')
+
+    let head = document.getElementsByTagName('head')[0];
+    head.appendChild(meta);
+    head.appendChild(meta2);
+    head.appendChild(meta3);
+  }
+
+  createMeta = (title, dec, imgname) => {
+    let meta = document.createElement('meta')
     meta.setAttribute('name', 'description')
     meta.setAttribute('itemprop', 'description')
     meta.setAttribute('content', dec)

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

@@ -102,7 +102,28 @@ export default class index extends Component {
 
     // 获取未拆宝箱数量
     getRemovable = (removable, currentOpenId) => {
-
+        this.setState({
+            removable,
+            currentOpenId,
+        })
+    }
+    // 跳转到我的宝箱列表页
+    toBoxList = () => {
+        const isLogin = !this.props.user.hasError
+        const {currentOpenId} = this.state;
+        let search = '';
+        if(currentOpenId) {
+            search = `?id=${currentOpenId}`;
+        }
+        if (isLogin) {
+            this.props.history.push(`/year/yearTreasure${search}`)
+        } else {
+            if (!getParam('version')) {
+                this.props.history.push('/passport/login')
+            } else {
+                SendMessageToApp("toLogin")
+            }
+        }
     }
 
     // 获取活动以及宝箱的阶段

src/components/video/video-catalog/video-catalog.scss

@@ -57,12 +57,12 @@
 
     .title {
         display: inline-block;
-        width: 50%;
+        width: 66%;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
         font-size: $font_14;
-        margin-right: 26px;
+        margin-right: 12px;
     }
 
     .duration {