Merge branch 'pre'
This commit is contained in:
commit
8bf1a71644
|
|
@ -3,20 +3,20 @@
|
|||
"static/js/0.f4301035.chunk.js": "/static/js/0.f4301035.chunk.js",
|
||||
"static/js/1.32d0ab4c.chunk.js": "/static/js/1.32d0ab4c.chunk.js",
|
||||
"static/css/2.74e9175c.chunk.css": "/static/css/2.74e9175c.chunk.css",
|
||||
"static/js/2.5a1edee3.chunk.js": "/static/js/2.5a1edee3.chunk.js",
|
||||
"static/js/2.0f66261a.chunk.js": "/static/js/2.0f66261a.chunk.js",
|
||||
"static/css/3.75be5fa1.chunk.css": "/static/css/3.75be5fa1.chunk.css",
|
||||
"static/js/3.982898bb.chunk.js": "/static/js/3.982898bb.chunk.js",
|
||||
"main.css": "/static/css/main.b0e33980.chunk.css",
|
||||
"main.js": "/static/js/main.fafd3bfe.chunk.js",
|
||||
"runtime-main.js": "/static/js/runtime-main.4a107163.js",
|
||||
"static/css/6.4dbf3e8a.chunk.css": "/static/css/6.4dbf3e8a.chunk.css",
|
||||
"static/js/6.0e9ce378.chunk.js": "/static/js/6.0e9ce378.chunk.js",
|
||||
"static/css/7.d823cf27.chunk.css": "/static/css/7.d823cf27.chunk.css",
|
||||
"static/js/7.344fdca5.chunk.js": "/static/js/7.344fdca5.chunk.js",
|
||||
"runtime-main.js": "/static/js/runtime-main.c885099a.js",
|
||||
"static/css/6.58069cbd.chunk.css": "/static/css/6.58069cbd.chunk.css",
|
||||
"static/js/6.6e718be0.chunk.js": "/static/js/6.6e718be0.chunk.js",
|
||||
"static/css/7.10a7f02b.chunk.css": "/static/css/7.10a7f02b.chunk.css",
|
||||
"static/js/7.e4f0fb1f.chunk.js": "/static/js/7.e4f0fb1f.chunk.js",
|
||||
"static/css/8.9a9b6f5c.chunk.css": "/static/css/8.9a9b6f5c.chunk.css",
|
||||
"static/js/8.c9f9ab89.chunk.js": "/static/js/8.c9f9ab89.chunk.js",
|
||||
"static/css/9.4e156c5f.chunk.css": "/static/css/9.4e156c5f.chunk.css",
|
||||
"static/js/9.5082dd20.chunk.js": "/static/js/9.5082dd20.chunk.js",
|
||||
"static/js/9.5423356f.chunk.js": "/static/js/9.5423356f.chunk.js",
|
||||
"static/css/10.b1da7569.chunk.css": "/static/css/10.b1da7569.chunk.css",
|
||||
"static/js/10.14f1988f.chunk.js": "/static/js/10.14f1988f.chunk.js",
|
||||
"static/js/11.11a209a0.chunk.js": "/static/js/11.11a209a0.chunk.js",
|
||||
|
|
@ -26,13 +26,13 @@
|
|||
"static/js/1.32d0ab4c.chunk.js.LICENSE.txt": "/static/js/1.32d0ab4c.chunk.js.LICENSE.txt",
|
||||
"static/js/11.11a209a0.chunk.js.LICENSE.txt": "/static/js/11.11a209a0.chunk.js.LICENSE.txt",
|
||||
"static/js/3.982898bb.chunk.js.LICENSE.txt": "/static/js/3.982898bb.chunk.js.LICENSE.txt",
|
||||
"static/js/6.0e9ce378.chunk.js.LICENSE.txt": "/static/js/6.0e9ce378.chunk.js.LICENSE.txt",
|
||||
"static/js/7.344fdca5.chunk.js.LICENSE.txt": "/static/js/7.344fdca5.chunk.js.LICENSE.txt",
|
||||
"static/js/6.6e718be0.chunk.js.LICENSE.txt": "/static/js/6.6e718be0.chunk.js.LICENSE.txt",
|
||||
"static/js/7.e4f0fb1f.chunk.js.LICENSE.txt": "/static/js/7.e4f0fb1f.chunk.js.LICENSE.txt",
|
||||
"static/js/8.c9f9ab89.chunk.js.LICENSE.txt": "/static/js/8.c9f9ab89.chunk.js.LICENSE.txt",
|
||||
"static/js/9.5082dd20.chunk.js.LICENSE.txt": "/static/js/9.5082dd20.chunk.js.LICENSE.txt"
|
||||
"static/js/9.5423356f.chunk.js.LICENSE.txt": "/static/js/9.5423356f.chunk.js.LICENSE.txt"
|
||||
},
|
||||
"entrypoints": [
|
||||
"static/js/runtime-main.4a107163.js",
|
||||
"static/js/runtime-main.c885099a.js",
|
||||
"static/css/8.9a9b6f5c.chunk.css",
|
||||
"static/js/8.c9f9ab89.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:"4dbf3e8a",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:"f4301035",1:"32d0ab4c",2:"5a1edee3",3:"982898bb",6:"0e9ce378",7:"344fdca5",9:"5082dd20",10:"14f1988f",11:"11a209a0",12:"6aba6a7f"}[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.c9f9ab89.chunk.js"></script><script src="/static/js/main.fafd3bfe.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,i=t[0],c=t[1],f=t[2],s=0,d=[];s<i.length;s++)o=i[s],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&d.push(a[o][0]),a[o]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[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 c=r[o];0!==a[c]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={5:0},a={5:0},u=[];function i(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,i),r.l=!0,r.exports}i.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:"58069cbd",7:"10a7f02b",9:"4e156c5f",10:"b1da7569",11:"31d6cfe0",12:"31d6cfe0"}[e]+".chunk.css",a=i.p+n,u=document.getElementsByTagName("link"),c=0;c<u.length;c++){var f=(l=u[c]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(f===n||f===a))return t()}var s=document.getElementsByTagName("style");for(c=0;c<s.length;c++){var l;if((f=(l=s[c]).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,c=document.createElement("script");c.charset="utf-8",c.timeout=120,i.nc&&c.setAttribute("nonce",i.nc),c.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{0:"f4301035",1:"32d0ab4c",2:"0f66261a",3:"982898bb",6:"6e718be0",7:"e4f0fb1f",9:"5423356f",10:"14f1988f",11:"11a209a0",12:"6aba6a7f"}[e]+".chunk.js"}(e);var f=new Error;u=function(t){c.onerror=c.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:c})}),12e4);c.onerror=c.onload=u,document.head.appendChild(c)}return Promise.all(t)},i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/",i.oe=function(e){throw e};var c=this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[],f=c.push.bind(c);c.push=t,c=c.slice();for(var s=0;s<c.length;s++)t(c[s]);var l=f;r()}([])</script><script src="/static/js/8.c9f9ab89.chunk.js"></script><script src="/static/js/main.fafd3bfe.chunk.js"></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -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:"4dbf3e8a",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:"f4301035",1:"32d0ab4c",2:"5a1edee3",3:"982898bb",6:"0e9ce378",7:"344fdca5",9:"5082dd20",10:"14f1988f",11:"11a209a0",12:"6aba6a7f"}[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()}([]);
|
||||
|
|
@ -0,0 +1 @@
|
|||
!function(e){function t(t){for(var n,o,i=t[0],c=t[1],f=t[2],s=0,d=[];s<i.length;s++)o=i[s],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&d.push(a[o][0]),a[o]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[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 c=r[o];0!==a[c]&&(n=!1)}n&&(u.splice(t--,1),e=i(i.s=r[0]))}return e}var n={},o={5:0},a={5:0},u=[];function i(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,i),r.l=!0,r.exports}i.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:"58069cbd",7:"10a7f02b",9:"4e156c5f",10:"b1da7569",11:"31d6cfe0",12:"31d6cfe0"}[e]+".chunk.css",a=i.p+n,u=document.getElementsByTagName("link"),c=0;c<u.length;c++){var f=(l=u[c]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(f===n||f===a))return t()}var s=document.getElementsByTagName("style");for(c=0;c<s.length;c++){var l;if((f=(l=s[c]).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,c=document.createElement("script");c.charset="utf-8",c.timeout=120,i.nc&&c.setAttribute("nonce",i.nc),c.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{0:"f4301035",1:"32d0ab4c",2:"0f66261a",3:"982898bb",6:"6e718be0",7:"e4f0fb1f",9:"5423356f",10:"14f1988f",11:"11a209a0",12:"6aba6a7f"}[e]+".chunk.js"}(e);var f=new Error;u=function(t){c.onerror=c.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:c})}),12e4);c.onerror=c.onload=u,document.head.appendChild(c)}return Promise.all(t)},i.m=e,i.c=n,i.d=function(e,t,r){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},i.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,t){if(1&t&&(e=i(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(i.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)i.d(r,n,function(t){return e[t]}.bind(null,n));return r},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="/",i.oe=function(e){throw e};var c=this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[],f=c.push.bind(c);c.push=t,c=c.slice();for(var s=0;s<c.length;s++)t(c[s]);var l=f;r()}([]);
|
||||
|
|
@ -743,6 +743,11 @@ export const resetKey = (data) => {
|
|||
return req("put", baseurl + "/key/reset", data)
|
||||
}
|
||||
|
||||
// key码核销通知
|
||||
export const noticeKey = (data) => {
|
||||
return req("post", baseurl + "/key/merchantUsageNotify", data)
|
||||
}
|
||||
|
||||
//提交审核
|
||||
export const approvals = (id, data) => {
|
||||
return req("post", baseurl + "/plan/" + id + "/approvals", data)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ function init() {
|
|||
plan: "",
|
||||
state: { key: 0, text: "全部" },
|
||||
key: "",
|
||||
key_batch_id: ""
|
||||
key_batch_id: "",
|
||||
out_biz_no: ''
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -121,7 +122,8 @@ export default forwardRef(({ onQuery, query, resetChange }, myRef) => {
|
|||
plan_id: data.plan?.key || null,
|
||||
status: data.state?.key || null,
|
||||
key: data.key || null,
|
||||
key_batch_id: data.key_batch_id?.id || null
|
||||
key_batch_id: data.key_batch_id?.id || null,
|
||||
out_biz_no: data.out_biz_no || null,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -202,6 +204,17 @@ export default forwardRef(({ onQuery, query, resetChange }, myRef) => {
|
|||
onClearItem={() => setModels({ ...models, key: "" })}
|
||||
/>
|
||||
</FormItem>
|
||||
<FormItem labelname="交易号：" required="" labelwidth="70px">
|
||||
<Ipt
|
||||
value={models.out_biz_no}
|
||||
countShow={false}
|
||||
labelWidth="0px"
|
||||
placeholder="请输入下游交易号"
|
||||
width={204}
|
||||
onChange={(va) => setModels({ ...models, out_biz_no: va })}
|
||||
onClearItem={() => setModels({ ...models, out_biz_no: "" })}
|
||||
/>
|
||||
</FormItem>
|
||||
|
||||
<div className="button_box">
|
||||
<Button
|
||||
|
|
@ -210,7 +223,8 @@ export default forwardRef(({ onQuery, query, resetChange }, myRef) => {
|
|||
if (
|
||||
onChange(models).plan_id ||
|
||||
onChange(models).reseller_id ||
|
||||
onChange(models).key
|
||||
onChange(models).key ||
|
||||
onChange(models).out_biz_no
|
||||
) {
|
||||
onQuery(onChange(models))
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.keysFind {
|
||||
width: 1200px;
|
||||
width: 1320px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ import {
|
|||
keyBatchUsage,
|
||||
keyCancel,
|
||||
keyUsage,
|
||||
resetKey
|
||||
resetKey,
|
||||
noticeKey
|
||||
} from "@/assets/api.js"
|
||||
import menu from "@/assets/enum.js"
|
||||
import UseUploadExcel from "@/components/UseUploadExcel"
|
||||
|
|
@ -153,7 +154,8 @@ const UseKeyList = () => {
|
|||
plan_id: "",
|
||||
status: "",
|
||||
key: "",
|
||||
key_batch_id: ""
|
||||
key_batch_id: "",
|
||||
out_biz_no: "",
|
||||
},
|
||||
keyDelayVisible: false,
|
||||
keyDelay: [],
|
||||
|
|
@ -192,6 +194,7 @@ const UseKeyList = () => {
|
|||
status: state.query.status || null,
|
||||
key: state.query.key || null,
|
||||
key_batch_id: state.query.key_batch_id || null,
|
||||
out_biz_no: state.query.out_biz_no || null,
|
||||
hash: state.hash !== "" ? state.hash : null,
|
||||
page: state.page,
|
||||
limit: state.limit
|
||||
|
|
@ -477,6 +480,24 @@ const UseKeyList = () => {
|
|||
}
|
||||
|
||||
const menuItemClick = (e, key, rowData) => {
|
||||
//新增核销通知到下游
|
||||
if(Number(key) === 6){
|
||||
let formdata = {
|
||||
key: rowData.key
|
||||
}
|
||||
noticeKey(formdata).then((res) => {
|
||||
handelResponse(
|
||||
res,
|
||||
(req, msg) => {
|
||||
setState({ page: 1, limit: 10, isQuery: !state.isQuery })
|
||||
Notify.success("核销通知成功")
|
||||
},
|
||||
(err) => {
|
||||
Notify.error(err)
|
||||
}
|
||||
)
|
||||
})
|
||||
}
|
||||
//新增key码重置功能
|
||||
if(Number(key) === 5){
|
||||
Sweetalert.confirm({
|
||||
|
|
@ -828,6 +849,11 @@ const UseKeyList = () => {
|
|||
<MenuItem key="4" disabled={![1, 2].includes(rowData.status)}>
|
||||
编辑key码有效期
|
||||
</MenuItem>
|
||||
<MenuItem
|
||||
key="6"
|
||||
>
|
||||
发起核销通知到下游
|
||||
</MenuItem>
|
||||
<MenuItem
|
||||
key="5"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue