Skip to content

M
mr-julyedu
Commit 32a6d946 by zhanghaozhe
Options

Merge branch 'video-audition' into pre 

# Conflicts:
#	build/asset-manifest.json
#	build/mrstatic/js/search.8026b476.chunk.js.map
#	build/service-worker.js
parents 41fbde1d 8b6fa04d
Showing with 302 additions and 3 deletions
build/precache-manifest.09f31171c09f0d3d55263eee8eb61f40.js 0 → 100644
self.__precacheManifest = [
{
"revision": "21646e908119f8be2bd2",
"url": "/mrstatic/js/myorders.e8cb3b3b.chunk.js"
},
{
"revision": "9c30bb96d2566fa72ed3",
"url": "/mrstatic/js/0.080d8ad6.chunk.js"
},
{
"revision": "8edaf2ff2566ed17e2dd22cf4f8ad7ae",
"url": "/mrstatic/media/redb_chai_bj@2x.8edaf2ff.png"
},
{
"revision": "22fa2b1699ebbedb7df2",
"url": "/mrstatic/js/BargainMiddlePage.84fb6acd.chunk.js"
},
{
"revision": "c79abf5cb7ae8a82009cf68fe44d1078",
"url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
},
{
"revision": "ae00bcb5cac8091c7a32",
"url": "/mrstatic/js/Classify.d41e0fd5.chunk.js"
},
{
"revision": "6902434f8f18a23319d57d0ac8aaea8c",
"url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
},
{
"revision": "63680bfefa1d8687d7db",
"url": "/mrstatic/js/Country.c21355cc.chunk.js"
},
{
"revision": "79139f6aad350256e151f9f73c226348",
"url": "/mrstatic/media/hb_bj.79139f6a.png"
},
{
"revision": "0fd8b15c174b028fbade",
"url": "/mrstatic/js/CourseList.51f75ae8.chunk.js"
},
{
"revision": "80011994e30adf599e5f47fcc81bc06d",
"url": "/mrstatic/media/progress-share-bg.80011994.png"
},
{
"revision": "2c34d8e6bed87377ddc6",
"url": "/mrstatic/js/DrawDocument.d8ab3c16.chunk.js"
},
{
"revision": "81a489ac63f2f2df5ab412e0782bd54c",
"url": "/mrstatic/media/kanjia_cg_icon.81a489ac.png"
},
{
"revision": "6c1d906b9550b9b4cb78",
"url": "/mrstatic/js/Examination.bfa9a30b.chunk.js"
},
{
"revision": "808da0f999b00f3609df",
"url": "/mrstatic/js/MyEdit.abd0972d.chunk.js"
},
{
"revision": "b9b072e1116fd1830cc8f425dc163a6b",
"url": "/mrstatic/media/iconfont.b9b072e1.svg"
},
{
"revision": "b8fc6fc6a43935d150e5",
"url": "/mrstatic/js/Order.67b90f63.chunk.js"
},
{
"revision": "cd596b359dd8b581d1fa",
"url": "/mrstatic/js/Orderinfo.7cef0f1c.chunk.js"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "f0675eebd881ab3302b2",
"url": "/mrstatic/js/PayOrder.7a205cee.chunk.js"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "58b6e52a5fffaa346199",
"url": "/mrstatic/js/Preferential.dc643472.chunk.js"
},
{
"revision": "e0655d4da66dce391e6b5227b400e037",
"url": "/mrstatic/media/iconfont.e0655d4d.woff"
},
{
"revision": "8fa6bf4681d01910894d",
"url": "/mrstatic/js/SearchResult.e47d160c.chunk.js"
},
{
"revision": "bb901a10076755d63952",
"url": "/mrstatic/js/33.60b01cec.chunk.js"
},
{
"revision": "afc8ad8ab4faf3a0a084",
"url": "/mrstatic/js/ShareCourse.5fa1ec6c.chunk.js"
},
{
"revision": "bcf51189570f8341d131",
"url": "/mrstatic/js/32.693ff105.chunk.js"
},
{
"revision": "2c030ea18d094a51f97d",
"url": "/mrstatic/js/ShopCart.29d515c3.chunk.js"
},
{
"revision": "588709f125bab352934e",
"url": "/mrstatic/js/31.9f4021e5.chunk.js"
},
{
"revision": "313a69f3f3f9c429086b",
"url": "/mrstatic/js/aist-share.1a50dd8e.chunk.js"
},
{
"revision": "730de2ed51b041dae8b1",
"url": "/mrstatic/js/30.25bc7d44.chunk.js"
},
{
"revision": "8e905bfc1f2959eeec69",
"url": "/mrstatic/js/coupons.35c93187.chunk.js"
},
{
"revision": "e3b2a53223ba18e89ef0",
"url": "/mrstatic/js/29.2c3524e0.chunk.js"
},
{
"revision": "445ab4910493faaf7482",
"url": "/mrstatic/js/detail.8869650c.chunk.js"
},
{
"revision": "cf76fc4e591c394a7cab",
"url": "/mrstatic/js/28.3c3acff8.chunk.js"
},
{
"revision": "1e53c6dafa80c620151f",
"url": "/mrstatic/js/main.a0981ef8.chunk.js"
},
{
"revision": "aa7c5386a117b2f1a3cb",
"url": "/mrstatic/js/video.1f17e9e1.chunk.js"
},
{
"revision": "357f68d5cbe31f4fe59a",
"url": "/mrstatic/js/1.6d29a759.chunk.js"
},
{
"revision": "c7e10d8243c4f85c6960",
"url": "/mrstatic/js/togroup.b29c1ada.chunk.js"
},
{
"revision": "f61730899f61bf93d3db",
"url": "/mrstatic/js/purchased.b172e48b.chunk.js"
},
{
"revision": "eb7152c12e9ae53c5049",
"url": "/mrstatic/js/runtime~main.5a795521.js"
},
{
"revision": "c0504caa6573c9dfbff1",
"url": "/mrstatic/js/study.c1f0e069.chunk.js"
},
{
"revision": "c99e8997408169e455e2",
"url": "/mrstatic/js/search.8026b476.chunk.js"
},
{
"revision": "74516cd646366205eaed",
"url": "/mrstatic/js/shareposter.c4c87c09.chunk.js"
},
{
"revision": "bcf51189570f8341d131",
"url": "/mrstatic/css/32.bf839917.chunk.css"
},
{
"revision": "74516cd646366205eaed",
"url": "/mrstatic/css/shareposter.76774ba4.chunk.css"
},
{
"revision": "c0504caa6573c9dfbff1",
"url": "/mrstatic/css/study.bf6b9b43.chunk.css"
},
{
"revision": "c7e10d8243c4f85c6960",
"url": "/mrstatic/css/togroup.f08bc5f3.chunk.css"
},
{
"revision": "aa7c5386a117b2f1a3cb",
"url": "/mrstatic/css/video.7340509f.chunk.css"
},
{
"revision": "bb901a10076755d63952",
"url": "/mrstatic/css/33.35e22f8c.chunk.css"
},
{
"revision": "f61730899f61bf93d3db",
"url": "/mrstatic/css/purchased.bb758677.chunk.css"
},
{
"revision": "c99e8997408169e455e2",
"url": "/mrstatic/css/search.5716d9b3.chunk.css"
},
{
"revision": "8fa6bf4681d01910894d",
"url": "/mrstatic/css/SearchResult.cdf852c1.chunk.css"
},
{
"revision": "1e53c6dafa80c620151f",
"url": "/mrstatic/css/main.5d358ffc.chunk.css"
},
{
"revision": "21646e908119f8be2bd2",
"url": "/mrstatic/css/myorders.67814bde.chunk.css"
},
{
"revision": "58b6e52a5fffaa346199",
"url": "/mrstatic/css/Preferential.0c91fa43.chunk.css"
},
{
"revision": "730de2ed51b041dae8b1",
"url": "/mrstatic/css/30.bff100af.chunk.css"
},
{
"revision": "588709f125bab352934e",
"url": "/mrstatic/css/31.820320a6.chunk.css"
},
{
"revision": "313a69f3f3f9c429086b",
"url": "/mrstatic/css/aist-share.a97e13d0.chunk.css"
},
{
"revision": "22fa2b1699ebbedb7df2",
"url": "/mrstatic/css/BargainMiddlePage.eb686c74.chunk.css"
},
{
"revision": "2c030ea18d094a51f97d",
"url": "/mrstatic/css/ShopCart.92ab48a3.chunk.css"
},
{
"revision": "445ab4910493faaf7482",
"url": "/mrstatic/css/detail.b8168be2.chunk.css"
},
{
"revision": "afc8ad8ab4faf3a0a084",
"url": "/mrstatic/css/ShareCourse.8046fb41.chunk.css"
},
{
"revision": "ae00bcb5cac8091c7a32",
"url": "/mrstatic/css/Classify.fb4bedde.chunk.css"
},
{
"revision": "8e905bfc1f2959eeec69",
"url": "/mrstatic/css/coupons.b5675762.chunk.css"
},
{
"revision": "f0675eebd881ab3302b2",
"url": "/mrstatic/css/PayOrder.7eb7d317.chunk.css"
},
{
"revision": "b8fc6fc6a43935d150e5",
"url": "/mrstatic/css/Order.c0945477.chunk.css"
},
{
"revision": "6c1d906b9550b9b4cb78",
"url": "/mrstatic/css/Examination.7bb0622b.chunk.css"
},
{
"revision": "2c34d8e6bed87377ddc6",
"url": "/mrstatic/css/DrawDocument.aeb3f822.chunk.css"
},
{
"revision": "0fd8b15c174b028fbade",
"url": "/mrstatic/css/CourseList.afc8902e.chunk.css"
},
{
"revision": "63680bfefa1d8687d7db",
"url": "/mrstatic/css/Country.2d34330b.chunk.css"
},
{
"revision": "e3b2a53223ba18e89ef0",
"url": "/mrstatic/css/29.c76b300d.chunk.css"
},
{
"revision": "cf76fc4e591c394a7cab",
"url": "/mrstatic/css/28.2c78a65e.chunk.css"
},
{
"revision": "b59a6a71e9c94430701c85318427e85d",
"url": "/index.html"
}
];
\ No newline at end of file
src/assets/css/index.scss
...@@ -28,9 +28,6 @@ $z-max: 999999; //为了应付某些插件z-index 值过高的问题 ...@@ -28,9 +28,6 @@ $z-max: 999999; //为了应付某些插件z-index 值过高的问题
// -------------------------------------------------- // --------------------------------------------------
// //
body {
position: relative;
}
html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
border: 0 none; border: 0 none;
font-size: inherit; font-size: inherit;
......
src/components/video/index.js
...@@ -591,6 +591,9 @@ class Video extends Component { ...@@ -591,6 +591,9 @@ class Video extends Component {
let url = ''; let url = '';
if (getParam('video_id')) { if (getParam('video_id')) {
url = `${API.home}/m/course/play/${this.courseID + '?video_id=' + getParam('video_id')}` url = `${API.home}/m/course/play/${this.courseID + '?video_id=' + getParam('video_id')}`
http.post(`${API['base-api']}/sys/get_class_audition`, {
video_id: getParam('video_id')
})
} else { } else {
url = `${API.home}/m/course/play/${this.courseID}` url = `${API.home}/m/course/play/${this.courseID}`
} }
......
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