Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu

build/asset-manifest.json

 {
-  "BargainMiddlePage.css": "/static/css/BargainMiddlePage.5654b0f2.chunk.css",
-  "BargainMiddlePage.js": "/static/js/BargainMiddlePage.5d9a1888.chunk.js",
-  "BargainMiddlePage.js.map": "/static/js/BargainMiddlePage.5d9a1888.chunk.js.map",
+  "BargainMiddlePage.css": "/static/css/BargainMiddlePage.f15334d9.chunk.css",
+  "BargainMiddlePage.js": "/static/js/BargainMiddlePage.1d2df9b1.chunk.js",
+  "BargainMiddlePage.js.map": "/static/js/BargainMiddlePage.1d2df9b1.chunk.js.map",
   "Classify.css": "/static/css/Classify.6f1b147b.chunk.css",
   "Classify.js": "/static/js/Classify.63329319.chunk.js",
   "Classify.js.map": "/static/js/Classify.63329319.chunk.js.map",
@@ -12,15 +12,15 @@
   "DrawDocument.js": "/static/js/DrawDocument.947fa78f.chunk.js",
   "DrawDocument.js.map": "/static/js/DrawDocument.947fa78f.chunk.js.map",
   "Examination.css": "/static/css/Examination.02475a25.chunk.css",
-  "Examination.js": "/static/js/Examination.7713915d.chunk.js",
-  "Examination.js.map": "/static/js/Examination.7713915d.chunk.js.map",
+  "Examination.js": "/static/js/Examination.ebfa34d0.chunk.js",
+  "Examination.js.map": "/static/js/Examination.ebfa34d0.chunk.js.map",
   "MyEdit.js": "/static/js/MyEdit.98497c0f.chunk.js",
   "MyEdit.js.map": "/static/js/MyEdit.98497c0f.chunk.js.map",
   "Order.css": "/static/css/Order.5199031c.chunk.css",
-  "Order.js": "/static/js/Order.0b41ac28.chunk.js",
-  "Order.js.map": "/static/js/Order.0b41ac28.chunk.js.map",
-  "Orderinfo.js": "/static/js/Orderinfo.1d26f717.chunk.js",
-  "Orderinfo.js.map": "/static/js/Orderinfo.1d26f717.chunk.js.map",
+  "Order.js": "/static/js/Order.25a1b5a9.chunk.js",
+  "Order.js.map": "/static/js/Order.25a1b5a9.chunk.js.map",
+  "Orderinfo.js": "/static/js/Orderinfo.6b507931.chunk.js",
+  "Orderinfo.js.map": "/static/js/Orderinfo.6b507931.chunk.js.map",
   "PayOrder.css": "/static/css/PayOrder.4a91788c.chunk.css",
   "PayOrder.js": "/static/js/PayOrder.8f7c5463.chunk.js",
   "PayOrder.js.map": "/static/js/PayOrder.8f7c5463.chunk.js.map",
@@ -28,34 +28,34 @@
   "Preferential.js": "/static/js/Preferential.061171dd.chunk.js",
   "Preferential.js.map": "/static/js/Preferential.061171dd.chunk.js.map",
   "SearchResult.css": "/static/css/SearchResult.d246922c.chunk.css",
-  "SearchResult.js": "/static/js/SearchResult.d3f64477.chunk.js",
-  "SearchResult.js.map": "/static/js/SearchResult.d3f64477.chunk.js.map",
+  "SearchResult.js": "/static/js/SearchResult.09d41b8d.chunk.js",
+  "SearchResult.js.map": "/static/js/SearchResult.09d41b8d.chunk.js.map",
   "ShopCart.css": "/static/css/ShopCart.f39ca42e.chunk.css",
-  "ShopCart.js": "/static/js/ShopCart.535850f6.chunk.js",
-  "ShopCart.js.map": "/static/js/ShopCart.535850f6.chunk.js.map",
+  "ShopCart.js": "/static/js/ShopCart.a97f6c51.chunk.js",
+  "ShopCart.js.map": "/static/js/ShopCart.a97f6c51.chunk.js.map",
   "aist-share.css": "/static/css/aist-share.01bc9663.chunk.css",
   "aist-share.js": "/static/js/aist-share.062aaeb3.chunk.js",
   "aist-share.js.map": "/static/js/aist-share.062aaeb3.chunk.js.map",
   "coupons.css": "/static/css/coupons.c48c0144.chunk.css",
-  "coupons.js": "/static/js/coupons.32d91de9.chunk.js",
-  "coupons.js.map": "/static/js/coupons.32d91de9.chunk.js.map",
+  "coupons.js": "/static/js/coupons.70722e88.chunk.js",
+  "coupons.js.map": "/static/js/coupons.70722e88.chunk.js.map",
   "detail.css": "/static/css/detail.1970e6cf.chunk.css",
-  "detail.js": "/static/js/detail.e7658232.chunk.js",
-  "detail.js.map": "/static/js/detail.e7658232.chunk.js.map",
+  "detail.js": "/static/js/detail.1b85edeb.chunk.js",
+  "detail.js.map": "/static/js/detail.1b85edeb.chunk.js.map",
   "main.css": "/static/css/main.95f34d95.chunk.css",
-  "main.js": "/static/js/main.03d12cb9.chunk.js",
-  "main.js.map": "/static/js/main.03d12cb9.chunk.js.map",
+  "main.js": "/static/js/main.b454b49f.chunk.js",
+  "main.js.map": "/static/js/main.b454b49f.chunk.js.map",
   "myorders.css": "/static/css/myorders.1dbd49e2.chunk.css",
   "myorders.js": "/static/js/myorders.c38a691f.chunk.js",
   "myorders.js.map": "/static/js/myorders.c38a691f.chunk.js.map",
   "purchased.css": "/static/css/purchased.a14c858f.chunk.css",
   "purchased.js": "/static/js/purchased.a499871a.chunk.js",
   "purchased.js.map": "/static/js/purchased.a499871a.chunk.js.map",
-  "runtime~main.js": "/static/js/runtime~main.280838a5.js",
-  "runtime~main.js.map": "/static/js/runtime~main.280838a5.js.map",
+  "runtime~main.js": "/static/js/runtime~main.4fbb8ee2.js",
+  "runtime~main.js.map": "/static/js/runtime~main.4fbb8ee2.js.map",
   "search.css": "/static/css/search.59d9773d.chunk.css",
-  "search.js": "/static/js/search.a10701e0.chunk.js",
-  "search.js.map": "/static/js/search.a10701e0.chunk.js.map",
+  "search.js": "/static/js/search.5e8dfb79.chunk.js",
+  "search.js.map": "/static/js/search.5e8dfb79.chunk.js.map",
   "shareposter.css": "/static/css/shareposter.728e4385.chunk.css",
   "shareposter.js": "/static/js/shareposter.6f0b8364.chunk.js",
   "shareposter.js.map": "/static/js/shareposter.6f0b8364.chunk.js.map",
@@ -63,19 +63,19 @@
   "study.js": "/static/js/study.3d4d0ff0.chunk.js",
   "study.js.map": "/static/js/study.3d4d0ff0.chunk.js.map",
   "togroup.css": "/static/css/togroup.acc61e40.chunk.css",
-  "togroup.js": "/static/js/togroup.a76a3571.chunk.js",
-  "togroup.js.map": "/static/js/togroup.a76a3571.chunk.js.map",
+  "togroup.js": "/static/js/togroup.07524052.chunk.js",
+  "togroup.js.map": "/static/js/togroup.07524052.chunk.js.map",
   "video.css": "/static/css/video.0984720e.chunk.css",
-  "video.js": "/static/js/video.95c64771.chunk.js",
-  "video.js.map": "/static/js/video.95c64771.chunk.js.map",
-  "static/css/24.62b6292a.chunk.css": "/static/css/24.62b6292a.chunk.css",
-  "static/js/24.86a86b36.chunk.js": "/static/js/24.86a86b36.chunk.js",
-  "static/js/24.86a86b36.chunk.js.map": "/static/js/24.86a86b36.chunk.js.map",
+  "video.js": "/static/js/video.d741a89f.chunk.js",
+  "video.js.map": "/static/js/video.d741a89f.chunk.js.map",
+  "static/css/24.354507f6.chunk.css": "/static/css/24.354507f6.chunk.css",
+  "static/js/24.89161bc2.chunk.js": "/static/js/24.89161bc2.chunk.js",
+  "static/js/24.89161bc2.chunk.js.map": "/static/js/24.89161bc2.chunk.js.map",
   "static/js/25.403aae65.chunk.js": "/static/js/25.403aae65.chunk.js",
   "static/js/25.403aae65.chunk.js.map": "/static/js/25.403aae65.chunk.js.map",
   "static/css/26.b8256974.chunk.css": "/static/css/26.b8256974.chunk.css",
-  "static/js/26.f7b80738.chunk.js": "/static/js/26.f7b80738.chunk.js",
-  "static/js/26.f7b80738.chunk.js.map": "/static/js/26.f7b80738.chunk.js.map",
+  "static/js/26.08c4cdc9.chunk.js": "/static/js/26.08c4cdc9.chunk.js",
+  "static/js/26.08c4cdc9.chunk.js.map": "/static/js/26.08c4cdc9.chunk.js.map",
   "static/js/27.33496196.chunk.js": "/static/js/27.33496196.chunk.js",
   "static/js/27.33496196.chunk.js.map": "/static/js/27.33496196.chunk.js.map",
   "static/css/28.415f421f.chunk.css": "/static/css/28.415f421f.chunk.css",
@@ -91,15 +91,15 @@
   "static/js/31.29632a76.chunk.js": "/static/js/31.29632a76.chunk.js",
   "static/js/31.29632a76.chunk.js.map": "/static/js/31.29632a76.chunk.js.map",
   "index.html": "/index.html",
-  "precache-manifest.d239563289da0861567f067bf3c9bfba.js": "/precache-manifest.d239563289da0861567f067bf3c9bfba.js",
+  "precache-manifest.b6c2761d26f41dffac274afe17f4f57a.js": "/precache-manifest.b6c2761d26f41dffac274afe17f4f57a.js",
   "service-worker.js": "/service-worker.js",
-  "static/css/24.62b6292a.chunk.css.map": "/static/css/24.62b6292a.chunk.css.map",
+  "static/css/24.354507f6.chunk.css.map": "/static/css/24.354507f6.chunk.css.map",
   "static/css/26.b8256974.chunk.css.map": "/static/css/26.b8256974.chunk.css.map",
   "static/css/28.415f421f.chunk.css.map": "/static/css/28.415f421f.chunk.css.map",
   "static/css/29.fd1b61f1.chunk.css.map": "/static/css/29.fd1b61f1.chunk.css.map",
   "static/css/30.44620a41.chunk.css.map": "/static/css/30.44620a41.chunk.css.map",
   "static/css/31.ffbe0560.chunk.css.map": "/static/css/31.ffbe0560.chunk.css.map",
-  "static/css/BargainMiddlePage.5654b0f2.chunk.css.map": "/static/css/BargainMiddlePage.5654b0f2.chunk.css.map",
+  "static/css/BargainMiddlePage.f15334d9.chunk.css.map": "/static/css/BargainMiddlePage.f15334d9.chunk.css.map",
   "static/css/Classify.6f1b147b.chunk.css.map": "/static/css/Classify.6f1b147b.chunk.css.map",
   "static/css/CourseList.2444c6c2.chunk.css.map": "/static/css/CourseList.2444c6c2.chunk.css.map",
   "static/css/DrawDocument.58508f31.chunk.css.map": "/static/css/DrawDocument.58508f31.chunk.css.map",

build/precache-manifest.d239563289da0861567f067bf3c9bfba.js → build/precache-manifest.b6c2761d26f41dffac274afe17f4f57a.js

@@ -4,8 +4,8 @@ self.__precacheManifest = [
     "url": "/static/js/purchased.a499871a.chunk.js"
   },
   {
-    "revision": "84d0b00913d03f35573c",
-    "url": "/static/css/BargainMiddlePage.5654b0f2.chunk.css"
+    "revision": "cf1f224bed3b5613a125",
+    "url": "/static/css/BargainMiddlePage.f15334d9.chunk.css"
   },
   {
     "revision": "8ed48f8c643e0607c130",
@@ -32,28 +32,28 @@ self.__precacheManifest = [
     "url": "/static/js/DrawDocument.947fa78f.chunk.js"
   },
   {
-    "revision": "30c318d1da1d9abc7ba8",
+    "revision": "c3936165b876df233f1a",
     "url": "/static/css/Examination.02475a25.chunk.css"
   },
   {
-    "revision": "30c318d1da1d9abc7ba8",
-    "url": "/static/js/Examination.7713915d.chunk.js"
+    "revision": "c3936165b876df233f1a",
+    "url": "/static/js/Examination.ebfa34d0.chunk.js"
   },
   {
     "revision": "40460c5f4b9ff77d6ea8",
     "url": "/static/js/MyEdit.98497c0f.chunk.js"
   },
   {
-    "revision": "c107ddc6959c00798d5b",
+    "revision": "aa2d804e5a7e177b19f8",
     "url": "/static/css/Order.5199031c.chunk.css"
   },
   {
-    "revision": "c107ddc6959c00798d5b",
-    "url": "/static/js/Order.0b41ac28.chunk.js"
+    "revision": "aa2d804e5a7e177b19f8",
+    "url": "/static/js/Order.25a1b5a9.chunk.js"
   },
   {
-    "revision": "0dd078c3fbf39dae783d",
-    "url": "/static/js/Orderinfo.1d26f717.chunk.js"
+    "revision": "dc1b3394b3f766f90d77",
+    "url": "/static/js/Orderinfo.6b507931.chunk.js"
   },
   {
     "revision": "930526b494ab1856ed52",
@@ -72,20 +72,20 @@ self.__precacheManifest = [
     "url": "/static/js/Preferential.061171dd.chunk.js"
   },
   {
-    "revision": "e22365a7fb23f396ca1b",
+    "revision": "98b6b0268f52ddce209e",
     "url": "/static/css/SearchResult.d246922c.chunk.css"
   },
   {
-    "revision": "e22365a7fb23f396ca1b",
-    "url": "/static/js/SearchResult.d3f64477.chunk.js"
+    "revision": "98b6b0268f52ddce209e",
+    "url": "/static/js/SearchResult.09d41b8d.chunk.js"
   },
   {
-    "revision": "7246dd67665a94170e3d",
+    "revision": "b4c75fb19bc6754779fc",
     "url": "/static/css/ShopCart.f39ca42e.chunk.css"
   },
   {
-    "revision": "7246dd67665a94170e3d",
-    "url": "/static/js/ShopCart.535850f6.chunk.js"
+    "revision": "b4c75fb19bc6754779fc",
+    "url": "/static/js/ShopCart.a97f6c51.chunk.js"
   },
   {
     "revision": "a20563fc89034b94e000",
@@ -96,28 +96,28 @@ self.__precacheManifest = [
     "url": "/static/js/aist-share.062aaeb3.chunk.js"
   },
   {
-    "revision": "cf8afa2f3533f004b7d0",
+    "revision": "0e5d8939254c58566a05",
     "url": "/static/css/coupons.c48c0144.chunk.css"
   },
   {
-    "revision": "cf8afa2f3533f004b7d0",
-    "url": "/static/js/coupons.32d91de9.chunk.js"
+    "revision": "0e5d8939254c58566a05",
+    "url": "/static/js/coupons.70722e88.chunk.js"
   },
   {
-    "revision": "e2798ae62bff3805b524",
+    "revision": "80011d26eabf1b50cb32",
     "url": "/static/css/detail.1970e6cf.chunk.css"
   },
   {
-    "revision": "e2798ae62bff3805b524",
-    "url": "/static/js/detail.e7658232.chunk.js"
+    "revision": "80011d26eabf1b50cb32",
+    "url": "/static/js/detail.1b85edeb.chunk.js"
   },
   {
-    "revision": "d098e46d3a97eb5e191c",
+    "revision": "6637776104f87be1bdfc",
     "url": "/static/css/main.95f34d95.chunk.css"
   },
   {
-    "revision": "d098e46d3a97eb5e191c",
-    "url": "/static/js/main.03d12cb9.chunk.js"
+    "revision": "6637776104f87be1bdfc",
+    "url": "/static/js/main.b454b49f.chunk.js"
   },
   {
     "revision": "254ae316a5dbb7a0531c",
@@ -132,20 +132,20 @@ self.__precacheManifest = [
     "url": "/static/css/purchased.a14c858f.chunk.css"
   },
   {
-    "revision": "84d0b00913d03f35573c",
-    "url": "/static/js/BargainMiddlePage.5d9a1888.chunk.js"
+    "revision": "cf1f224bed3b5613a125",
+    "url": "/static/js/BargainMiddlePage.1d2df9b1.chunk.js"
   },
   {
-    "revision": "d493d176fac486f57c1c",
-    "url": "/static/js/runtime~main.280838a5.js"
+    "revision": "5d4276619b747286207b",
+    "url": "/static/js/runtime~main.4fbb8ee2.js"
   },
   {
-    "revision": "1f851421d43b507e18c7",
+    "revision": "f3551abeda11e1e25522",
     "url": "/static/css/search.59d9773d.chunk.css"
   },
   {
-    "revision": "1f851421d43b507e18c7",
-    "url": "/static/js/search.a10701e0.chunk.js"
+    "revision": "f3551abeda11e1e25522",
+    "url": "/static/js/search.5e8dfb79.chunk.js"
   },
   {
     "revision": "c595d30f9a79307c2722",
@@ -164,28 +164,28 @@ self.__precacheManifest = [
     "url": "/static/js/study.3d4d0ff0.chunk.js"
   },
   {
-    "revision": "2ffb9d003c3055f1d432",
+    "revision": "498e2f5bd8aa81955d91",
     "url": "/static/css/togroup.acc61e40.chunk.css"
   },
   {
-    "revision": "2ffb9d003c3055f1d432",
-    "url": "/static/js/togroup.a76a3571.chunk.js"
+    "revision": "498e2f5bd8aa81955d91",
+    "url": "/static/js/togroup.07524052.chunk.js"
   },
   {
-    "revision": "8553d198eda7e14905f5",
+    "revision": "ed08e747fbdffcf5bb81",
     "url": "/static/css/video.0984720e.chunk.css"
   },
   {
-    "revision": "8553d198eda7e14905f5",
-    "url": "/static/js/video.95c64771.chunk.js"
+    "revision": "ed08e747fbdffcf5bb81",
+    "url": "/static/js/video.d741a89f.chunk.js"
   },
   {
     "revision": "80011994e30adf599e5f47fcc81bc06d",
     "url": "/static/media/progress-share-bg.80011994.png"
   },
   {
-    "revision": "180a22e9d692cab3c9ee",
-    "url": "/static/js/24.86a86b36.chunk.js"
+    "revision": "2c722a9b8d54faed9ba3",
+    "url": "/static/js/24.89161bc2.chunk.js"
   },
   {
     "revision": "c36733f1a53eb4beb646",
@@ -196,8 +196,8 @@ self.__precacheManifest = [
     "url": "/static/media/kanjia_cg_icon.81a489ac.png"
   },
   {
-    "revision": "7b817d00ddfc66ae158e",
-    "url": "/static/js/26.f7b80738.chunk.js"
+    "revision": "fb3ef5fadc81227cb0b8",
+    "url": "/static/js/26.08c4cdc9.chunk.js"
   },
   {
     "revision": "2725cf82a2822752e44f",
@@ -252,15 +252,15 @@ self.__precacheManifest = [
     "url": "/static/css/28.415f421f.chunk.css"
   },
   {
-    "revision": "7b817d00ddfc66ae158e",
+    "revision": "fb3ef5fadc81227cb0b8",
     "url": "/static/css/26.b8256974.chunk.css"
   },
   {
-    "revision": "180a22e9d692cab3c9ee",
-    "url": "/static/css/24.62b6292a.chunk.css"
+    "revision": "2c722a9b8d54faed9ba3",
+    "url": "/static/css/24.354507f6.chunk.css"
   },
   {
-    "revision": "69551d209c5785f55a505c204ebd2a90",
+    "revision": "ad2af9c120f637df813ca2013b46fbb1",
     "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.d239563289da0861567f067bf3c9bfba.js"
+  "/precache-manifest.b6c2761d26f41dffac274afe17f4f57a.js"
 );
 
 workbox.clientsClaim();

build/static/js/Examination.7713915d.chunk.js → build/static/js/Examination.ebfa34d0.chunk.js

-(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{1181:function(e,t,a){"use strict";a.r(t);var n=a(7),s=a(8),c=a(10),r=a(9),o=a(11),i=a(0),l=a.n(i),m=(a(902),a(15)),u=a.n(m),h=a(30),p=(a(903),function(){return l.a.createElement("div",{className:"open-app"},l.a.createElement("p",{className:"left"},"\u66f4\u591a\u8bd5\u9898\u8bf7\u524d\u5f80App\u67e5\u770b"),l.a.createElement(h.a,{className:"right"},"\u5728APP\u6253\u5f00"))}),w=a(4),d=a(904);a.d(t,"default",function(){return f});var f=function(e){function t(e){var a;return Object(n.a)(this,t),(a=Object(c.a)(this,Object(r.a)(t).call(this,e))).showAnswer=function(){a.setState({isShowAnswer:!a.state.isShowAnswer})},a.state={isShowAnswer:!1,questionData:{}},a}return Object(o.a)(t,e),Object(s.a)(t,[{key:"componentDidMount",value:function(){var e=this;w.c.get("".concat(API.home,"/m/dailyQuestion")).then(function(t){var a=t.data,n=a.data;if(200===a.code){var s=d.Object.assign(n,{analysis:n.analysis.length>0?n.analysis.split("\n"):[]});e.setState({questionData:s})}})}},{key:"render",value:function(){var e=this.state,t=e.questionData,a=t.ques,n=t.type_id,s=t.options,c=t.analysis,r=t.category,o=e.isShowAnswer;return l.a.createElement("div",{className:"examination"},l.a.createElement(h.e,{title:"\u6bcf\u65e5\u4e00\u9898",arrow:!0,cart:!1}),l.a.createElement("div",{className:"question-container"},l.a.createElement("div",{className:"topic"},l.a.createElement(h.h,{className:"category-tag"},r),l.a.createElement("span",{dangerouslySetInnerHTML:{__html:a}})),1===n&&l.a.createElement(E,{className:"options",options:s,showCorrect:this.state.isShowAnswer}),!o&&l.a.createElement("div",{className:"show-answer",onClick:this.showAnswer},l.a.createElement("span",null,"\u67e5\u770b\u89e3\u6790",l.a.createElement("i",{className:"iconfont iconiconfront-69"})))),o&&l.a.createElement(v,{content:c,isShowAnswer:!0}),l.a.createElement(p,null))}}]),t}(i.PureComponent),E=l.a.memo(function(e){var t=e.options,a=e.showCorrect;return l.a.createElement("ul",{className:"options"},t.map(function(e,t){return l.a.createElement("li",{key:t,className:u()("option",{active:1===e.is_ans&&a})},l.a.createElement("span",{className:"alphabet"},String.fromCharCode(65+t)),e.des)}))}),v=l.a.memo(function(e){var t=e.content,a=e.isShowAnswer;return l.a.createElement("div",{className:u()("answer",{scale:a})},l.a.createElement("p",{className:"legend"},"\u89e3\u6790"),t.length>0&&t.map(function(e,t){return l.a.createElement("p",{key:t,className:"content",dangerouslySetInnerHTML:{__html:e}})}))})},902:function(e,t,a){},903:function(e,t,a){}}]);
-//# sourceMappingURL=Examination.7713915d.chunk.js.map
+(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{1179:function(e,t,a){"use strict";a.r(t);var n=a(7),s=a(8),c=a(10),r=a(9),o=a(11),i=a(0),l=a.n(i),m=(a(902),a(15)),u=a.n(m),h=a(30),p=(a(903),function(){return l.a.createElement("div",{className:"open-app"},l.a.createElement("p",{className:"left"},"\u66f4\u591a\u8bd5\u9898\u8bf7\u524d\u5f80App\u67e5\u770b"),l.a.createElement(h.a,{className:"right"},"\u5728APP\u6253\u5f00"))}),w=a(4),d=a(904);a.d(t,"default",function(){return f});var f=function(e){function t(e){var a;return Object(n.a)(this,t),(a=Object(c.a)(this,Object(r.a)(t).call(this,e))).showAnswer=function(){a.setState({isShowAnswer:!a.state.isShowAnswer})},a.state={isShowAnswer:!1,questionData:{}},a}return Object(o.a)(t,e),Object(s.a)(t,[{key:"componentDidMount",value:function(){var e=this;w.c.get("".concat(API.home,"/m/dailyQuestion")).then(function(t){var a=t.data,n=a.data;if(200===a.code){var s=d.Object.assign(n,{analysis:n.analysis.length>0?n.analysis.split("\n"):[]});e.setState({questionData:s})}})}},{key:"render",value:function(){var e=this.state,t=e.questionData,a=t.ques,n=t.type_id,s=t.options,c=t.analysis,r=t.category,o=e.isShowAnswer;return l.a.createElement("div",{className:"examination"},l.a.createElement(h.e,{title:"\u6bcf\u65e5\u4e00\u9898",arrow:!0,cart:!1}),l.a.createElement("div",{className:"question-container"},l.a.createElement("div",{className:"topic"},l.a.createElement(h.h,{className:"category-tag"},r),l.a.createElement("span",{dangerouslySetInnerHTML:{__html:a}})),1===n&&l.a.createElement(E,{className:"options",options:s,showCorrect:this.state.isShowAnswer}),!o&&l.a.createElement("div",{className:"show-answer",onClick:this.showAnswer},l.a.createElement("span",null,"\u67e5\u770b\u89e3\u6790",l.a.createElement("i",{className:"iconfont iconiconfront-69"})))),o&&l.a.createElement(v,{content:c,isShowAnswer:!0}),l.a.createElement(p,null))}}]),t}(i.PureComponent),E=l.a.memo(function(e){var t=e.options,a=e.showCorrect;return l.a.createElement("ul",{className:"options"},t.map(function(e,t){return l.a.createElement("li",{key:t,className:u()("option",{active:1===e.is_ans&&a})},l.a.createElement("span",{className:"alphabet"},String.fromCharCode(65+t)),e.des)}))}),v=l.a.memo(function(e){var t=e.content,a=e.isShowAnswer;return l.a.createElement("div",{className:u()("answer",{scale:a})},l.a.createElement("p",{className:"legend"},"\u89e3\u6790"),t.length>0&&t.map(function(e,t){return l.a.createElement("p",{key:t,className:"content",dangerouslySetInnerHTML:{__html:e}})}))})},902:function(e,t,a){},903:function(e,t,a){}}]);
+//# sourceMappingURL=Examination.ebfa34d0.chunk.js.map
\ No newline at end of file

build/static/js/Orderinfo.1d26f717.chunk.js → build/static/js/Orderinfo.6b507931.chunk.js

-(window.webpackJsonp=window.webpackJsonp||[]).push([[7],{1166:function(e,n,a){"use strict";a.r(n);var o=a(7),r=a(8),t=a(10),l=a(9),i=a(11),c=(a(43),a(14)),s=a.n(c),p=a(23),u=(a(155),a(75)),d=a.n(u),f=(a(1137),a(1139)),h=a.n(f),m=(a(1140),a(1142)),v=a.n(m),b=a(0),g=a.n(b),q=a(19),E=a(30),j=a(4),y=Object(q.e)({mapPropsToValues:function(e){return Object(p.a)({},e.userInfo)},validate:function(e,n){return{}},handleSubmit:function(e,n){var a=e.real_name,o=e.cellphone,r=e.qq;if(a)if(0!=="".concat(a).replace(/\s+/g,"").length)if(o)if(/1\d{10}/g.test("".concat(o).replace(/\s+/g,"")))if(r)if(/\d{5,}/g.test(r)){var t=0;if(n.props.userInfo){var l=n.props.userInfo;l.real_name===a&&(t+=1),l.cellphone===o&&(t+=1),l.qq===r&&(t+=1)}var i="/order";n.props.userInfo.id&&(i=i+"?id="+n.props.userInfo.id),console.log(e),3!==t?j.c.post("".concat(API["base-api"],"/m/order/saveUserInfo"),{real_name:e.real_name,cellphone:"".concat(e.cellphone).replace(/\s+/g,""),qq:e.qq}).then(function(a){console.log(a),200===a.data.errno?(s.a.info("\u4fdd\u5b58\u6210\u529f\uff01",void 0,void 0,!1),n.props.history.replace(i,Object(p.a)({},e))):s.a.info(a.data.msg,void 0,void 0,!1)}):n.props.history.replace(i,Object(p.a)({},e))}else s.a.info("\u8bf7\u8f93\u5165\u6b63\u786eQQ\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165QQ\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u624b\u673a\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u624b\u673a\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u59d3\u540d\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u59d3\u540d\uff01",void 0,void 0,!1)}})(function(e){var n=e.values,a=(e.errors,e.touched,e.setFieldValue),o=(e.handleBlur,e.handleSubmit);e.isSubmitting;return g.a.createElement("form",null,g.a.createElement(v.a,{clear:!0,name:"real_name",onChange:function(e){return a("real_name",e)},placeholder:"\u8bf7\u8f93\u5165\u60a8\u7684\u771f\u5b9e\u59d3\u540d",value:n.real_name},"\u59d3\u540d"),g.a.createElement(v.a,{clear:!0,type:"phone",name:"cellphone",placeholder:"\u8bf7\u8f93\u5165\u60a8\u7684\u624b\u673a\u53f7\u7801",onChange:function(e){return a("cellphone",e)},value:n.cellphone},"\u7535\u8bdd"),g.a.createElement(v.a,{clear:!0,name:"qq",placeholder:"\u8bf7\u8f93\u5165\u60a8\u7684QQ\u53f7\u7801",maxLength:"15",onChange:function(e){return a("qq",e)},value:n.qq},"QQ"),g.a.createElement("div",{style:{marginTop:"21px"}},g.a.createElement(d.a,null,g.a.createElement(h.a,{type:"primary",onClick:o},"\u786e\u8ba4"))))}),O=function(e){function n(e){return Object(o.a)(this,n),Object(t.a)(this,Object(l.a)(n).call(this,e))}return Object(i.a)(n,e),Object(r.a)(n,[{key:"render",value:function(){return g.a.createElement("div",null,g.a.createElement(E.e,{title:"\u62a5\u540d\u4fe1\u606f",arrow:!0}),g.a.createElement(y,{history:this.props.history,userInfo:this.props.location.state}))}}]),n}(b.Component);n.default=O}}]);
-//# sourceMappingURL=Orderinfo.1d26f717.chunk.js.map
+(window.webpackJsonp=window.webpackJsonp||[]).push([[7],{1166:function(e,n,a){"use strict";a.r(n);var o=a(7),r=a(8),t=a(10),l=a(9),i=a(11),c=(a(43),a(14)),s=a.n(c),p=a(22),u=(a(155),a(75)),d=a.n(u),f=(a(1137),a(1139)),h=a.n(f),m=(a(1140),a(1142)),v=a.n(m),b=a(0),g=a.n(b),q=a(19),E=a(30),j=a(4),y=Object(q.e)({mapPropsToValues:function(e){return Object(p.a)({},e.userInfo)},validate:function(e,n){return{}},handleSubmit:function(e,n){var a=e.real_name,o=e.cellphone,r=e.qq;if(a)if(0!=="".concat(a).replace(/\s+/g,"").length)if(o)if(/1\d{10}/g.test("".concat(o).replace(/\s+/g,"")))if(r)if(/\d{5,}/g.test(r)){var t=0;if(n.props.userInfo){var l=n.props.userInfo;l.real_name===a&&(t+=1),l.cellphone===o&&(t+=1),l.qq===r&&(t+=1)}var i="/order";n.props.userInfo.id&&(i=i+"?id="+n.props.userInfo.id),console.log(e),3!==t?j.c.post("".concat(API["base-api"],"/m/order/saveUserInfo"),{real_name:e.real_name,cellphone:"".concat(e.cellphone).replace(/\s+/g,""),qq:e.qq}).then(function(a){console.log(a),200===a.data.errno?(s.a.info("\u4fdd\u5b58\u6210\u529f\uff01",void 0,void 0,!1),n.props.history.replace(i,Object(p.a)({},e))):s.a.info(a.data.msg,void 0,void 0,!1)}):n.props.history.replace(i,Object(p.a)({},e))}else s.a.info("\u8bf7\u8f93\u5165\u6b63\u786eQQ\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165QQ\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u624b\u673a\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u624b\u673a\u53f7\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u59d3\u540d\uff01",void 0,void 0,!1);else s.a.info("\u8bf7\u8f93\u5165\u59d3\u540d\uff01",void 0,void 0,!1)}})(function(e){var n=e.values,a=(e.errors,e.touched,e.setFieldValue),o=(e.handleBlur,e.handleSubmit);e.isSubmitting;return g.a.createElement("form",null,g.a.createElement(v.a,{clear:!0,name:"real_name",onChange:function(e){return a("real_name",e)},placeholder:"\u8bf7\u8f93\u5165\u60a8\u7684\u771f\u5b9e\u59d3\u540d",value:n.real_name},"\u59d3\u540d"),g.a.createElement(v.a,{clear:!0,type:"phone",name:"cellphone",placeholder:"\u8bf7\u8f93\u5165\u60a8\u7684\u624b\u673a\u53f7\u7801",onChange:function(e){return a("cellphone",e)},value:n.cellphone},"\u7535\u8bdd"),g.a.createElement(v.a,{clear:!0,name:"qq",placeholder:"\u8bf7\u8f93\u5165\u60a8\u7684QQ\u53f7\u7801",maxLength:"15",onChange:function(e){return a("qq",e)},value:n.qq},"QQ"),g.a.createElement("div",{style:{marginTop:"21px"}},g.a.createElement(d.a,null,g.a.createElement(h.a,{type:"primary",onClick:o},"\u786e\u8ba4"))))}),O=function(e){function n(e){return Object(o.a)(this,n),Object(t.a)(this,Object(l.a)(n).call(this,e))}return Object(i.a)(n,e),Object(r.a)(n,[{key:"render",value:function(){return g.a.createElement("div",null,g.a.createElement(E.e,{title:"\u62a5\u540d\u4fe1\u606f",arrow:!0}),g.a.createElement(y,{history:this.props.history,userInfo:this.props.location.state}))}}]),n}(b.Component);n.default=O}}]);
+//# sourceMappingURL=Orderinfo.6b507931.chunk.js.map
\ No newline at end of file

build/static/js/runtime~main.280838a5.js

-!function(e){function r(r){for(var n,a,c=r[0],f=r[1],u=r[2],d=0,l=[];d<c.length;d++)a=c[d],o[a]&&l.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(s&&s(r);l.length;)l.shift()();return i.push.apply(i,u||[]),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 f=t[a];0!==o[f]&&(n=!1)}n&&(i.splice(r--,1),e=c(c.s=t[0]))}return e}var n={},a={18:0},o={18: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]&&{0:1,1:1,2:1,3:1,4:1,6:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,16:1,17:1,19:1,20:1,21:1,22:1,23:1,26:1,28:1,29:1,30:1,31:1}[e]&&r.push(a[e]=new Promise(function(r,t){for(var n="static/css/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"5654b0f2",1:"6f1b147b",2:"2444c6c2",3:"58508f31",4:"02475a25",5:"31d6cfe0",6:"5199031c",7:"31d6cfe0",8:"4a91788c",9:"aced1689",10:"d246922c",11:"f39ca42e",12:"01bc9663",13:"c48c0144",14:"1970e6cf",16:"1dbd49e2",17:"a14c858f",19:"59d9773d",20:"728e4385",21:"8e1bd2b5",22:"acc61e40",23:"0984720e",25:"31d6cfe0",26:"b8256974",27:"31d6cfe0",28:"415f421f",29:"fd1b61f1",30:"44620a41",31:"ffbe0560"}[e]+".chunk.css",o=c.p+n,i=document.getElementsByTagName("link"),f=0;f<i.length;f++){var u=(s=i[f]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(u===n||u===o))return r()}var d=document.getElementsByTagName("style");for(f=0;f<d.length;f++){var s;if((u=(s=d[f]).getAttribute("data-href"))===n||u===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,f=document.createElement("script");f.charset="utf-8",f.timeout=120,c.nc&&f.setAttribute("nonce",c.nc),f.src=function(e){return c.p+"static/js/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"5d9a1888",1:"63329319",2:"f13847f4",3:"947fa78f",4:"7713915d",5:"98497c0f",6:"0b41ac28",7:"1d26f717",8:"8f7c5463",9:"061171dd",10:"d3f64477",11:"535850f6",12:"062aaeb3",13:"32d91de9",14:"e7658232",16:"c38a691f",17:"a499871a",19:"a10701e0",20:"6f0b8364",21:"3d4d0ff0",22:"a76a3571",23:"95c64771",25:"403aae65",26:"f7b80738",27:"33496196",28:"88036717",29:"42d40869",30:"b92758f1",31:"29632a76"}[e]+".chunk.js"}(e),i=function(r){f.onerror=f.onload=null,clearTimeout(u);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 u=setTimeout(function(){i({type:"timeout",target:f})},12e4);f.onerror=f.onload=i,document.head.appendChild(f)}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 f=window.webpackJsonp=window.webpackJsonp||[],u=f.push.bind(f);f.push=r,f=f.slice();for(var d=0;d<f.length;d++)r(f[d]);var s=u;t()}([]);
-//# sourceMappingURL=runtime~main.280838a5.js.map
\ No newline at end of file

build/static/js/runtime~main.4fbb8ee2.js

+!function(e){function r(r){for(var n,a,i=r[0],f=r[1],u=r[2],d=0,l=[];d<i.length;d++)a=i[d],o[a]&&l.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(s&&s(r);l.length;)l.shift()();return c.push.apply(c,u||[]),t()}function t(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,a=1;a<t.length;a++){var f=t[a];0!==o[f]&&(n=!1)}n&&(c.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},a={18:0},o={18:0},c=[];function i(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,i),t.l=!0,t.exports}i.e=function(e){var r=[];a[e]?r.push(a[e]):0!==a[e]&&{0:1,1:1,2:1,3:1,4:1,6:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,16:1,17:1,19:1,20:1,21:1,22:1,23:1,26:1,28:1,29:1,30:1,31:1}[e]&&r.push(a[e]=new Promise(function(r,t){for(var n="static/css/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"f15334d9",1:"6f1b147b",2:"2444c6c2",3:"58508f31",4:"02475a25",5:"31d6cfe0",6:"5199031c",7:"31d6cfe0",8:"4a91788c",9:"aced1689",10:"d246922c",11:"f39ca42e",12:"01bc9663",13:"c48c0144",14:"1970e6cf",16:"1dbd49e2",17:"a14c858f",19:"59d9773d",20:"728e4385",21:"8e1bd2b5",22:"acc61e40",23:"0984720e",25:"31d6cfe0",26:"b8256974",27:"31d6cfe0",28:"415f421f",29:"fd1b61f1",30:"44620a41",31:"ffbe0560"}[e]+".chunk.css",o=i.p+n,c=document.getElementsByTagName("link"),f=0;f<c.length;f++){var u=(s=c[f]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(u===n||u===o))return r()}var d=document.getElementsByTagName("style");for(f=0;f<d.length;f++){var s;if((u=(s=d[f]).getAttribute("data-href"))===n||u===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,c=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");c.request=n,delete a[e],l.parentNode.removeChild(l),t(c)},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 c,f=document.createElement("script");f.charset="utf-8",f.timeout=120,i.nc&&f.setAttribute("nonce",i.nc),f.src=function(e){return i.p+"static/js/"+({0:"BargainMiddlePage",1:"Classify",2:"CourseList",3:"DrawDocument",4:"Examination",5:"MyEdit",6:"Order",7:"Orderinfo",8:"PayOrder",9:"Preferential",10:"SearchResult",11:"ShopCart",12:"aist-share",13:"coupons",14:"detail",16:"myorders",17:"purchased",19:"search",20:"shareposter",21:"study",22:"togroup",23:"video"}[e]||e)+"."+{0:"1d2df9b1",1:"63329319",2:"f13847f4",3:"947fa78f",4:"ebfa34d0",5:"98497c0f",6:"25a1b5a9",7:"6b507931",8:"8f7c5463",9:"061171dd",10:"09d41b8d",11:"a97f6c51",12:"062aaeb3",13:"70722e88",14:"1b85edeb",16:"c38a691f",17:"a499871a",19:"5e8dfb79",20:"6f0b8364",21:"3d4d0ff0",22:"07524052",23:"d741a89f",25:"403aae65",26:"08c4cdc9",27:"33496196",28:"88036717",29:"42d40869",30:"b92758f1",31:"29632a76"}[e]+".chunk.js"}(e),c=function(r){f.onerror=f.onload=null,clearTimeout(u);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,c=new Error("Loading chunk "+e+" failed.\n("+n+": "+a+")");c.type=n,c.request=a,t[1](c)}o[e]=void 0}};var u=setTimeout(function(){c({type:"timeout",target:f})},12e4);f.onerror=f.onload=c,document.head.appendChild(f)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var f=window.webpackJsonp=window.webpackJsonp||[],u=f.push.bind(f);f.push=r,f=f.slice();for(var d=0;d<f.length;d++)r(f[d]);var s=u;t()}([]);
+//# sourceMappingURL=runtime~main.4fbb8ee2.js.map
\ No newline at end of file

src/App.js

@@ -23,17 +23,38 @@ import './assets/font/iconfont.css';
 
 class App extends Component {
 
+    previousLocation = {
+        ...{
+            state: {
+                from:
+                    {
+                        pathname: this.props.location.pathname,
+                        search: this.props.location.search,
+                        hash: this.props.location.hash
+                    }
+            }
+        },
+        ...this.props.location
+    }
 
     componentDidMount() {
         //平台信息
         cookie.set('plat', '5', {domain: '.julyedu.com'})
 
+        console.log(this.props.location);
 
         this.props.startFetchUser()
         http.get(`${API.home}/m/user_info`).then(res => {
             this.props.setCurrentUser(this.transformUser(res))
         })
 
+        const {history} = this.props
+        history.listen(location => {
+            if (location.pathname.startsWith('/passport')) {
+                location.state = {from: this.previousLocation};
+            }
+        })
+
 
         //微信
         let code = getParam('code')
@@ -46,7 +67,6 @@ class App extends Component {
                     if (data.errno == 200) {
                         if (data.data['is_bind_mobile']) {
                             window.location.assign(data.data.url)
-
                         } else {
                             let user = this.transformWxUser(res)
                             let {role, uid, token} = data.data
@@ -67,6 +87,13 @@ class App extends Component {
 
     }
 
+    componentDidUpdate() {
+        const {location} = this.props
+        this.previousLocation = location.pathname.startsWith('/passport') ?
+            this.previousLocation.pathname === '/' ? location : this.previousLocation : location
+    }
+
+
     transformUser = res => {
         let payload
         if (res.data.code === 200) {

src/components/detail/index.js

@@ -99,6 +99,11 @@ class Detail extends Component {
             })
         }
     }
+    showSingleBox = () => {
+        this.setState({
+            singleBox: true
+        })
+    }
 
     // componentWillReceiveProps(nextProps) {
     //     let _this = this;
@@ -303,7 +308,8 @@ class Detail extends Component {
 
                 {/*单集购买弹窗*/}
                 <Single
-                    singleBox={this.state.singleBox} 
+                    singleBox={this.state.singleBox}
+                    showSingleBox={this.showSingleBox}
                     boxHide={this.boxHide} 
                     data={this.state.singMess}
                     vcourseId={course_info.v_course_id}

src/components/passport/accountLogin/index.js

@@ -77,7 +77,7 @@ const formikConfig = {
         }).then(res => {
             if (!res.hasError) {
                 let {from} = props.location.state || {from: {pathname: '/', search: ''}}
-                history.replace({pathname: from.pathname, search: from.search})
+                history.replace({pathname: from.pathname, search: from.search || ''})
             } else {
                 Toast.info(res.msg, 2, null, false)
             }

src/components/passport/index.js

@@ -19,10 +19,14 @@ import wechat from './wechat.png'
 
 class Passport extends Component {
 
-    redirect_url = location.protocol + '//' + location.hostname
+    redirectURL = '/'
 
     constructor(props) {
         super(props);
+        const {location} = props
+        const {pathname, search, hash} = location
+        const {from} = location.state || {from: {pathname: pathname, search: search, hash: hash}}
+        this.redirectURL = window.location.origin + from.pathname + from.search + from.hash
         this.state = {
             loginWays: [
                 {
@@ -32,17 +36,17 @@ class Passport extends Component {
                 {
                     logo: wechat,
                     text: '微信',
-                    url: 'https://www.baidu.com'
+                    url: ''
                 },
                 {
                     logo: qq,
                     text: 'QQ',
-                    url: `${API["passport-api"]}/mob/qqlogin?redirect_url=https://m.julyedu.com`
+                    url: `${API["passport-api"]}/mob/qqlogin?redirect_url=${this.redirectURL}`
                 },
                 {
                     logo: sina,
                     text: '新浪',
-                    url: `${API['passport-api']}/mob/sinalogin?redirect_url=${this.redirect_url}`
+                    url: `${API['passport-api']}/mob/sinalogin?redirect_url=${this.redirectURL}`
                 },
             ]
         }
@@ -51,11 +55,12 @@ class Passport extends Component {
 
     componentDidMount() {
         this.routeWhenUserLoggedIn()
-
     }
 
     componentDidUpdate() {
         this.routeWhenUserLoggedIn()
+        // console.log(this.props.location);
+
     }
 
 

src/components/passport/login/index.js

@@ -32,9 +32,9 @@ class Login extends Component {
                 history.push('/passport/account-login', location.state)
                 break;
             case '微信':
-                let {from} = location.state || {from: {pathname: '/'}}
+                let {from} = location.state || {from: {pathname: '/', search: '', hash: ''}}
 
-                const redirectURI = window.location.origin + from.pathname
+                const redirectURI = window.location.origin + from.pathname + from.search + from.hash
 
                 window.location.assign(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=${encodeURIComponent(redirectURI)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`)
                 break;