solve and build

build/asset-manifest.json

@@ -2,8 +2,8 @@
   "mrstatic/js/0.a1f55c4b.chunk.js": "/mrstatic/js/0.a1f55c4b.chunk.js",
   "mrstatic/js/0.a1f55c4b.chunk.js.map": "/mrstatic/js/0.a1f55c4b.chunk.js.map",
   "mrstatic/css/1.b4627248.chunk.css": "/mrstatic/css/1.b4627248.chunk.css",
-  "mrstatic/js/1.e07f5dff.chunk.js": "/mrstatic/js/1.e07f5dff.chunk.js",
-  "mrstatic/js/1.e07f5dff.chunk.js.map": "/mrstatic/js/1.e07f5dff.chunk.js.map",
+  "mrstatic/js/1.a8d2350b.chunk.js": "/mrstatic/js/1.a8d2350b.chunk.js",
+  "mrstatic/js/1.a8d2350b.chunk.js.map": "/mrstatic/js/1.a8d2350b.chunk.js.map",
   "mrstatic/css/2.1133c967.chunk.css": "/mrstatic/css/2.1133c967.chunk.css",
   "mrstatic/js/2.0fac390d.chunk.js": "/mrstatic/js/2.0fac390d.chunk.js",
   "mrstatic/js/2.0fac390d.chunk.js.map": "/mrstatic/js/2.0fac390d.chunk.js.map",
@@ -14,8 +14,8 @@
   "Activity.js": "/mrstatic/js/Activity.e2fb033f.chunk.js",
   "Activity.js.map": "/mrstatic/js/Activity.e2fb033f.chunk.js.map",
   "BargainMiddlePage.css": "/mrstatic/css/BargainMiddlePage.2a913483.chunk.css",
-  "BargainMiddlePage.js": "/mrstatic/js/BargainMiddlePage.55155992.chunk.js",
-  "BargainMiddlePage.js.map": "/mrstatic/js/BargainMiddlePage.55155992.chunk.js.map",
+  "BargainMiddlePage.js": "/mrstatic/js/BargainMiddlePage.70b7830f.chunk.js",
+  "BargainMiddlePage.js.map": "/mrstatic/js/BargainMiddlePage.70b7830f.chunk.js.map",
   "Classify.css": "/mrstatic/css/Classify.127d35ae.chunk.css",
   "Classify.js": "/mrstatic/js/Classify.8163d312.chunk.js",
   "Classify.js.map": "/mrstatic/js/Classify.8163d312.chunk.js.map",
@@ -81,8 +81,8 @@
   "detail.js": "/mrstatic/js/detail.7bed0938.chunk.js",
   "detail.js.map": "/mrstatic/js/detail.7bed0938.chunk.js.map",
   "main.css": "/mrstatic/css/main.fe158352.chunk.css",
-  "main.js": "/mrstatic/js/main.f04c6995.chunk.js",
-  "main.js.map": "/mrstatic/js/main.f04c6995.chunk.js.map",
+  "main.js": "/mrstatic/js/main.1aea510f.chunk.js",
+  "main.js.map": "/mrstatic/js/main.1aea510f.chunk.js.map",
   "myorders.css": "/mrstatic/css/myorders.841d0cfb.chunk.css",
   "myorders.js": "/mrstatic/js/myorders.d820f269.chunk.js",
   "myorders.js.map": "/mrstatic/js/myorders.d820f269.chunk.js.map",
@@ -90,8 +90,8 @@
   "newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.98ec9529.chunk.js",
   "newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.98ec9529.chunk.js.map",
   "newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.9039f86b.chunk.css",
-  "newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.33e7f15d.chunk.js",
-  "newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.33e7f15d.chunk.js.map",
+  "newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.ed539ef6.chunk.js",
+  "newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.ed539ef6.chunk.js.map",
   "prize-winner-list.css": "/mrstatic/css/prize-winner-list.ce85cb83.chunk.css",
   "prize-winner-list.js": "/mrstatic/js/prize-winner-list.b2af75ba.chunk.js",
   "prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.b2af75ba.chunk.js.map",
@@ -101,8 +101,8 @@
   "python-class.css": "/mrstatic/css/python-class.11408886.chunk.css",
   "python-class.js": "/mrstatic/js/python-class.16892808.chunk.js",
   "python-class.js.map": "/mrstatic/js/python-class.16892808.chunk.js.map",
-  "runtime~main.js": "/mrstatic/js/runtime~main.0bd71cbe.js",
-  "runtime~main.js.map": "/mrstatic/js/runtime~main.0bd71cbe.js.map",
+  "runtime~main.js": "/mrstatic/js/runtime~main.e04599ad.js",
+  "runtime~main.js.map": "/mrstatic/js/runtime~main.e04599ad.js.map",
   "search.css": "/mrstatic/css/search.efa1dd44.chunk.css",
   "search.js": "/mrstatic/js/search.32e22912.chunk.js",
   "search.js.map": "/mrstatic/js/search.32e22912.chunk.js.map",
@@ -200,6 +200,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.fec3bcdf6b702d28e48d2d31eb676e36.js": "/precache-manifest.fec3bcdf6b702d28e48d2d31eb676e36.js",
+  "precache-manifest.a9c32b29f1a91b2b149875e31761e7b1.js": "/precache-manifest.a9c32b29f1a91b2b149875e31761e7b1.js",
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

build/precache-manifest.fec3bcdf6b702d28e48d2d31eb676e36.js → build/precache-manifest.a9c32b29f1a91b2b149875e31761e7b1.js

@@ -4,12 +4,12 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/0.a1f55c4b.chunk.js"
   },
   {
-    "revision": "a7dabd9f48ea4f9983a5",
+    "revision": "a1a1d148267174ebf1df",
     "url": "/mrstatic/css/1.b4627248.chunk.css"
   },
   {
-    "revision": "a7dabd9f48ea4f9983a5",
-    "url": "/mrstatic/js/1.e07f5dff.chunk.js"
+    "revision": "a1a1d148267174ebf1df",
+    "url": "/mrstatic/js/1.a8d2350b.chunk.js"
   },
   {
     "revision": "93a9469320ab8f1207aa",
@@ -36,12 +36,12 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/Activity.e2fb033f.chunk.js"
   },
   {
-    "revision": "0f8edd11262d493695f0",
+    "revision": "857535d150a653ea577d",
     "url": "/mrstatic/css/BargainMiddlePage.2a913483.chunk.css"
   },
   {
-    "revision": "0f8edd11262d493695f0",
-    "url": "/mrstatic/js/BargainMiddlePage.55155992.chunk.js"
+    "revision": "857535d150a653ea577d",
+    "url": "/mrstatic/js/BargainMiddlePage.70b7830f.chunk.js"
   },
   {
     "revision": "f0b41bfba5101e234ba5",
@@ -212,12 +212,12 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/detail.7bed0938.chunk.js"
   },
   {
-    "revision": "15b41b6e87196f5030c7",
+    "revision": "b81256256171a6462592",
     "url": "/mrstatic/css/main.fe158352.chunk.css"
   },
   {
-    "revision": "15b41b6e87196f5030c7",
-    "url": "/mrstatic/js/main.f04c6995.chunk.js"
+    "revision": "b81256256171a6462592",
+    "url": "/mrstatic/js/main.1aea510f.chunk.js"
   },
   {
     "revision": "ca6db278d1e25fb9a210",
@@ -236,12 +236,12 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/newyear-2019-landing.98ec9529.chunk.js"
   },
   {
-    "revision": "035aad16b48ee70b61d9",
+    "revision": "d4f279ae3cf78403c93b",
     "url": "/mrstatic/css/newyear-yearIndex.9039f86b.chunk.css"
   },
   {
-    "revision": "035aad16b48ee70b61d9",
-    "url": "/mrstatic/js/newyear-yearIndex.33e7f15d.chunk.js"
+    "revision": "d4f279ae3cf78403c93b",
+    "url": "/mrstatic/js/newyear-yearIndex.ed539ef6.chunk.js"
   },
   {
     "revision": "36ea4932e27325e68146",
@@ -268,8 +268,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/python-class.16892808.chunk.js"
   },
   {
-    "revision": "b92dac70740dcd1f7ebc",
-    "url": "/mrstatic/js/runtime~main.0bd71cbe.js"
+    "revision": "42e9e752957855b830d5",
+    "url": "/mrstatic/js/runtime~main.e04599ad.js"
   },
   {
     "revision": "178f8550ee9491682d31",
@@ -396,14 +396,14 @@ self.__precacheManifest = [
     "url": "/mrstatic/media/iconfont.7aa984ce.eot"
   },
   {
-    "revision": "e0655d4da66dce391e6b5227b400e037",
-    "url": "/mrstatic/media/iconfont.e0655d4d.woff"
-  },
-  {
     "revision": "258b4b114d3d9be3018cd113b2470a13",
     "url": "/mrstatic/media/iconfont.258b4b11.ttf"
   },
   {
+    "revision": "e0655d4da66dce391e6b5227b400e037",
+    "url": "/mrstatic/media/iconfont.e0655d4d.woff"
+  },
+  {
     "revision": "b9b072e1116fd1830cc8f425dc163a6b",
     "url": "/mrstatic/media/iconfont.b9b072e1.svg"
   },
@@ -416,14 +416,6 @@ self.__precacheManifest = [
     "url": "/mrstatic/media/progress-share-bg.80011994.png"
   },
   {
-    "revision": "79139f6aad350256e151f9f73c226348",
-    "url": "/mrstatic/media/hb_bj.79139f6a.png"
-  },
-  {
-    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
-    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
-  },
-  {
     "revision": "8edaf2ff2566ed17e2dd22cf4f8ad7ae",
     "url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
   },
@@ -432,7 +424,15 @@ self.__precacheManifest = [
     "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
   },
   {
-    "revision": "4526fde2e76908512f3a2ae36e5da4a5",
+    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
+    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
+  },
+  {
+    "revision": "79139f6aad350256e151f9f73c226348",
+    "url": "/mrstatic/media/hb_bj.79139f6a.png"
+  },
+  {
+    "revision": "61b2efcaf7cbba08b94b39bde8951f5c",
     "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.fec3bcdf6b702d28e48d2d31eb676e36.js"
+  "/precache-manifest.a9c32b29f1a91b2b149875e31761e7b1.js"
 );
 
 workbox.clientsClaim();

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

@@ -126,8 +126,8 @@ class YearCourse extends Component {
             if (code === 200) {
                 this.setState({
                     bigcourse: Object.assign({}, bigcourse, {
-                        isMore: data.length > 4 ? true : false,
-                        course: data.length > 4 ? data.filter((item, index) => index < 4) : data,
+                        isMore: false,
+                        course: data,
                         courseList: data,
                     })
                 })
@@ -654,20 +654,20 @@ class YearCourse extends Component {
                                                     <a
                                                         onClick={() => this.toQQque()}
                                                         className="btn big-course"
-                                                    >速抢拼团名额</a>
+                                                    >免费试听</a>
                                                 }
                                             </div>
                                         </CourseItem>
                                     ))
                                 }
                             </div>
