拉取新内容

build/asset-manifest.json

@@ -9,6 +9,7 @@
   "mrstatic/css/3.fd1b61f1.chunk.css": "/mrstatic/css/3.fd1b61f1.chunk.css",
   "mrstatic/js/3.8a29b502.chunk.js": "/mrstatic/js/3.8a29b502.chunk.js",
   "mrstatic/js/3.8a29b502.chunk.js.map": "/mrstatic/js/3.8a29b502.chunk.js.map",
+<<<<<<< HEAD
   "Activity.css": "/mrstatic/css/Activity.fe3f3793.chunk.css",
   "Activity.js": "/mrstatic/js/Activity.6a1aaa10.chunk.js",
   "Activity.js.map": "/mrstatic/js/Activity.6a1aaa10.chunk.js.map",
@@ -121,6 +122,120 @@
   "mrstatic/js/41.217f3731.chunk.js": "/mrstatic/js/41.217f3731.chunk.js",
   "mrstatic/js/41.217f3731.chunk.js.map": "/mrstatic/js/41.217f3731.chunk.js.map",
   "mrstatic/css/42.d82f523f.chunk.css": "/mrstatic/css/42.d82f523f.chunk.css",
+=======
+  "Activity.css": "/mrstatic/css/Activity.a74b39fb.chunk.css",
+  "Activity.js": "/mrstatic/js/Activity.18a190eb.chunk.js",
+  "Activity.js.map": "/mrstatic/js/Activity.18a190eb.chunk.js.map",
+  "BargainMiddlePage.css": "/mrstatic/css/BargainMiddlePage.fc53c3d0.chunk.css",
+  "BargainMiddlePage.js": "/mrstatic/js/BargainMiddlePage.14123d42.chunk.js",
+  "BargainMiddlePage.js.map": "/mrstatic/js/BargainMiddlePage.14123d42.chunk.js.map",
+  "Classify.css": "/mrstatic/css/Classify.f2f19957.chunk.css",
+  "Classify.js": "/mrstatic/js/Classify.b1df8cc8.chunk.js",
+  "Classify.js.map": "/mrstatic/js/Classify.b1df8cc8.chunk.js.map",
+  "Country.css": "/mrstatic/css/Country.16a64650.chunk.css",
+  "Country.js": "/mrstatic/js/Country.5cf684c9.chunk.js",
+  "Country.js.map": "/mrstatic/js/Country.5cf684c9.chunk.js.map",
+  "CourseList.css": "/mrstatic/css/CourseList.85889ffd.chunk.css",
+  "CourseList.js": "/mrstatic/js/CourseList.34861d84.chunk.js",
+  "CourseList.js.map": "/mrstatic/js/CourseList.34861d84.chunk.js.map",
+  "DrawDocument.css": "/mrstatic/css/DrawDocument.2e7d81ca.chunk.css",
+  "DrawDocument.js": "/mrstatic/js/DrawDocument.36f3a7f4.chunk.js",
+  "DrawDocument.js.map": "/mrstatic/js/DrawDocument.36f3a7f4.chunk.js.map",
+  "Examination.css": "/mrstatic/css/Examination.f2cc3163.chunk.css",
+  "Examination.js": "/mrstatic/js/Examination.19ee9f02.chunk.js",
+  "Examination.js.map": "/mrstatic/js/Examination.19ee9f02.chunk.js.map",
+  "Invite.css": "/mrstatic/css/Invite.a74b39fb.chunk.css",
+  "Invite.js": "/mrstatic/js/Invite.0b5b5a4f.chunk.js",
+  "Invite.js.map": "/mrstatic/js/Invite.0b5b5a4f.chunk.js.map",
+  "MyEdit.js": "/mrstatic/js/MyEdit.b2640394.chunk.js",
+  "MyEdit.js.map": "/mrstatic/js/MyEdit.b2640394.chunk.js.map",
+  "Order.css": "/mrstatic/css/Order.35f475a1.chunk.css",
+  "Order.js": "/mrstatic/js/Order.1a1ef2d0.chunk.js",
+  "Order.js.map": "/mrstatic/js/Order.1a1ef2d0.chunk.js.map",
+  "Orderinfo.js": "/mrstatic/js/Orderinfo.61a73f31.chunk.js",
+  "Orderinfo.js.map": "/mrstatic/js/Orderinfo.61a73f31.chunk.js.map",
+  "PayOrder.css": "/mrstatic/css/PayOrder.e5315535.chunk.css",
+  "PayOrder.js": "/mrstatic/js/PayOrder.fec4c498.chunk.js",
+  "PayOrder.js.map": "/mrstatic/js/PayOrder.fec4c498.chunk.js.map",
+  "Preferential.css": "/mrstatic/css/Preferential.b279d085.chunk.css",
+  "Preferential.js": "/mrstatic/js/Preferential.25d20b41.chunk.js",
+  "Preferential.js.map": "/mrstatic/js/Preferential.25d20b41.chunk.js.map",
+  "SearchResult.css": "/mrstatic/css/SearchResult.bb7c3056.chunk.css",
+  "SearchResult.js": "/mrstatic/js/SearchResult.cfce13e0.chunk.js",
+  "SearchResult.js.map": "/mrstatic/js/SearchResult.cfce13e0.chunk.js.map",
+  "ShareCourse.css": "/mrstatic/css/ShareCourse.278ad3b1.chunk.css",
+  "ShareCourse.js": "/mrstatic/js/ShareCourse.6a15c8a8.chunk.js",
+  "ShareCourse.js.map": "/mrstatic/js/ShareCourse.6a15c8a8.chunk.js.map",
+  "ShopCart.css": "/mrstatic/css/ShopCart.3a4dbb7a.chunk.css",
+  "ShopCart.js": "/mrstatic/js/ShopCart.9686142e.chunk.js",
+  "ShopCart.js.map": "/mrstatic/js/ShopCart.9686142e.chunk.js.map",
+  "aist-share.css": "/mrstatic/css/aist-share.ca49c1cb.chunk.css",
+  "aist-share.js": "/mrstatic/js/aist-share.23651e74.chunk.js",
+  "aist-share.js.map": "/mrstatic/js/aist-share.23651e74.chunk.js.map",
+  "blessing-getPrize.css": "/mrstatic/css/blessing-getPrize.951fd27d.chunk.css",
+  "blessing-getPrize.js": "/mrstatic/js/blessing-getPrize.20f3bb2a.chunk.js",
+  "blessing-getPrize.js.map": "/mrstatic/js/blessing-getPrize.20f3bb2a.chunk.js.map",
+  "blessing-preheat.css": "/mrstatic/css/blessing-preheat.f16046f0.chunk.css",
+  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.216591ab.chunk.js",
+  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.216591ab.chunk.js.map",
+  "blessing-rank.css": "/mrstatic/css/blessing-rank.b92d0394.chunk.css",
+  "blessing-rank.js": "/mrstatic/js/blessing-rank.9a88cde3.chunk.js",
+  "blessing-rank.js.map": "/mrstatic/js/blessing-rank.9a88cde3.chunk.js.map",
+  "coupons.css": "/mrstatic/css/coupons.ff6280ad.chunk.css",
+  "coupons.js": "/mrstatic/js/coupons.502b6284.chunk.js",
+  "coupons.js.map": "/mrstatic/js/coupons.502b6284.chunk.js.map",
+  "deposit-order.css": "/mrstatic/css/deposit-order.6f3a01ca.chunk.css",
+  "deposit-order.js": "/mrstatic/js/deposit-order.5808a539.chunk.js",
+  "deposit-order.js.map": "/mrstatic/js/deposit-order.5808a539.chunk.js.map",
+  "deposit-pay-order.css": "/mrstatic/css/deposit-pay-order.039d87dd.chunk.css",
+  "deposit-pay-order.js": "/mrstatic/js/deposit-pay-order.4b200da8.chunk.js",
+  "deposit-pay-order.js.map": "/mrstatic/js/deposit-pay-order.4b200da8.chunk.js.map",
+  "detail.css": "/mrstatic/css/detail.e318ce59.chunk.css",
+  "detail.js": "/mrstatic/js/detail.e4fa14fa.chunk.js",
+  "detail.js.map": "/mrstatic/js/detail.e4fa14fa.chunk.js.map",
+  "main.css": "/mrstatic/css/main.aebaefb8.chunk.css",
+  "main.js": "/mrstatic/js/main.5bc8a076.chunk.js",
+  "main.js.map": "/mrstatic/js/main.5bc8a076.chunk.js.map",
+  "myorders.css": "/mrstatic/css/myorders.3c41b358.chunk.css",
+  "myorders.js": "/mrstatic/js/myorders.3113d077.chunk.js",
+  "myorders.js.map": "/mrstatic/js/myorders.3113d077.chunk.js.map",
+  "newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.f51c79d9.chunk.css",
+  "newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.c9ba6c25.chunk.js",
+  "newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.c9ba6c25.chunk.js.map",
+  "newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.f006689e.chunk.css",
+  "newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.ad9c99dc.chunk.js",
+  "newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.ad9c99dc.chunk.js.map",
+  "prize-winner-list.css": "/mrstatic/css/prize-winner-list.55e46fc9.chunk.css",
+  "prize-winner-list.js": "/mrstatic/js/prize-winner-list.63687f61.chunk.js",
+  "prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.63687f61.chunk.js.map",
+  "purchased.css": "/mrstatic/css/purchased.dd7556e0.chunk.css",
+  "purchased.js": "/mrstatic/js/purchased.2bba0bda.chunk.js",
+  "purchased.js.map": "/mrstatic/js/purchased.2bba0bda.chunk.js.map",
+  "runtime~main.js": "/mrstatic/js/runtime~main.61535315.js",
+  "runtime~main.js.map": "/mrstatic/js/runtime~main.61535315.js.map",
+  "search.css": "/mrstatic/css/search.fab97849.chunk.css",
+  "search.js": "/mrstatic/js/search.941032bf.chunk.js",
+  "search.js.map": "/mrstatic/js/search.941032bf.chunk.js.map",
+  "shareposter.css": "/mrstatic/css/shareposter.f09a5959.chunk.css",
+  "shareposter.js": "/mrstatic/js/shareposter.9a0b00d8.chunk.js",
+  "shareposter.js.map": "/mrstatic/js/shareposter.9a0b00d8.chunk.js.map",
+  "study.css": "/mrstatic/css/study.b002c899.chunk.css",
+  "study.js": "/mrstatic/js/study.d3ec9cb4.chunk.js",
+  "study.js.map": "/mrstatic/js/study.d3ec9cb4.chunk.js.map",
+  "system-notices.css": "/mrstatic/css/system-notices.08df3d15.chunk.css",
+  "system-notices.js": "/mrstatic/js/system-notices.7f350fe2.chunk.js",
+  "system-notices.js.map": "/mrstatic/js/system-notices.7f350fe2.chunk.js.map",
+  "togroup.css": "/mrstatic/css/togroup.49988cae.chunk.css",
+  "togroup.js": "/mrstatic/js/togroup.796a80ad.chunk.js",
+  "togroup.js.map": "/mrstatic/js/togroup.796a80ad.chunk.js.map",
+  "video.css": "/mrstatic/css/video.1f56370b.chunk.css",
+  "video.js": "/mrstatic/js/video.72f1b799.chunk.js",
+  "video.js.map": "/mrstatic/js/video.72f1b799.chunk.js.map",
+  "mrstatic/css/41.101ce5f8.chunk.css": "/mrstatic/css/41.101ce5f8.chunk.css",
+  "mrstatic/js/41.80e3375b.chunk.js": "/mrstatic/js/41.80e3375b.chunk.js",
+  "mrstatic/js/41.80e3375b.chunk.js.map": "/mrstatic/js/41.80e3375b.chunk.js.map",
+  "mrstatic/css/42.50547718.chunk.css": "/mrstatic/css/42.50547718.chunk.css",
+>>>>>>> beceab7fa39fdd2679ddb65dc7fa037587f4b29f
   "mrstatic/js/42.93b5c631.chunk.js": "/mrstatic/js/42.93b5c631.chunk.js",
   "mrstatic/js/42.93b5c631.chunk.js.map": "/mrstatic/js/42.93b5c631.chunk.js.map",
   "mrstatic/css/43.6b450e29.chunk.css": "/mrstatic/css/43.6b450e29.chunk.css",
@@ -186,6 +301,10 @@
   "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",
+<<<<<<< HEAD
   "precache-manifest.68a96c934bf543800b8739eb46a09110.js": "/precache-manifest.68a96c934bf543800b8739eb46a09110.js",
+=======
+  "precache-manifest.86adf2ae5ecc423de6885a1ec801b666.js": "/precache-manifest.86adf2ae5ecc423de6885a1ec801b666.js",
+>>>>>>> beceab7fa39fdd2679ddb65dc7fa037587f4b29f
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

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/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.68a96c934bf543800b8739eb46a09110.js"
+=======
+  "/precache-manifest.86adf2ae5ecc423de6885a1ec801b666.js"
+>>>>>>> beceab7fa39fdd2679ddb65dc7fa037587f4b29f
 );
 
 workbox.clientsClaim();

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

@@ -38,6 +38,7 @@ class Landing extends Component {
   componentDidMount() {
     this.fetchPageData()
     window.showFollowAlert = this.remind.bind(this, 'create')
+    document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！'
   }
 
   componentDidUpdate(prevProps) {
@@ -147,9 +148,9 @@ class Landing extends Component {
     const {history} = this.props
     this.joinSuccessPopup && this.joinSuccessPopup.remove()
     if (getParam('version')) {
-      history.push(`/year/yearTreasure?id=${id}&version=${getParam('version')}`)
+      window.location.assign(`https://m.julyedu.com/year/yearTreasure?id=${id}&version=${getParam('version')}`)
     } else {
-      history.push(`/year/yearTreasure?id=${id}`)
+      window.location.assign(`https://m.julyedu.com/year/yearTreasure?id=${id}`)
     }
   }
 
@@ -380,9 +381,9 @@ class Landing extends Component {
   toSquare = () => {
     const {history} = this.props
     if (!getParam('version')) {
-      history.push('/year/yearindex')
+      window.location.assign('https://m.julyedu.com/year/yearindex')
     } else {
-      history.push('/year/yearindex?version=' + getParam('version'))
+      window.location.assign('https://m.julyedu.com/year/yearindex?version=' + getParam('version'))
     }
   }
 

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

@@ -345,9 +345,9 @@ class MyTreasure extends Component {
   handleToInvite = (treasure_code) => {
     const {history} = this.props
     if (getParam('version')) {
-      history.push(`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1&version=${getParam('version')}`)
+      window.location.assign(`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1&version=${getParam('version')}`)
     } else {
-      history.push(`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`)
+      window.location.assign(`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`)
     }
   }
 

src/components/activity/newyear-2019/myTreasure/team.js

@@ -138,8 +138,8 @@ class TreasureTeam extends Component {
             <>
               {
                 is_captain
-                ? <Link className="team-button" to={`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`}>继续邀请队友</Link>
-                : <Link className="team-button" to={`/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=2`}>帮好友完成组队</Link>
+                ? <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=1`}>继续邀请队友</a>
+                : <a className="team-button" href={`https://h5.julyedu.com/activity/newyear-2019/landing?treasure_code=${treasure_code}&origin=2`}>帮好友完成组队</a>
               }
             </>
           }
@@ -176,4 +176,4 @@ class TreasureTeam extends Component {
   }
 }
 
-export default TreasureTeam;
+export default TreasureTeam;
\ No newline at end of file

src/components/activity/newyear-2019/treasure-box/team.js

@@ -102,9 +102,9 @@ class TeamInfo extends Component {
         // 直接跳转
 
         if (!getParam('version')) {
-          this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+          window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
         } else {
-          this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
+          window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
         }
 
       }else{ // 没自己的队伍
@@ -114,9 +114,9 @@ class TeamInfo extends Component {
           if (code === 200) {
             const { treasure_code } = data;
             if (!getParam('version')) {
-              this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+              window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
             } else {
-              this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
+              window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
             }
           } else {
             Toast.info(msg);