文案修改打包

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

-!function(e){function r(r){for(var n,a,c=r[0],d=r[1],f=r[2],s=0,l=[];s<c.length;s++)a=c[s],o[a]&&l.push(o[a][0]),o[a]=0;for(n in d)Object.prototype.hasOwnProperty.call(d,n)&&(e[n]=d[n]);for(u&&u(r);l.length;)l.shift()();return i.push.apply(i,f||[]),t()}function t(){for(var e,r=0;r<i.length;r++){for(var t=i[r],n=!0,a=1;a<t.length;a++){var d=t[a];0!==o[d]&&(n=!1)}n&&(i.splice(r--,1),e=c(c.s=t[0]))}return e}var n={},a={34:0},o={34:0},i=[];function c(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var r=[];a[e]?r.push(a[e]):0!==a[e]&&{2:1,3:1,4:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,13:1,15: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,29:1,30:1,31:1,32:1,33:1,35:1,36:1,37:1,38:1,39:1,40:1,42:1,43:1,44:1,45:1,46:1,47:1}[e]&&r.push(a[e]=new Promise(function(r,t){for(var n="mrstatic/css/"+({4:"Activity",5:"BargainMiddlePage",6:"Classify",7:"Country",8:"CourseList",9:"DrawDocument",10:"Examination",11:"Invite",12:"MyEdit",13:"Order",14:"Orderinfo",15:"PayOrder",16:"Preferential",17:"SearchResult",18:"ShareCourse",19:"ShopCart",20:"aist-share",21:"blessing-getPrize",22:"blessing-preheat",23:"blessing-rank",24:"coupons",25:"deposit-order",26:"deposit-pay-order",27:"detail",29:"myorders",30:"newyear-2019-landing",31:"newyear-yearIndex",32:"prize-winner-list",33:"purchased",35:"search",36:"shareposter",37:"study",38:"system-notices",39:"togroup",40:"video"}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"d9fb2595",3:"5ed15c7e",4:"a74b39fb",5:"fc53c3d0",6:"f2f19957",7:"16a64650",8:"85889ffd",9:"2e7d81ca",10:"f2cc3163",11:"a74b39fb",12:"31d6cfe0",13:"35f475a1",14:"31d6cfe0",15:"e5315535",16:"b279d085",17:"bb7c3056",18:"278ad3b1",19:"3a4dbb7a",20:"ca49c1cb",21:"951fd27d",22:"f16046f0",23:"b92d0394",24:"ff6280ad",25:"6f3a01ca",26:"039d87dd",27:"e318ce59",29:"3c41b358",30:"f51c79d9",31:"f006689e",32:"55e46fc9",33:"dd7556e0",35:"fab97849",36:"f09a5959",37:"b002c899",38:"08df3d15",39:"49988cae",40:"1f56370b",42:"50547718",43:"2471f477",44:"0bb224f2",45:"ecbb6f9a",46:"18c88f1f",47:"eb90513f"}[e]+".chunk.css",o=c.p+n,i=document.getElementsByTagName("link"),d=0;d<i.length;d++){var f=(u=i[d]).getAttribute("data-href")||u.getAttribute("href");if("stylesheet"===u.rel&&(f===n||f===o))return r()}var s=document.getElementsByTagName("style");for(d=0;d<s.length;d++){var u;if((f=(u=s[d]).getAttribute("data-href"))===n||f===o)return r()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=r,l.onerror=function(r){var n=r&&r.target&&r.target.src||o,i=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");i.request=n,delete a[e],l.parentNode.removeChild(l),t(i)},l.href=o,document.getElementsByTagName("head")[0].appendChild(l)}).then(function(){a[e]=0}));var t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise(function(r,n){t=o[e]=[r,n]});r.push(t[2]=n);var i,d=document.createElement("script");d.charset="utf-8",d.timeout=120,c.nc&&d.setAttribute("nonce",c.nc),d.src=function(e){return c.p+"mrstatic/js/"+({4:"Activity",5:"BargainMiddlePage",6:"Classify",7:"Country",8:"CourseList",9:"DrawDocument",10:"Examination",11:"Invite",12:"MyEdit",13:"Order",14:"Orderinfo",15:"PayOrder",16:"Preferential",17:"SearchResult",18:"ShareCourse",19:"ShopCart",20:"aist-share",21:"blessing-getPrize",22:"blessing-preheat",23:"blessing-rank",24:"coupons",25:"deposit-order",26:"deposit-pay-order",27:"detail",29:"myorders",30:"newyear-2019-landing",31:"newyear-yearIndex",32:"prize-winner-list",33:"purchased",35:"search",36:"shareposter",37:"study",38:"system-notices",39:"togroup",40:"video"}[e]||e)+"."+{0:"b10ff0c0",1:"1f6f7e8d",2:"20d812c7",3:"8a29b502",4:"18a190eb",5:"14123d42",6:"b1df8cc8",7:"5cf684c9",8:"34861d84",9:"36f3a7f4",10:"19ee9f02",11:"0b5b5a4f",12:"b2640394",13:"1a1ef2d0",14:"61a73f31",15:"fec4c498",16:"25d20b41",17:"cfce13e0",18:"6a15c8a8",19:"9686142e",20:"23651e74",21:"20f3bb2a",22:"216591ab",23:"9a88cde3",24:"502b6284",25:"5808a539",26:"4b200da8",27:"e4fa14fa",29:"3113d077",30:"c9ba6c25",31:"ad9c99dc",32:"63687f61",33:"2bba0bda",35:"941032bf",36:"9a0b00d8",37:"d3ec9cb4",38:"7f350fe2",39:"796a80ad",40:"72f1b799",42:"93b5c631",43:"8a6b5308",44:"5846c94e",45:"94dd8b4e",46:"5e9e1e20",47:"a2871adb"}[e]+".chunk.js"}(e),i=function(r){d.onerror=d.onload=null,clearTimeout(f);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src,i=new Error("Loading chunk "+e+" failed.\n("+n+": "+a+")");i.type=n,i.request=a,t[1](i)}o[e]=void 0}};var f=setTimeout(function(){i({type:"timeout",target:d})},12e4);d.onerror=d.onload=i,document.head.appendChild(d)}return Promise.all(r)},c.m=e,c.c=n,c.d=function(e,r,t){c.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},c.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},c.t=function(e,r){if(1&r&&(e=c(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(c.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)c.d(t,n,function(r){return e[r]}.bind(null,n));return t},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/",c.oe=function(e){throw console.error(e),e};var d=window.webpackJsonp=window.webpackJsonp||[],f=d.push.bind(d);d.push=r,d=d.slice();for(var s=0;s<d.length;s++)r(d[s]);var u=f;t()}([]);
-//# sourceMappingURL=runtime~main.61535315.js.map
\ No newline at end of file

build/precache-manifest.68a96c934bf543800b8739eb46a09110.js → build/precache-manifest.1c95d28b9e159d2668ff588bb5de7ebd.js

@@ -16,16 +16,16 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/2.b06103f8.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": "8f5ab6addc1f2f265642",
     "url": "/mrstatic/js/3.8a29b502.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": "7be4513aa3e351a61572",
@@ -224,20 +224,20 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/myorders.47dd4e2c.chunk.js"
   },
   {
-    "revision": "7c1eb57115e1c292e2f8",
-    "url": "/mrstatic/js/runtime~main.35b3c1f7.js"
+    "revision": "929592a268085ae66270",
+    "url": "/mrstatic/js/runtime~main.66c05432.js"
   },
   {
-    "revision": "f9a50347bd0ea46dc7f2",
-    "url": "/mrstatic/js/newyear-2019-landing.1d8b0627.chunk.js"
+    "revision": "29e76af5140ba9299631",
+    "url": "/mrstatic/js/newyear-2019-landing.c628c835.chunk.js"
   },
   {
     "revision": "9d38ab981045fa723f91",
     "url": "/mrstatic/js/purchased.64f7b1cd.chunk.js"
   },
   {
-    "revision": "a4915a4c417ce959ae3b",
-    "url": "/mrstatic/js/newyear-yearIndex.c0284fd3.chunk.js"
+    "revision": "5020f9056fe910e68ed2",
+    "url": "/mrstatic/js/newyear-yearIndex.eda0662e.chunk.js"
   },
   {
     "revision": "444ce2b117b3f280a9ff",
@@ -296,11 +296,11 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/myorders.6e68e44c.chunk.css"
   },
   {
-    "revision": "a4915a4c417ce959ae3b",
+    "revision": "5020f9056fe910e68ed2",
     "url": "/mrstatic/css/newyear-yearIndex.7d15b505.chunk.css"
   },
   {
-    "revision": "f9a50347bd0ea46dc7f2",
+    "revision": "29e76af5140ba9299631",
     "url": "/mrstatic/css/newyear-2019-landing.5880b6ee.chunk.css"
   },
   {
@@ -412,7 +412,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/2.cd9397b1.chunk.css"
   },
   {
-    "revision": "44ecdf2fea842fbd5487965040b9749e",
+    "revision": "152d1bb4ff6b8d4855f6116221c0dd61",
     "url": "/index.html"
   }
 ];
\ No newline at end of file

build/service-worker.js

@@ -14,11 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
 
 importScripts(
-<<<<<<< HEAD
-  "/precache-manifest.68a96c934bf543800b8739eb46a09110.js"
-=======
-  "/precache-manifest.86adf2ae5ecc423de6885a1ec801b666.js"
->>>>>>> beceab7fa39fdd2679ddb65dc7fa037587f4b29f
+  "/precache-manifest.1c95d28b9e159d2668ff588bb5de7ebd.js"
 );
 
 workbox.clientsClaim();