-                            {
+                            {/* {
                                 (bigcourse.courseList && bigcourse.courseList.length > 4) &&
                                 <button
                                     className="more-button"
                                     onClick={() => this.handleToMore('bigcourse')}
                                 >{bigcourse.isMore ? '查看更多' : '收起'}</button>
-                            }
+                            } */}
                         </>
                     }
                 </CommonContainer>

src/components/activity/newyear-2019/year-wish/index.js

@@ -18,7 +18,6 @@ class YarnWish extends Component {
     componentDidMount() {
         this.fetchCourse()
         this.getStage()
-        document.title = `七月在线年终大回馈，人气好课免费学，精品课程1分抢！`
     }
 
     componentWillUpdate() {

src/components/bargainMiddlePage/index.js

@@ -68,7 +68,7 @@ class BargainMiddlePage extends Component {
 
     // 获取砍价信息
     getBargainInfo = () => {
-
+        // is_originator 来源，0-PC端扫码 1-M端分享 2-APP端分享
         http.get(`${API.home}/m/bargain/info?bargaincode=${getParam('bargaincode')}&is_originator=${getParam('is_originator')}`).then((res) => {
             if (res.data.code === 200) {
                 this.setState(
@@ -331,7 +331,7 @@ class BargainMiddlePage extends Component {
     // 邀请好友砍价
     shareFriendBargain = () => {
         const { history } = this.props;
-        history.push(`/bargain-middle-page?id=${getParam('id')}&bargaincode=${getParam('bargaincode')}&is_originator=1`)
+        history.push(`/bargain-middle-page?id=${getParam('id')}&bargaincode=${getParam('bargaincode')}&is_originator=1`);
         this.setState({
             isShowOverlay: true,
             status: 7,

src/components/passport/login/index.js

@@ -33,7 +33,7 @@ class Login extends Component {
             hash: ''
         };
         const referrer = document.referrer
-        const redirectURI = referrer ? referrer : window.location.origin + from.pathname + from.search + from.hash;
+        const redirectURI = (!/^https?:\/\/m.julyedu.com\/?$/.test(referrer) && referrer) ? referrer : window.location.origin + from.pathname + from.search + from.hash;
 
         switch (method) {
             case '账号登录':