pull

build/asset-manifest.json

@@ -56,8 +56,8 @@
   "aist-share.js": "/mrstatic/js/aist-share.3a04b022.chunk.js",
   "aist-share.js.map": "/mrstatic/js/aist-share.3a04b022.chunk.js.map",
   "blessing-preheat.css": "/mrstatic/css/blessing-preheat.3ea8b615.chunk.css",
-  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.6dff43d3.chunk.js",
-  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.6dff43d3.chunk.js.map",
+  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.cadf03f8.chunk.js",
+  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.cadf03f8.chunk.js.map",
   "blessing-rank.css": "/mrstatic/css/blessing-rank.edf00bf8.chunk.css",
   "blessing-rank.js": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js",
   "blessing-rank.js.map": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js.map",
@@ -85,8 +85,8 @@
   "purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css",
   "purchased.js": "/mrstatic/js/purchased.a38723f4.chunk.js",
   "purchased.js.map": "/mrstatic/js/purchased.a38723f4.chunk.js.map",
-  "runtime~main.js": "/mrstatic/js/runtime~main.867a9d58.js",
-  "runtime~main.js.map": "/mrstatic/js/runtime~main.867a9d58.js.map",
+  "runtime~main.js": "/mrstatic/js/runtime~main.5ec96459.js",
+  "runtime~main.js.map": "/mrstatic/js/runtime~main.5ec96459.js.map",
   "search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
   "search.js": "/mrstatic/js/search.589ab26a.chunk.js",
   "search.js.map": "/mrstatic/js/search.589ab26a.chunk.js.map",
@@ -166,6 +166,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.adc2d73282fb1dc223c86cdc4ce50684.js": "/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js",
+  "precache-manifest.bf695b0aa51af9b9f75a41f029dae49e.js": "/precache-manifest.bf695b0aa51af9b9f75a41f029dae49e.js",
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

build/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js → build/precache-manifest.bf695b0aa51af9b9f75a41f029dae49e.js

@@ -16,16 +16,16 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/2.f02a0573.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": "f8b11e0088ed6e17f173",
     "url": "/mrstatic/js/Activity.73c8f0a9.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": "9a7afeee0f7f7550064e",
@@ -148,8 +148,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/38.6484232f.chunk.js"
   },
   {
-    "revision": "dfdbc575880c062a3a79",
-    "url": "/mrstatic/js/blessing-preheat.6dff43d3.chunk.js"
+    "revision": "83a5af51afdd360c41be",
+    "url": "/mrstatic/js/blessing-preheat.cadf03f8.chunk.js"
   },
   {
     "revision": "ce643559cbe26713d628",
@@ -208,8 +208,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/myorders.5b24e8bb.chunk.js"
   },
   {
-    "revision": "6230249f57b7cc4a91dc",
-    "url": "/mrstatic/js/runtime~main.867a9d58.js"
+    "revision": "0f28b58d9266965af554",
+    "url": "/mrstatic/js/runtime~main.5ec96459.js"
   },
   {
     "revision": "480dec355e65b21ce336",
@@ -288,7 +288,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/38.bff100af.chunk.css"
   },
   {
-    "revision": "dfdbc575880c062a3a79",
+    "revision": "83a5af51afdd360c41be",
     "url": "/mrstatic/css/blessing-preheat.3ea8b615.chunk.css"
   },
   {
@@ -372,7 +372,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/2.bf839917.chunk.css"
   },
   {
-    "revision": "d55f7bf9048a9672b9d46014caa7f175",
+    "revision": "a0a69dac4a231aea01b0727ed6e80a40",
     "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.adc2d73282fb1dc223c86cdc4ce50684.js"
+  "/precache-manifest.bf695b0aa51af9b9f75a41f029dae49e.js"
 );
 
 workbox.clientsClaim();

src/components/blessingPreheat/ReserveCourse/index.js

@@ -62,9 +62,35 @@ class ReserveCourse extends Component {
         }
     }
     // 立即付尾款
-    expandPaywk = (courseId, day) => {
+    expandPaywk = (courseId, time,day) => {
+        const {user, history} = this.props;
+        const uid = user && user.data && user.data.uid;
+        if (!uid) {
+            if (!getParam('version')) {
+                this.props.history.push('/passport/login')
+            } else {
+                SendMessageToApp("toLogin");
+            }
+
+        } else {
+            let timeStamp = Date.parse(new Date()) / 1000;
+            if (timeStamp >= time) {
+                if (!getParam('version')) {
+                    this.props.history.push(
+                        '/final-deposit-order?source=1',
+                        {
+                            id: courseId,
+                            sourcenum: 1
+                        }
+                    )
+                } else {
+                    SendMessageToApp("TailMoney");
+                }
+            } else {
                 Toast.info("付尾款时间将在" + day + "开启", 2);
             }
+        }
+    }
     // 去学习
     tostudy = (courseId) => {
         if (!getParam('version')) {
@@ -138,7 +164,7 @@ function CourseList(props) {
                                     {
                                         item.is_buy === 1 &&
                                         <button className="to-expand-buy2"
-                                                onClick={() => expandPaywk(item.course_id, item.final_start_time)}>立即付尾款</button>
+                                                onClick={() => expandPaywk(item.course_id, item.start_timestamp,item.final_start_time)}>立即付尾款</button>
                                     }
                                     {
                                         item.is_buy === 2 &&