Skip to content

M
mr-julyedu
Commit 19cf9d87 by xuzhenghua
Options

bug

parents cf5daff0 e143f410
Showing with 32 additions and 24 deletions
build/asset-manifest.json
......@@ -17,8 +17,8 @@
"MyEdit.js": "/static/js/MyEdit.e7408258.chunk.js",
"MyEdit.js.map": "/static/js/MyEdit.e7408258.chunk.js.map",
"Order.css": "/static/css/Order.061a2017.chunk.css",
"Order.js": "/static/js/Order.a3016da1.chunk.js",
"Order.js.map": "/static/js/Order.a3016da1.chunk.js.map",
"Order.js": "/static/js/Order.b9d3d946.chunk.js",
"Order.js.map": "/static/js/Order.b9d3d946.chunk.js.map",
"Orderinfo.js": "/static/js/Orderinfo.c503b1f0.chunk.js",
"Orderinfo.js.map": "/static/js/Orderinfo.c503b1f0.chunk.js.map",
"PayOrder.css": "/static/css/PayOrder.a9111f28.chunk.css",
......@@ -51,8 +51,8 @@
"purchased.css": "/static/css/purchased.fb5cdbc2.chunk.css",
"purchased.js": "/static/js/purchased.96de9074.chunk.js",
"purchased.js.map": "/static/js/purchased.96de9074.chunk.js.map",
"runtime~main.js": "/static/js/runtime~main.7dae6868.js",
"runtime~main.js.map": "/static/js/runtime~main.7dae6868.js.map",
"runtime~main.js": "/static/js/runtime~main.46df84a2.js",
"runtime~main.js.map": "/static/js/runtime~main.46df84a2.js.map",
"search.css": "/static/css/search.ed8f7a59.chunk.css",
"search.js": "/static/js/search.d9684d99.chunk.js",
"search.js.map": "/static/js/search.d9684d99.chunk.js.map",
......@@ -66,8 +66,8 @@
"togroup.js": "/static/js/togroup.a6717ccf.chunk.js",
"togroup.js.map": "/static/js/togroup.a6717ccf.chunk.js.map",
"video.css": "/static/css/video.2b2824ba.chunk.css",
"video.js": "/static/js/video.0535da32.chunk.js",
"video.js.map": "/static/js/video.0535da32.chunk.js.map",
"video.js": "/static/js/video.7782b1ca.chunk.js",
"video.js.map": "/static/js/video.7782b1ca.chunk.js.map",
"static/css/24.4abd5c22.chunk.css": "/static/css/24.4abd5c22.chunk.css",
"static/js/24.67004523.chunk.js": "/static/js/24.67004523.chunk.js",
"static/js/24.67004523.chunk.js.map": "/static/js/24.67004523.chunk.js.map",
......@@ -91,7 +91,7 @@
"static/js/31.804baf53.chunk.js": "/static/js/31.804baf53.chunk.js",
"static/js/31.804baf53.chunk.js.map": "/static/js/31.804baf53.chunk.js.map",
"index.html": "/index.html",
"precache-manifest.598d4f9a21c04382f4006facc51e0bfb.js": "/precache-manifest.598d4f9a21c04382f4006facc51e0bfb.js",
"precache-manifest.39ecfe1b8e5174d82d00a86574410687.js": "/precache-manifest.39ecfe1b8e5174d82d00a86574410687.js",
"service-worker.js": "/service-worker.js",
"static/css/24.4abd5c22.chunk.css.map": "/static/css/24.4abd5c22.chunk.css.map",
"static/css/26.73976871.chunk.css.map": "/static/css/26.73976871.chunk.css.map",
......
build/precache-manifest.598d4f9a21c04382f4006facc51e0bfb.js → build/precache-manifest.39ecfe1b8e5174d82d00a86574410687.js
......@@ -44,12 +44,12 @@ self.__precacheManifest = [
"url": "/static/js/MyEdit.e7408258.chunk.js"
},
{
"revision": "5f92c4a49432492f54d0",
"revision": "6dd5fb394193eb8a7200",
"url": "/static/css/Order.061a2017.chunk.css"
},
{
"revision": "5f92c4a49432492f54d0",
"url": "/static/js/Order.a3016da1.chunk.js"
"revision": "6dd5fb394193eb8a7200",
"url": "/static/js/Order.b9d3d946.chunk.js"
},
{
"revision": "064f52af07df35b72c76",
......@@ -136,8 +136,8 @@ self.__precacheManifest = [
"url": "/static/js/BargainMiddlePage.5ad51000.chunk.js"
},
{
"revision": "ea768ad21ee65b6e17a4",
"url": "/static/js/runtime~main.7dae6868.js"
"revision": "d5de5c1a1d5767a15942",
"url": "/static/js/runtime~main.46df84a2.js"
},
{
"revision": "3edc9e3770cae738e0d9",
......@@ -172,12 +172,12 @@ self.__precacheManifest = [
"url": "/static/js/togroup.a6717ccf.chunk.js"
},
{
"revision": "127640c64bda7233a9ab",
"revision": "87b4deac38f8009b6923",
"url": "/static/css/video.2b2824ba.chunk.css"
},
{
"revision": "127640c64bda7233a9ab",
"url": "/static/js/video.0535da32.chunk.js"
"revision": "87b4deac38f8009b6923",
"url": "/static/js/video.7782b1ca.chunk.js"
},
{
"revision": "80011994e30adf599e5f47fcc81bc06d",
......@@ -260,7 +260,7 @@ self.__precacheManifest = [
"url": "/static/css/24.4abd5c22.chunk.css"
},
{
"revision": "04c24767d1cc3e2167e08653fa53b292",
"revision": "e982faac9f9e13435ed78e37f63f9a1a",
"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.598d4f9a21c04382f4006facc51e0bfb.js"
"/precache-manifest.39ecfe1b8e5174d82d00a86574410687.js"
);
workbox.clientsClaim();
......
build/static/js/runtime~main.7dae6868.js → build/static/js/runtime~main.46df84a2.js
!function(e){function r(r){for(var n,a,f=r[0],d=r[1],i=r[2],u=0,l=[];u<f.length;u++)a=f[u],o[a]&&l.push(o[a][0]),o[a]=0;for(n in d)Object.prototype.hasOwnProperty.call(d,n)&&(e[n]=d[n]);for(s&&s(r);l.length;)l.shift()();return c.push.apply(c,i||[]),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 d=t[a];0!==o[d]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},a={18:0},o={18:0},c=[];function f(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,f),t.l=!0,t.exports}f.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:"6d24aba4",1:"5ed0fc89",2:"5ce769bd",3:"aeb3f822",4:"280c19c2",5:"31d6cfe0",6:"061a2017",7:"31d6cfe0",8:"a9111f28",9:"99c1fc9f",10:"b968f5d5",11:"8f4c32db",12:"a97e13d0",13:"f2c7a13b",14:"ce10de93",16:"789a128d",17:"fb5cdbc2",19:"ed8f7a59",20:"175bee2a",21:"8867122f",22:"f08bc5f3",23:"2b2824ba",25:"31d6cfe0",26:"73976871",27:"31d6cfe0",28:"42a89c77",29:"bf839917",30:"35e22f8c",31:"57d8b033"}[e]+".chunk.css",o=f.p+n,c=document.getElementsByTagName("link"),d=0;d<c.length;d++){var i=(s=c[d]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(i===n||i===o))return r()}var u=document.getElementsByTagName("style");for(d=0;d<u.length;d++){var s;if((i=(s=u[d]).getAttribute("data-href"))===n||i===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,d=document.createElement("script");d.charset="utf-8",d.timeout=120,f.nc&&d.setAttribute("nonce",f.nc),d.src=function(e){return f.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:"5ad51000",1:"da3edf64",2:"da982f82",3:"b6b14ec2",4:"954a0197",5:"e7408258",6:"a3016da1",7:"c503b1f0",8:"c84e2bbe",9:"5d20f031",10:"e678ace6",11:"4f1c3903",12:"6ae202e2",13:"0ff2580f",14:"35f0eebd",16:"3a9f8bf2",17:"96de9074",19:"d9684d99",20:"c5ea327d",21:"3ca271e7",22:"a6717ccf",23:"0535da32",25:"66a6cdfb",26:"ad7bb673",27:"48079d34",28:"dc773ffa",29:"76256aca",30:"db405cf8",31:"804baf53"}[e]+".chunk.js"}(e),c=function(r){d.onerror=d.onload=null,clearTimeout(i);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 i=setTimeout(function(){c({type:"timeout",target:d})},12e4);d.onerror=d.onload=c,document.head.appendChild(d)}return Promise.all(r)},f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/",f.oe=function(e){throw console.error(e),e};var d=window.webpackJsonp=window.webpackJsonp||[],i=d.push.bind(d);d.push=r,d=d.slice();for(var u=0;u<d.length;u++)r(d[u]);var s=i;t()}([]);
//# sourceMappingURL=runtime~main.7dae6868.js.map
\ No newline at end of file
!function(e){function r(r){for(var n,a,f=r[0],d=r[1],i=r[2],u=0,l=[];u<f.length;u++)a=f[u],o[a]&&l.push(o[a][0]),o[a]=0;for(n in d)Object.prototype.hasOwnProperty.call(d,n)&&(e[n]=d[n]);for(s&&s(r);l.length;)l.shift()();return c.push.apply(c,i||[]),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 d=t[a];0!==o[d]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},a={18:0},o={18:0},c=[];function f(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,f),t.l=!0,t.exports}f.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:"6d24aba4",1:"5ed0fc89",2:"5ce769bd",3:"aeb3f822",4:"280c19c2",5:"31d6cfe0",6:"061a2017",7:"31d6cfe0",8:"a9111f28",9:"99c1fc9f",10:"b968f5d5",11:"8f4c32db",12:"a97e13d0",13:"f2c7a13b",14:"ce10de93",16:"789a128d",17:"fb5cdbc2",19:"ed8f7a59",20:"175bee2a",21:"8867122f",22:"f08bc5f3",23:"2b2824ba",25:"31d6cfe0",26:"73976871",27:"31d6cfe0",28:"42a89c77",29:"bf839917",30:"35e22f8c",31:"57d8b033"}[e]+".chunk.css",o=f.p+n,c=document.getElementsByTagName("link"),d=0;d<c.length;d++){var i=(s=c[d]).getAttribute("data-href")||s.getAttribute("href");if("stylesheet"===s.rel&&(i===n||i===o))return r()}var u=document.getElementsByTagName("style");for(d=0;d<u.length;d++){var s;if((i=(s=u[d]).getAttribute("data-href"))===n||i===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,d=document.createElement("script");d.charset="utf-8",d.timeout=120,f.nc&&d.setAttribute("nonce",f.nc),d.src=function(e){return f.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:"5ad51000",1:"da3edf64",2:"da982f82",3:"b6b14ec2",4:"954a0197",5:"e7408258",6:"b9d3d946",7:"c503b1f0",8:"c84e2bbe",9:"5d20f031",10:"e678ace6",11:"4f1c3903",12:"6ae202e2",13:"0ff2580f",14:"35f0eebd",16:"3a9f8bf2",17:"96de9074",19:"d9684d99",20:"c5ea327d",21:"3ca271e7",22:"a6717ccf",23:"7782b1ca",25:"66a6cdfb",26:"ad7bb673",27:"48079d34",28:"dc773ffa",29:"76256aca",30:"db405cf8",31:"804baf53"}[e]+".chunk.js"}(e),c=function(r){d.onerror=d.onload=null,clearTimeout(i);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 i=setTimeout(function(){c({type:"timeout",target:d})},12e4);d.onerror=d.onload=c,document.head.appendChild(d)}return Promise.all(r)},f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/",f.oe=function(e){throw console.error(e),e};var d=window.webpackJsonp=window.webpackJsonp||[],i=d.push.bind(d);d.push=r,d=d.slice();for(var u=0;u<d.length;u++)r(d[u]);var s=i;t()}([]);
//# sourceMappingURL=runtime~main.46df84a2.js.map
\ No newline at end of file
src/components/order/index.js
......@@ -89,6 +89,7 @@ class Order extends Component {
}
// 提交订单
submitOrder = () => {
const {total} = this.state;
if (this.state.orderList.length === 0) {
Toast.info('没有要提交的订单！');
return;
......@@ -98,9 +99,12 @@ class Order extends Component {
}
if(this.props.location.state && this.props.location.state.group === 1) {
http.post(`${API['base-api']}/pdd/m`, {course_id: getParam("id")}).then(res => {
console.log(res.data.data);
if(res.data.errno === 200) {
sessionStorage.removeItem('orderUseCacheObj');
if (res.data.data.is_free === 1) {
this.props.history.push(`/togroup?id=${res.data.data.order_id}`);
return;
}
this.props.history.replace(`/payorder?oid=${res.data.data.oid}`);
}else {
Toast.info(res.data.msg, 2);
......@@ -113,12 +117,15 @@ class Order extends Component {
url += '&type=1'
}
http.get(url).then(res => {
console.log(res);
if(res.data.errno !== 0) {
Toast.info(res.data.msg, 2);
return;
}
sessionStorage.removeItem('orderUseCacheObj');
if (res.data.data.is_free === 1) {
this.props.history.replace(`/purchased`);
return;
}
this.props.history.replace(`/payorder?oid=${res.data.data.order_id}`);
});
}
......
src/components/video/index.js
......@@ -487,13 +487,13 @@ class Video extends Component {
</div>
<div className='tab'>
<div>
<NavLink to={`${match.url}/video`}
<NavLink to={{pathname: `${match.url}/video`, search: `?id=${this.courseID}`}}
replace
activeClassName='active'
>视频</NavLink>
</div>
<div>
<NavLink to={`${match.url}/datum`}
<NavLink to={{pathname: `${match.url}/datum`, search: `?id=${this.courseID}`}}
replace
activeClassName='active'
>资料</NavLink>
......
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