Merge branch 'master' into more-bc
This commit is contained in:
zhangds
commit
58a9e9deeb
|
|
@ -3,20 +3,20 @@
|
|||
"static/js/0.f23bc353.chunk.js": "/static/js/0.f23bc353.chunk.js",
|
||||
"static/js/1.577466fa.chunk.js": "/static/js/1.577466fa.chunk.js",
|
||||
"static/css/2.74e9175c.chunk.css": "/static/css/2.74e9175c.chunk.css",
|
||||
"static/js/2.50959283.chunk.js": "/static/js/2.50959283.chunk.js",
|
||||
"static/js/2.472dc1fd.chunk.js": "/static/js/2.472dc1fd.chunk.js",
|
||||
"static/css/3.75be5fa1.chunk.css": "/static/css/3.75be5fa1.chunk.css",
|
||||
"static/js/3.428f5316.chunk.js": "/static/js/3.428f5316.chunk.js",
|
||||
"main.css": "/static/css/main.b0e33980.chunk.css",
|
||||
"main.js": "/static/js/main.6f32e568.chunk.js",
|
||||
"runtime-main.js": "/static/js/runtime-main.4c0c92ad.js",
|
||||
"runtime-main.js": "/static/js/runtime-main.4000c586.js",
|
||||
"static/css/6.fff1718c.chunk.css": "/static/css/6.fff1718c.chunk.css",
|
||||
"static/js/6.d9c02e71.chunk.js": "/static/js/6.d9c02e71.chunk.js",
|
||||
"static/js/6.05e07894.chunk.js": "/static/js/6.05e07894.chunk.js",
|
||||
"static/css/7.d823cf27.chunk.css": "/static/css/7.d823cf27.chunk.css",
|
||||
"static/js/7.da659454.chunk.js": "/static/js/7.da659454.chunk.js",
|
||||
"static/js/7.707343c3.chunk.js": "/static/js/7.707343c3.chunk.js",
|
||||
"static/css/8.9a9b6f5c.chunk.css": "/static/css/8.9a9b6f5c.chunk.css",
|
||||
"static/js/8.c0e52fb6.chunk.js": "/static/js/8.c0e52fb6.chunk.js",
|
||||
"static/css/9.4e156c5f.chunk.css": "/static/css/9.4e156c5f.chunk.css",
|
||||
"static/js/9.431be386.chunk.js": "/static/js/9.431be386.chunk.js",
|
||||
"static/js/9.05c095e3.chunk.js": "/static/js/9.05c095e3.chunk.js",
|
||||
"static/css/10.b1da7569.chunk.css": "/static/css/10.b1da7569.chunk.css",
|
||||
"static/js/10.63656ed8.chunk.js": "/static/js/10.63656ed8.chunk.js",
|
||||
"static/js/11.1d979fa2.chunk.js": "/static/js/11.1d979fa2.chunk.js",
|
||||
|
|
@ -26,13 +26,13 @@
|
|||
"static/js/1.577466fa.chunk.js.LICENSE.txt": "/static/js/1.577466fa.chunk.js.LICENSE.txt",
|
||||
"static/js/11.1d979fa2.chunk.js.LICENSE.txt": "/static/js/11.1d979fa2.chunk.js.LICENSE.txt",
|
||||
"static/js/3.428f5316.chunk.js.LICENSE.txt": "/static/js/3.428f5316.chunk.js.LICENSE.txt",
|
||||
"static/js/6.d9c02e71.chunk.js.LICENSE.txt": "/static/js/6.d9c02e71.chunk.js.LICENSE.txt",
|
||||
"static/js/7.da659454.chunk.js.LICENSE.txt": "/static/js/7.da659454.chunk.js.LICENSE.txt",
|
||||
"static/js/6.05e07894.chunk.js.LICENSE.txt": "/static/js/6.05e07894.chunk.js.LICENSE.txt",
|
||||
"static/js/7.707343c3.chunk.js.LICENSE.txt": "/static/js/7.707343c3.chunk.js.LICENSE.txt",
|
||||
"static/js/8.c0e52fb6.chunk.js.LICENSE.txt": "/static/js/8.c0e52fb6.chunk.js.LICENSE.txt",
|
||||
"static/js/9.431be386.chunk.js.LICENSE.txt": "/static/js/9.431be386.chunk.js.LICENSE.txt"
|
||||
"static/js/9.05c095e3.chunk.js.LICENSE.txt": "/static/js/9.05c095e3.chunk.js.LICENSE.txt"
|
||||
},
|
||||
"entrypoints": [
|
||||
"static/js/runtime-main.4c0c92ad.js",
|
||||
"static/js/runtime-main.4000c586.js",
|
||||
"static/css/8.9a9b6f5c.chunk.css",
|
||||
"static/js/8.c0e52fb6.chunk.js",
|
||||
"static/css/main.b0e33980.chunk.css",
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/goods_new_v3.js?v3"></script><title>营销管理系统</title><style>#root,body,html{width:100%;height:100%;padding:0;margin:0;font-size:14px;overflow:hidden}</style><link href="/static/css/8.9a9b6f5c.chunk.css" rel="stylesheet"><link href="/static/css/main.b0e33980.chunk.css" rel="stylesheet"></head><body><script type="text/javascript">window.goods=product</script><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,o,c=t[0],i=t[1],f=t[2],s=0,d=[];s<c.length;s++)o=c[s],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&d.push(a[o][0]),a[o]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(l&&l(t);d.length;)d.shift()();return u.push.apply(u,f||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,o=1;o<r.length;o++){var i=r[o];0!==a[i]&&(n=!1)}n&&(u.splice(t--,1),e=c(c.s=r[0]))}return e}var n={},o={5:0},a={5:0},u=[];function c(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var t=[];o[e]?t.push(o[e]):0!==o[e]&&{2:1,3:1,6:1,7:1,9:1,10:1}[e]&&t.push(o[e]=new Promise((function(t,r){for(var n="static/css/"+({}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"74e9175c",3:"75be5fa1",6:"fff1718c",7:"d823cf27",9:"4e156c5f",10:"b1da7569",11:"31d6cfe0",12:"31d6cfe0"}[e]+".chunk.css",a=c.p+n,u=document.getElementsByTagName("link"),i=0;i<u.length;i++){var f=(l=u[i]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(f===n||f===a))return t()}var s=document.getElementsByTagName("style");for(i=0;i<s.length;i++){var l;if((f=(l=s[i]).getAttribute("data-href"))===n||f===a)return t()}var d=document.createElement("link");d.rel="stylesheet",d.type="text/css",d.onload=t,d.onerror=function(t){var n=t&&t.target&&t.target.src||a,u=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");u.code="CSS_CHUNK_LOAD_FAILED",u.request=n,delete o[e],d.parentNode.removeChild(d),r(u)},d.href=a,document.getElementsByTagName("head")[0].appendChild(d)})).then((function(){o[e]=0})));var r=a[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=a[e]=[t,n]}));t.push(r[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,c.nc&&i.setAttribute("nonce",c.nc),i.src=function(e){return c.p+"static/js/"+({}[e]||e)+"."+{0:"f23bc353",1:"577466fa",2:"50959283",3:"428f5316",6:"d9c02e71",7:"da659454",9:"431be386",10:"63656ed8",11:"1d979fa2",12:"9de3a5cd"}[e]+".chunk.js"}(e);var f=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(s);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),o=t&&t.target&&t.target.src;f.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",f.name="ChunkLoadError",f.type=n,f.request=o,r[1](f)}a[e]=void 0}};var s=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(t)},c.m=e,c.c=n,c.d=function(e,t,r){c.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},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,t){if(1&t&&(e=c(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(c.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)c.d(r,n,function(t){return e[t]}.bind(null,n));return r},c.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(t,"a",t),t},c.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},c.p="/",c.oe=function(e){throw e};var i=this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[],f=i.push.bind(i);i.push=t,i=i.slice();for(var s=0;s<i.length;s++)t(i[s]);var l=f;r()}([])</script><script src="/static/js/8.c0e52fb6.chunk.js"></script><script src="/static/js/main.6f32e568.chunk.js"></script></body></html>
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/goods_new_v3.js?v3"></script><title>营销管理系统</title><style>#root,body,html{width:100%;height:100%;padding:0;margin:0;font-size:14px;overflow:hidden}</style><link href="/static/css/8.9a9b6f5c.chunk.css" rel="stylesheet"><link href="/static/css/main.b0e33980.chunk.css" rel="stylesheet"></head><body><script type="text/javascript">window.goods=product</script><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,o,c=t[0],i=t[1],f=t[2],s=0,d=[];s<c.length;s++)o=c[s],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&d.push(a[o][0]),a[o]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(l&&l(t);d.length;)d.shift()();return u.push.apply(u,f||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,o=1;o<r.length;o++){var i=r[o];0!==a[i]&&(n=!1)}n&&(u.splice(t--,1),e=c(c.s=r[0]))}return e}var n={},o={5:0},a={5:0},u=[];function c(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var t=[];o[e]?t.push(o[e]):0!==o[e]&&{2:1,3:1,6:1,7:1,9:1,10:1}[e]&&t.push(o[e]=new Promise((function(t,r){for(var n="static/css/"+({}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"74e9175c",3:"75be5fa1",6:"fff1718c",7:"d823cf27",9:"4e156c5f",10:"b1da7569",11:"31d6cfe0",12:"31d6cfe0"}[e]+".chunk.css",a=c.p+n,u=document.getElementsByTagName("link"),i=0;i<u.length;i++){var f=(l=u[i]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(f===n||f===a))return t()}var s=document.getElementsByTagName("style");for(i=0;i<s.length;i++){var l;if((f=(l=s[i]).getAttribute("data-href"))===n||f===a)return t()}var d=document.createElement("link");d.rel="stylesheet",d.type="text/css",d.onload=t,d.onerror=function(t){var n=t&&t.target&&t.target.src||a,u=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");u.code="CSS_CHUNK_LOAD_FAILED",u.request=n,delete o[e],d.parentNode.removeChild(d),r(u)},d.href=a,document.getElementsByTagName("head")[0].appendChild(d)})).then((function(){o[e]=0})));var r=a[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=a[e]=[t,n]}));t.push(r[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,c.nc&&i.setAttribute("nonce",c.nc),i.src=function(e){return c.p+"static/js/"+({}[e]||e)+"."+{0:"f23bc353",1:"577466fa",2:"472dc1fd",3:"428f5316",6:"05e07894",7:"707343c3",9:"05c095e3",10:"63656ed8",11:"1d979fa2",12:"9de3a5cd"}[e]+".chunk.js"}(e);var f=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(s);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),o=t&&t.target&&t.target.src;f.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",f.name="ChunkLoadError",f.type=n,f.request=o,r[1](f)}a[e]=void 0}};var s=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(t)},c.m=e,c.c=n,c.d=function(e,t,r){c.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},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,t){if(1&t&&(e=c(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(c.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)c.d(r,n,function(t){return e[t]}.bind(null,n));return r},c.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(t,"a",t),t},c.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},c.p="/",c.oe=function(e){throw e};var i=this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[],f=i.push.bind(i);i.push=t,i=i.slice();for(var s=0;s<i.length;s++)t(i[s]);var l=f;r()}([])</script><script src="/static/js/8.c0e52fb6.chunk.js"></script><script src="/static/js/main.6f32e568.chunk.js"></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,13 +0,0 @@
|
|||
//! 1:直冲 2:立减金 3:红包
|
||||
|
||||
//!type 1:权益商品 2:立减金 3:红包
|
||||
|
||||
//!以下注释相关路由、组件（未使用/引用）待系统稳定上线运行一个版本后，请进行相关代码、文件删除
|
||||
|
||||
//!以下注释相关路由（未使用/引用）待系统稳定上线运行一个版本后，请进行相关代码、文件删除
|
||||
|
||||
//!提取动态删除核销状态条件
|
||||
|
||||
//!状态筛选
|
||||
|
||||
//!获取订单列表
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,13 +0,0 @@
|
|||
//! 1:直冲 2:立减金 3:红包
|
||||
|
||||
//!type 1:权益商品 2:立减金 3:红包
|
||||
|
||||
//!以下注释相关路由、组件（未使用/引用）待系统稳定上线运行一个版本后，请进行相关代码、文件删除
|
||||
|
||||
//!以下注释相关路由（未使用/引用）待系统稳定上线运行一个版本后，请进行相关代码、文件删除
|
||||
|
||||
//!提取动态删除核销状态条件
|
||||
|
||||
//!状态筛选
|
||||
|
||||
//!获取订单列表
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1 +0,0 @@
|
|||
//!优惠券
|
||||
|
|
@ -1 +0,0 @@
|
|||
!function(e){function t(t){for(var n,o,c=t[0],i=t[1],f=t[2],s=0,d=[];s<c.length;s++)o=c[s],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&d.push(a[o][0]),a[o]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(l&&l(t);d.length;)d.shift()();return u.push.apply(u,f||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,o=1;o<r.length;o++){var i=r[o];0!==a[i]&&(n=!1)}n&&(u.splice(t--,1),e=c(c.s=r[0]))}return e}var n={},o={5:0},a={5:0},u=[];function c(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var t=[];o[e]?t.push(o[e]):0!==o[e]&&{2:1,3:1,6:1,7:1,9:1,10:1}[e]&&t.push(o[e]=new Promise((function(t,r){for(var n="static/css/"+({}[e]||e)+"."+{0:"31d6cfe0",1:"31d6cfe0",2:"74e9175c",3:"75be5fa1",6:"fff1718c",7:"d823cf27",9:"4e156c5f",10:"b1da7569",11:"31d6cfe0",12:"31d6cfe0"}[e]+".chunk.css",a=c.p+n,u=document.getElementsByTagName("link"),i=0;i<u.length;i++){var f=(l=u[i]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(f===n||f===a))return t()}var s=document.getElementsByTagName("style");for(i=0;i<s.length;i++){var l;if((f=(l=s[i]).getAttribute("data-href"))===n||f===a)return t()}var d=document.createElement("link");d.rel="stylesheet",d.type="text/css",d.onload=t,d.onerror=function(t){var n=t&&t.target&&t.target.src||a,u=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");u.code="CSS_CHUNK_LOAD_FAILED",u.request=n,delete o[e],d.parentNode.removeChild(d),r(u)},d.href=a,document.getElementsByTagName("head")[0].appendChild(d)})).then((function(){o[e]=0})));var r=a[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=a[e]=[t,n]}));t.push(r[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,c.nc&&i.setAttribute("nonce",c.nc),i.src=function(e){return c.p+"static/js/"+({}[e]||e)+"."+{0:"f23bc353",1:"577466fa",2:"50959283",3:"428f5316",6:"d9c02e71",7:"da659454",9:"431be386",10:"63656ed8",11:"1d979fa2",12:"9de3a5cd"}[e]+".chunk.js"}(e);var f=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(s);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),o=t&&t.target&&t.target.src;f.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",f.name="ChunkLoadError",f.type=n,f.request=o,r[1](f)}a[e]=void 0}};var s=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(t)},c.m=e,c.c=n,c.d=function(e,t,r){c.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},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,t){if(1&t&&(e=c(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(c.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)c.d(r,n,function(t){return e[t]}.bind(null,n));return r},c.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(t,"a",t),t},c.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},c.p="/",c.oe=function(e){throw e};var i=this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[],f=i.push.bind(i);i.push=t,i=i.slice();for(var s=0;s<i.length;s++)t(i[s]);var l=f;r()}([]);
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
// Do this as the first thing so that any code reading it knows the right env.
|
||||
process.env.BABEL_ENV = "development"
|
||||
process.env.NODE_ENV = "development"
|
||||
process.env.BASE_URL = "http://test.marketapi.1688sup.com"
|
||||
process.env.UNIFIED_API = "http://api.test.user.1688sup.com/v1"
|
||||
process.env.UNIFIED_URL = "http://test.user.1688sup.com/#/login"
|
||||
// process.env.BASE_URL = "http://test.marketapi.1688sup.com"
|
||||
// process.env.UNIFIED_API = "http://api.test.user.1688sup.com/v1"
|
||||
// process.env.UNIFIED_URL = "http://test.user.1688sup.com/#/login"
|
||||
|
||||
// process.env.BASE_URL = "http://pre.marketapi.1688sup.com"
|
||||
// process.env.UNIFIED_API = "http://api.gray.user.1688sup.com/v1"
|
||||
// process.env.UNIFIED_URL = "http://gray.user.1688sup.com/#/login"
|
||||
process.env.BASE_URL = "http://pre.marketapi.1688sup.com"
|
||||
process.env.UNIFIED_API = "https://api.user.1688sup.com/v1"
|
||||
process.env.UNIFIED_URL = "https://user.1688sup.com/#/login"
|
||||
|
||||
// Makes the script crash on unhandled rejections instead of silently
|
||||
// ignoring them. In the future, promise rejections that are not handled will
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ process.env.UNIFIED_URL = "http://test.user.1688sup.com/#/login"
|
|||
|
||||
// 镜像
|
||||
// process.env.BASE_URL = "http://pre.marketapi.1688sup.com"
|
||||
// process.env.UNIFIED_API = "http://api.gray.user.1688sup.com/v1"
|
||||
// process.env.UNIFIED_URL = "http://gray.user.1688sup.com/#/login"
|
||||
// process.env.UNIFIED_API = "https://api.user.1688sup.com/v1"
|
||||
// process.env.UNIFIED_URL = "https://user.1688sup.com/#/login"
|
||||
|
||||
// Makes the script crash on unhandled rejections instead of silently
|
||||
// ignoring them. In the future, promise rejections that are not handled will
|
||||
|
|
|
|||
|
|
@ -940,18 +940,30 @@ export const handlerRefund = (orderNumber, data) => {
|
|||
// }
|
||||
|
||||
//订单下载列表-列表
|
||||
export const getdownloadList = (data) => {
|
||||
return req("get", download_url + `/export/excel/marketOrder/record`, data)
|
||||
export const queryDownLoadList = (data) => {
|
||||
return req("get", baseurl + `/order/export/list`, data)
|
||||
}
|
||||
//订单下载列表-数据下载
|
||||
export const exportDownload = (md5) => {
|
||||
return derive("get", download_url + `/export/excel/marketOrder/download/${md5}`)
|
||||
|
||||
// 获取订单下载地址
|
||||
export const getOrderDownloadUrl = (data) => {
|
||||
return req("get", baseurl + `/order/export/download_url`, data)
|
||||
}
|
||||
//订单下载列表-记录删除
|
||||
export const deleteDownload = (md5) => {
|
||||
return req("get", download_url + `/export/excel/marketOrder/delete/${md5}`)
|
||||
|
||||
// 删除订单导出记录
|
||||
export const deleteOrderDownload = (data) => {
|
||||
return req("get", baseurl + `/order/export/delete`, data)
|
||||
}
|
||||
|
||||
// //订单下载列表-数据下载
|
||||
// export const exportDownload = (md5) => {
|
||||
// return derive("get", download_url + `/export/excel/marketOrder/download/${md5}`)
|
||||
// }
|
||||
|
||||
// //订单下载列表-记录删除
|
||||
// export const deleteDownload = (md5) => {
|
||||
// return req("get", download_url + `/export/excel/marketOrder/delete/${md5}`)
|
||||
// }
|
||||
|
||||
/* 钉钉审批查询 */
|
||||
export const dingTaskQuery = (id) => {
|
||||
return req("post", baseurl + `/approvals/${id}/query`)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,17 @@
|
|||
import { deleteDownload, exportDownload, getdownloadList, handelResponse } from "@/assets/api.js"
|
||||
import {
|
||||
getOrderDownloadUrl,
|
||||
queryDownLoadList,
|
||||
handelResponse,
|
||||
deleteOrderDownload
|
||||
} from "@/assets/api.js"
|
||||
import "@/assets/comm.css"
|
||||
import Grid from "@/components/gird/main.js"
|
||||
import Ipt from "@/components/input/main"
|
||||
import TabPage from "@/components/tabPage/main.js"
|
||||
import React from "react"
|
||||
import { BlockLoading, Notify, Progress, Sweetalert } from "zent"
|
||||
import { globalDownloadUrl } from "@/tools"
|
||||
|
||||
const Column = [
|
||||
{
|
||||
title: "订单文件名称",
|
||||
|
|
@ -53,7 +60,7 @@ export default class downloadlist extends React.Component {
|
|||
this.getDownloadList()
|
||||
getprocess = setInterval(() => {
|
||||
this.getDownloadList()
|
||||
}, 1000)
|
||||
}, 2000)
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
|
|
@ -61,7 +68,7 @@ export default class downloadlist extends React.Component {
|
|||
}
|
||||
|
||||
//删除
|
||||
deleteFn(e, row) {
|
||||
deleteFn(row) {
|
||||
let self = this
|
||||
Sweetalert.confirm({
|
||||
type: "warning",
|
||||
|
|
@ -73,7 +80,7 @@ export default class downloadlist extends React.Component {
|
|||
</p>
|
||||
),
|
||||
onConfirm() {
|
||||
deleteDownload(row.filter_md5)
|
||||
deleteOrderDownload({ task_id: row.task_id })
|
||||
.then((res) => {
|
||||
handelResponse(
|
||||
res,
|
||||
|
|
@ -119,30 +126,14 @@ export default class downloadlist extends React.Component {
|
|||
}, 0)
|
||||
}
|
||||
|
||||
exportFn(e, rowData) {
|
||||
exportFn(task_id) {
|
||||
this.setState({ loading_visible: true })
|
||||
exportDownload(rowData.filter_md5)
|
||||
getOrderDownloadUrl({ task_id })
|
||||
.then((res) => {
|
||||
setTimeout(() => {
|
||||
this.setState({ loading_visible: false })
|
||||
}, 1000)
|
||||
if (res.type == "application/json") {
|
||||
const reader = new FileReader() //创建一个FileReader实例
|
||||
reader.readAsText(res, "utf-8") //读取文件,结果用字符串形式表示
|
||||
reader.onload = function () {
|
||||
const obj = JSON.parse(reader.result)
|
||||
Notify.clear()
|
||||
Notify.error(obj.message)
|
||||
}
|
||||
} else {
|
||||
let bl = new Blob([res])
|
||||
let fileName = rowData.file_name + ".zip" //设置文件名
|
||||
var link = document.createElement("a") //创建<a>标签
|
||||
link.href = window.URL.createObjectURL(bl)
|
||||
link.download = fileName //下载的文件名
|
||||
link.click()
|
||||
window.URL.revokeObjectURL(link.href) //清除URL
|
||||
}
|
||||
this.setState({ loading_visible: false })
|
||||
|
||||
globalDownloadUrl(res.data) // 异步下载
|
||||
// window.location.href = res.data
|
||||
})
|
||||
.catch((err) => {})
|
||||
}
|
||||
|
|
@ -154,14 +145,21 @@ export default class downloadlist extends React.Component {
|
|||
limit,
|
||||
file_name
|
||||
}
|
||||
getdownloadList(data)
|
||||
queryDownLoadList(data)
|
||||
.then((res) => {
|
||||
handelResponse(
|
||||
res,
|
||||
(response, msg) => {
|
||||
this.setState({ total: response.total, orderList: response.data })
|
||||
if (response.generate < 1) {
|
||||
clearInterval(getprocess)
|
||||
if (response.data) {
|
||||
this.setState({ total: response.total, orderList: response.data })
|
||||
|
||||
// 判断是否 完成
|
||||
let is_no_arr = response.data.filter((item) => item.process !== 100)
|
||||
if (is_no_arr.length === 0) {
|
||||
clearInterval(getprocess)
|
||||
}
|
||||
} else {
|
||||
this.setState({ total: response.total, orderList: [] })
|
||||
}
|
||||
},
|
||||
(err) => {
|
||||
|
|
@ -255,14 +253,10 @@ export default class downloadlist extends React.Component {
|
|||
return (
|
||||
<p>
|
||||
<span
|
||||
className={
|
||||
rowData.status != 3 || rowData.process === 0
|
||||
? "grid-link disabled"
|
||||
: "grid-link"
|
||||
}
|
||||
className={rowData.process !== 100 ? "grid-link disabled" : "grid-link"}
|
||||
onClick={(e) => {
|
||||
if (rowData.status === 3 && rowData.process === 100) {
|
||||
this.exportFn(e, rowData)
|
||||
if (rowData.process === 100) {
|
||||
this.exportFn(rowData.task_id)
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
|
@ -271,13 +265,11 @@ export default class downloadlist extends React.Component {
|
|||
|
||||
<span
|
||||
className={
|
||||
rowData.status == 1 || rowData.process === 0
|
||||
? "grid-link ml15 disabled"
|
||||
: "ml15 grid-link"
|
||||
rowData.process !== 100 ? "grid-link ml15 disabled" : "ml15 grid-link"
|
||||
}
|
||||
onClick={(e) => {
|
||||
if (rowData.status === 3 && rowData.process === 100) {
|
||||
this.deleteFn(e, rowData)
|
||||
if (rowData.process === 100) {
|
||||
this.deleteFn(rowData)
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
|
|
|||
|
|
@ -143,3 +143,15 @@ export function keyDelayFunc(row = {}) {
|
|||
return "-"
|
||||
}
|
||||
}
|
||||
|
||||
// 链接地址下载
|
||||
export function globalDownloadUrl(url, filename) {
|
||||
const link = document.createElement("a")
|
||||
link.style.display = "none"
|
||||
link.href = url
|
||||
link.download = filename ? filename : ""
|
||||
document.body.appendChild(link)
|
||||
link.click()
|
||||
document.body.removeChild(link) // 下载完成移除元素
|
||||
window.URL.revokeObjectURL(url) // 释放掉blob对象
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue