Commit 942367dd by xuzhenghua

pull

parent 5c626307
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
"Activity.js": "/mrstatic/js/Activity.90216dea.chunk.js", "Activity.js": "/mrstatic/js/Activity.90216dea.chunk.js",
"Activity.js.map": "/mrstatic/js/Activity.90216dea.chunk.js.map", "Activity.js.map": "/mrstatic/js/Activity.90216dea.chunk.js.map",
"BargainMiddlePage.css": "/mrstatic/css/BargainMiddlePage.eb686c74.chunk.css", "BargainMiddlePage.css": "/mrstatic/css/BargainMiddlePage.eb686c74.chunk.css",
"BargainMiddlePage.js": "/mrstatic/js/BargainMiddlePage.631e11d0.chunk.js", "BargainMiddlePage.js": "/mrstatic/js/BargainMiddlePage.a534caac.chunk.js",
"BargainMiddlePage.js.map": "/mrstatic/js/BargainMiddlePage.631e11d0.chunk.js.map", "BargainMiddlePage.js.map": "/mrstatic/js/BargainMiddlePage.a534caac.chunk.js.map",
"Classify.css": "/mrstatic/css/Classify.fb4bedde.chunk.css", "Classify.css": "/mrstatic/css/Classify.fb4bedde.chunk.css",
"Classify.js": "/mrstatic/js/Classify.d0db49da.chunk.js", "Classify.js": "/mrstatic/js/Classify.d0db49da.chunk.js",
"Classify.js.map": "/mrstatic/js/Classify.d0db49da.chunk.js.map", "Classify.js.map": "/mrstatic/js/Classify.d0db49da.chunk.js.map",
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
"purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css", "purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css",
"purchased.js": "/mrstatic/js/purchased.acb5794a.chunk.js", "purchased.js": "/mrstatic/js/purchased.acb5794a.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.acb5794a.chunk.js.map", "purchased.js.map": "/mrstatic/js/purchased.acb5794a.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.50474d92.js", "runtime~main.js": "/mrstatic/js/runtime~main.dcfadff1.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.50474d92.js.map", "runtime~main.js.map": "/mrstatic/js/runtime~main.dcfadff1.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css", "search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.2046a5cc.chunk.js", "search.js": "/mrstatic/js/search.2046a5cc.chunk.js",
"search.js.map": "/mrstatic/js/search.2046a5cc.chunk.js.map", "search.js.map": "/mrstatic/js/search.2046a5cc.chunk.js.map",
...@@ -170,6 +170,6 @@ ...@@ -170,6 +170,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff", "mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png", "mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png", "mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.939c95cf4b3084373abcb356c0001d7b.js": "/precache-manifest.939c95cf4b3084373abcb356c0001d7b.js", "precache-manifest.671525b21ac041a968b7d4acce104cdc.js": "/precache-manifest.671525b21ac041a968b7d4acce104cdc.js",
"service-worker.js": "/service-worker.js" "service-worker.js": "/service-worker.js"
} }
\ No newline at end of file
...@@ -28,8 +28,8 @@ self.__precacheManifest = [ ...@@ -28,8 +28,8 @@ self.__precacheManifest = [
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png" "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
}, },
{ {
"revision": "036ea5b535ae457b129a", "revision": "b8bddae12fb1b793b52d",
"url": "/mrstatic/js/BargainMiddlePage.631e11d0.chunk.js" "url": "/mrstatic/js/BargainMiddlePage.a534caac.chunk.js"
}, },
{ {
"revision": "79139f6aad350256e151f9f73c226348", "revision": "79139f6aad350256e151f9f73c226348",
...@@ -216,8 +216,8 @@ self.__precacheManifest = [ ...@@ -216,8 +216,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.d14b036d.chunk.js" "url": "/mrstatic/js/myorders.d14b036d.chunk.js"
}, },
{ {
"revision": "487251fce976cf6ce2a4", "revision": "873084c617ba9767a112",
"url": "/mrstatic/js/runtime~main.50474d92.js" "url": "/mrstatic/js/runtime~main.dcfadff1.js"
}, },
{ {
"revision": "1b0b6438db0b4384e4ae", "revision": "1b0b6438db0b4384e4ae",
...@@ -368,7 +368,7 @@ self.__precacheManifest = [ ...@@ -368,7 +368,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/Classify.fb4bedde.chunk.css" "url": "/mrstatic/css/Classify.fb4bedde.chunk.css"
}, },
{ {
"revision": "036ea5b535ae457b129a", "revision": "b8bddae12fb1b793b52d",
"url": "/mrstatic/css/BargainMiddlePage.eb686c74.chunk.css" "url": "/mrstatic/css/BargainMiddlePage.eb686c74.chunk.css"
}, },
{ {
...@@ -380,7 +380,7 @@ self.__precacheManifest = [ ...@@ -380,7 +380,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.bf839917.chunk.css" "url": "/mrstatic/css/2.bf839917.chunk.css"
}, },
{ {
"revision": "70dc3eff8277ea43c3a9ce226a18e3ec", "revision": "c40128bbf6ee8d47e2e615f67750ecb7",
"url": "/index.html" "url": "/index.html"
} }
]; ];
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts( importScripts(
"/precache-manifest.939c95cf4b3084373abcb356c0001d7b.js" "/precache-manifest.671525b21ac041a968b7d4acce104cdc.js"
); );
workbox.clientsClaim(); workbox.clientsClaim();
......
...@@ -127,6 +127,11 @@ class MyOrders extends Component { ...@@ -127,6 +127,11 @@ class MyOrders extends Component {
id={item.course_id} id={item.course_id}
toDetail={this.toCourseDetail} toDetail={this.toCourseDetail}
/> />
{
item.course_expire && item.course_expire!='' &&
<span className='course-expire'>{item.course_expire}</span>
}
</div> </div>
) )
}) })
......
...@@ -37,6 +37,21 @@ ...@@ -37,6 +37,21 @@
padding: 10px 12px; padding: 10px 12px;
background-color: $bg_fff; background-color: $bg_fff;
border-bottom: 1px solid $border_e7eaf1; border-bottom: 1px solid $border_e7eaf1;
position: relative;
.course-expire{
display: block;
width:92px;
height:20px;
line-height: 20px;
background:#FF3A3A;
border-radius:0 10px 10px 0;
position: absolute;
color: #FFF;
font-size: 12px;
left: 12px;
bottom: 20px;
text-align: center;
}
} }
.order-info { .order-info {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment