Merge branch 'master' into dynamicPrompt

This commit is contained in:
wangsongsole 2023-12-28 14:31:46 +08:00
commit fd689d21cf
46 changed files with 254 additions and 133 deletions

View File

@ -1,41 +1,41 @@
{
"files": {
"static/js/0.1d62adab.chunk.js": "/static/js/0.1d62adab.chunk.js",
"static/js/1.c838a238.chunk.js": "/static/js/1.c838a238.chunk.js",
"static/js/0.4d9669ee.chunk.js": "/static/js/0.4d9669ee.chunk.js",
"static/js/1.1bdca03e.chunk.js": "/static/js/1.1bdca03e.chunk.js",
"static/css/2.74e9175c.chunk.css": "/static/css/2.74e9175c.chunk.css",
"static/js/2.7833e104.chunk.js": "/static/js/2.7833e104.chunk.js",
"static/js/2.64d8cbe1.chunk.js": "/static/js/2.64d8cbe1.chunk.js",
"static/css/3.75be5fa1.chunk.css": "/static/css/3.75be5fa1.chunk.css",
"static/js/3.00ede3c3.chunk.js": "/static/js/3.00ede3c3.chunk.js",
"static/js/3.afee5f13.chunk.js": "/static/js/3.afee5f13.chunk.js",
"main.css": "/static/css/main.b0e33980.chunk.css",
"main.js": "/static/js/main.4bf14af3.chunk.js",
"runtime-main.js": "/static/js/runtime-main.441165dd.js",
"static/css/6.92b126a8.chunk.css": "/static/css/6.92b126a8.chunk.css",
"static/js/6.31a42b87.chunk.js": "/static/js/6.31a42b87.chunk.js",
"static/css/7.42d9ec9c.chunk.css": "/static/css/7.42d9ec9c.chunk.css",
"static/js/7.5ac65b17.chunk.js": "/static/js/7.5ac65b17.chunk.js",
"main.js": "/static/js/main.bf745e37.chunk.js",
"runtime-main.js": "/static/js/runtime-main.ddc0ccd8.js",
"static/css/6.8e0507c3.chunk.css": "/static/css/6.8e0507c3.chunk.css",
"static/js/6.04f8899d.chunk.js": "/static/js/6.04f8899d.chunk.js",
"static/css/7.ecaa5191.chunk.css": "/static/css/7.ecaa5191.chunk.css",
"static/js/7.8b0d231d.chunk.js": "/static/js/7.8b0d231d.chunk.js",
"static/css/8.9a9b6f5c.chunk.css": "/static/css/8.9a9b6f5c.chunk.css",
"static/js/8.751f6ff7.chunk.js": "/static/js/8.751f6ff7.chunk.js",
"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.b7d21bd1.chunk.js": "/static/js/9.b7d21bd1.chunk.js",
"static/js/10.f012a795.chunk.js": "/static/js/10.f012a795.chunk.js",
"static/js/9.813d1fbb.chunk.js": "/static/js/9.813d1fbb.chunk.js",
"static/js/10.7a8a62de.chunk.js": "/static/js/10.7a8a62de.chunk.js",
"static/css/11.b1da7569.chunk.css": "/static/css/11.b1da7569.chunk.css",
"static/js/11.6dd129c8.chunk.js": "/static/js/11.6dd129c8.chunk.js",
"static/js/12.5d12f291.chunk.js": "/static/js/12.5d12f291.chunk.js",
"static/js/11.487e7d9f.chunk.js": "/static/js/11.487e7d9f.chunk.js",
"static/js/12.57bb2cde.chunk.js": "/static/js/12.57bb2cde.chunk.js",
"index.html": "/index.html",
"static/js/0.1d62adab.chunk.js.LICENSE.txt": "/static/js/0.1d62adab.chunk.js.LICENSE.txt",
"static/js/1.c838a238.chunk.js.LICENSE.txt": "/static/js/1.c838a238.chunk.js.LICENSE.txt",
"static/js/10.f012a795.chunk.js.LICENSE.txt": "/static/js/10.f012a795.chunk.js.LICENSE.txt",
"static/js/3.00ede3c3.chunk.js.LICENSE.txt": "/static/js/3.00ede3c3.chunk.js.LICENSE.txt",
"static/js/6.31a42b87.chunk.js.LICENSE.txt": "/static/js/6.31a42b87.chunk.js.LICENSE.txt",
"static/js/7.5ac65b17.chunk.js.LICENSE.txt": "/static/js/7.5ac65b17.chunk.js.LICENSE.txt",
"static/js/8.751f6ff7.chunk.js.LICENSE.txt": "/static/js/8.751f6ff7.chunk.js.LICENSE.txt",
"static/js/9.b7d21bd1.chunk.js.LICENSE.txt": "/static/js/9.b7d21bd1.chunk.js.LICENSE.txt"
"static/js/0.4d9669ee.chunk.js.LICENSE.txt": "/static/js/0.4d9669ee.chunk.js.LICENSE.txt",
"static/js/1.1bdca03e.chunk.js.LICENSE.txt": "/static/js/1.1bdca03e.chunk.js.LICENSE.txt",
"static/js/10.7a8a62de.chunk.js.LICENSE.txt": "/static/js/10.7a8a62de.chunk.js.LICENSE.txt",
"static/js/3.afee5f13.chunk.js.LICENSE.txt": "/static/js/3.afee5f13.chunk.js.LICENSE.txt",
"static/js/6.04f8899d.chunk.js.LICENSE.txt": "/static/js/6.04f8899d.chunk.js.LICENSE.txt",
"static/js/7.8b0d231d.chunk.js.LICENSE.txt": "/static/js/7.8b0d231d.chunk.js.LICENSE.txt",
"static/js/8.c0e52fb6.chunk.js.LICENSE.txt": "/static/js/8.c0e52fb6.chunk.js.LICENSE.txt",
"static/js/9.813d1fbb.chunk.js.LICENSE.txt": "/static/js/9.813d1fbb.chunk.js.LICENSE.txt"
},
"entrypoints": [
"static/js/runtime-main.441165dd.js",
"static/js/runtime-main.ddc0ccd8.js",
"static/css/8.9a9b6f5c.chunk.css",
"static/js/8.751f6ff7.chunk.js",
"static/js/8.c0e52fb6.chunk.js",
"static/css/main.b0e33980.chunk.css",
"static/js/main.4bf14af3.chunk.js"
"static/js/main.bf745e37.chunk.js"
]
}

View File

@ -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],s=t[2],f=0,d=[];f<c.length;f++)o=c[f],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,s||[]),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,11: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:"92b126a8",7:"42d9ec9c",9:"4e156c5f",10:"31d6cfe0",11:"b1da7569",12:"31d6cfe0"}[e]+".chunk.css",a=c.p+n,u=document.getElementsByTagName("link"),i=0;i<u.length;i++){var s=(l=u[i]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(s===n||s===a))return t()}var f=document.getElementsByTagName("style");for(i=0;i<f.length;i++){var l;if((s=(l=f[i]).getAttribute("data-href"))===n||s===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:"1d62adab",1:"c838a238",2:"7833e104",3:"00ede3c3",6:"31a42b87",7:"5ac65b17",9:"b7d21bd1",10:"f012a795",11:"6dd129c8",12:"5d12f291"}[e]+".chunk.js"}(e);var s=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(f);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;s.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",s.name="ChunkLoadError",s.type=n,s.request=o,r[1](s)}a[e]=void 0}};var f=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||[],s=i.push.bind(i);i.push=t,i=i.slice();for(var f=0;f<i.length;f++)t(i[f]);var l=s;r()}([])</script><script src="/static/js/8.751f6ff7.chunk.js"></script><script src="/static/js/main.4bf14af3.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,11: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:"8e0507c3",7:"ecaa5191",9:"4e156c5f",10:"31d6cfe0",11:"b1da7569",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:"4d9669ee",1:"1bdca03e",2:"64d8cbe1",3:"afee5f13",6:"04f8899d",7:"8b0d231d",9:"813d1fbb",10:"7a8a62de",11:"487e7d9f",12:"57bb2cde"}[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.bf745e37.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

View File

@ -0,0 +1 @@
(this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[]).push([[11],{432:function(e,n,s){},474:function(e,n,s){"use strict";s.r(n),s.d(n,"default",(function(){return o}));var t=s(1),i=s.n(t),r=(s(432),s(175)),c=s(10),m="/Users/zhangds/web/blue-brother/frontend/src/pages/errpage/errpage.js";class o extends i.a.Component{constructor(e){super(e),this.state={}}tick(){window.history.go(-1)}componentWillUnmount(){}render(){return Object(c.jsxDEV)("div",{id:"errpage",className:"maincenter",children:[Object(c.jsxDEV)("img",{src:"https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/404.png",alt:""},void 0,!1,{fileName:m,lineNumber:17,columnNumber:9},this),Object(c.jsxDEV)(r.a,{onClick:this.tick.bind(this),children:"\u8fd4\u56de\u4e0a\u4e00\u9875"},void 0,!1,{fileName:m,lineNumber:21,columnNumber:9},this)]},void 0,!0,{fileName:m,lineNumber:16,columnNumber:7},this)}}}}]);

View File

@ -1 +0,0 @@
(this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[]).push([[11],{432:function(e,n,t){},474:function(e,n,t){"use strict";t.r(n),t.d(n,"default",(function(){return o}));var i=t(1),s=t.n(i),r=(t(432),t(175)),c=t(10),m="D:\\project\\\u8425\u9500\u7cfb\u7edf\\frontend\\src\\pages\\errpage\\errpage.js";class o extends s.a.Component{constructor(e){super(e),this.state={}}tick(){window.history.go(-1)}componentWillUnmount(){}render(){return Object(c.jsxDEV)("div",{id:"errpage",className:"maincenter",children:[Object(c.jsxDEV)("img",{src:"https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/404.png",alt:""},void 0,!1,{fileName:m,lineNumber:17,columnNumber:9},this),Object(c.jsxDEV)(r.a,{onClick:this.tick.bind(this),children:"\u8fd4\u56de\u4e0a\u4e00\u9875"},void 0,!1,{fileName:m,lineNumber:21,columnNumber:9},this)]},void 0,!0,{fileName:m,lineNumber:16,columnNumber:7},this)}}}}]);

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

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

View File

@ -1 +0,0 @@
(this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[]).push([[4],{36:function(e,n,t){},45:function(e,n,t){},46:function(e,n,t){},54:function(e,n,t){},55:function(e,n,t){"use strict";t.r(n);var i=t(1),o=t(24),l=t.n(o),c=(t(45),t(25)),m=t(5),s=(t(46),t(36),t(58)),r=t(10),a="D:\\project\\\u8425\u9500\u7cfb\u7edf\\frontend\\src\\App.js";const u=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(1),t.e(3),t.e(2),t.e(6)]).then(t.bind(null,491)))),b=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(1),t.e(3),t.e(2),t.e(7)]).then(t.bind(null,503)))),d=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(11)]).then(t.bind(null,474)))),h=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(1),t.e(10),t.e(2),t.e(9)]).then(t.bind(null,479))));class N extends i.Component{constructor(...e){super(...e),this.state={pathname:""}}componentWillMount(){const e=window.location.href.lastIndexOf("/"),n=window.location.href.substr(e);this.setState({pathname:`${n}`})}render(){return Object(r.jsxDEV)(c.a,{children:Object(r.jsxDEV)(i.Suspense,{fallback:Object(r.jsxDEV)(s.a,{loading:!0,icon:"circle",iconText:"\u52a0\u8f7d\u4e2d..."},void 0,!1,{fileName:a,lineNumber:29,columnNumber:13},this),children:[Object(r.jsxDEV)(m.b,{path:"/login",exact:!0,component:b},void 0,!1,{fileName:a,lineNumber:31,columnNumber:11},this),Object(r.jsxDEV)(m.b,{path:"/edittemplate",exact:!0,component:h},void 0,!1,{fileName:a,lineNumber:32,columnNumber:11},this),Object(r.jsxDEV)(m.b,{path:"/home",component:u},void 0,!1,{fileName:a,lineNumber:33,columnNumber:11},this),Object(r.jsxDEV)(m.b,{exact:!0,path:"/",render:()=>Object(r.jsxDEV)(m.a,{to:"/login"},void 0,!1,{fileName:a,lineNumber:37,columnNumber:27},this)},void 0,!1,{fileName:a,lineNumber:34,columnNumber:11},this),Object(r.jsxDEV)(m.b,{component:d},void 0,!1,{fileName:a,lineNumber:38,columnNumber:11},this)]},void 0,!0,{fileName:a,lineNumber:27,columnNumber:9},this)},void 0,!1,{fileName:a,lineNumber:26,columnNumber:7},this)}}var j=e=>{e&&e instanceof Function&&t.e(12).then(t.bind(null,476)).then((({getCLS:n,getFID:t,getFCP:i,getLCP:o,getTTFB:l})=>{n(e),t(e),i(e),o(e),l(e)}))};t(53),t(54);l.a.render(Object(r.jsxDEV)(N,{},void 0,!1,{fileName:"D:\\project\\\u8425\u9500\u7cfb\u7edf\\frontend\\src\\index.js",lineNumber:10,columnNumber:5},void 0),document.getElementById("root")),j()}},[[55,5,8]]]);

View File

@ -0,0 +1 @@
(this.webpackJsonpmarketingsystem=this.webpackJsonpmarketingsystem||[]).push([[4],{36:function(e,n,t){},45:function(e,n,t){},46:function(e,n,t){},54:function(e,n,t){},55:function(e,n,t){"use strict";t.r(n);var i=t(1),o=t(24),l=t.n(o),s=(t(45),t(25)),m=t(5),c=(t(46),t(36),t(58)),r=t(10),b="/Users/zhangds/web/blue-brother/frontend/src/App.js";const a=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(1),t.e(3),t.e(2),t.e(6)]).then(t.bind(null,491)))),u=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(1),t.e(3),t.e(2),t.e(7)]).then(t.bind(null,503)))),h=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(11)]).then(t.bind(null,474)))),d=Object(i.lazy)((()=>Promise.all([t.e(0),t.e(1),t.e(10),t.e(2),t.e(9)]).then(t.bind(null,479))));class N extends i.Component{constructor(...e){super(...e),this.state={pathname:""}}componentWillMount(){const e=window.location.href.lastIndexOf("/"),n=window.location.href.substr(e);this.setState({pathname:`${n}`})}render(){return Object(r.jsxDEV)(s.a,{children:Object(r.jsxDEV)(i.Suspense,{fallback:Object(r.jsxDEV)(c.a,{loading:!0,icon:"circle",iconText:"\u52a0\u8f7d\u4e2d..."},void 0,!1,{fileName:b,lineNumber:29,columnNumber:13},this),children:[Object(r.jsxDEV)(m.b,{path:"/login",exact:!0,component:u},void 0,!1,{fileName:b,lineNumber:31,columnNumber:11},this),Object(r.jsxDEV)(m.b,{path:"/edittemplate",exact:!0,component:d},void 0,!1,{fileName:b,lineNumber:32,columnNumber:11},this),Object(r.jsxDEV)(m.b,{path:"/home",component:a},void 0,!1,{fileName:b,lineNumber:33,columnNumber:11},this),Object(r.jsxDEV)(m.b,{exact:!0,path:"/",render:()=>Object(r.jsxDEV)(m.a,{to:"/login"},void 0,!1,{fileName:b,lineNumber:37,columnNumber:27},this)},void 0,!1,{fileName:b,lineNumber:34,columnNumber:11},this),Object(r.jsxDEV)(m.b,{component:h},void 0,!1,{fileName:b,lineNumber:38,columnNumber:11},this)]},void 0,!0,{fileName:b,lineNumber:27,columnNumber:9},this)},void 0,!1,{fileName:b,lineNumber:26,columnNumber:7},this)}}var j=e=>{e&&e instanceof Function&&t.e(12).then(t.bind(null,476)).then((({getCLS:n,getFID:t,getFCP:i,getLCP:o,getTTFB:l})=>{n(e),t(e),i(e),o(e),l(e)}))};t(53),t(54);l.a.render(Object(r.jsxDEV)(N,{},void 0,!1,{fileName:"/Users/zhangds/web/blue-brother/frontend/src/index.js",lineNumber:10,columnNumber:5},void 0),document.getElementById("root")),j()}},[[55,5,8]]]);

View File

@ -1 +1 @@
!function(e){function t(t){for(var n,o,c=t[0],i=t[1],s=t[2],f=0,d=[];f<c.length;f++)o=c[f],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,s||[]),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,11: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:"92b126a8",7:"42d9ec9c",9:"4e156c5f",10:"31d6cfe0",11:"b1da7569",12:"31d6cfe0"}[e]+".chunk.css",a=c.p+n,u=document.getElementsByTagName("link"),i=0;i<u.length;i++){var s=(l=u[i]).getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(s===n||s===a))return t()}var f=document.getElementsByTagName("style");for(i=0;i<f.length;i++){var l;if((s=(l=f[i]).getAttribute("data-href"))===n||s===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:"1d62adab",1:"c838a238",2:"7833e104",3:"00ede3c3",6:"31a42b87",7:"5ac65b17",9:"b7d21bd1",10:"f012a795",11:"6dd129c8",12:"5d12f291"}[e]+".chunk.js"}(e);var s=new Error;u=function(t){i.onerror=i.onload=null,clearTimeout(f);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;s.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",s.name="ChunkLoadError",s.type=n,s.request=o,r[1](s)}a[e]=void 0}};var f=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||[],s=i.push.bind(i);i.push=t,i=i.slice();for(var f=0;f<i.length;f++)t(i[f]);var l=s;r()}([]);
!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,11: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:"8e0507c3",7:"ecaa5191",9:"4e156c5f",10:"31d6cfe0",11:"b1da7569",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:"4d9669ee",1:"1bdca03e",2:"64d8cbe1",3:"afee5f13",6:"04f8899d",7:"8b0d231d",9:"813d1fbb",10:"7a8a62de",11:"487e7d9f",12:"57bb2cde"}[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()}([]);

View File

@ -999,4 +999,9 @@ export const queryConfig = (data) => {
return req("get", baseurl + "/voucher/queryConfig", data)
}
/* 重试领取 */
export const receiveRetry = (data) => {
return req("post", baseurl + "/voucher/receiveRetry", data)
}
export { req }

View File

@ -41,10 +41,51 @@ const menu = {
return "充值失败"
}
},
orderStatusBg(params) {
switch (params) {
/* 立减金 */
if (params.status === 1 && params.type === 2) {
return "#43A65D"
}
switch (params.status) {
case 0:
return "#BFBFBF"
return "#3575C7"
case 1:
return "#3575C7"
case 2:
return "#43A65D"
case 3:
return "#ff0000"
case 4:
return "#c9c9c9"
case 5:
return "#ca6b61"
case 6:
return "#ca6b61"
case 7:
return "#9655b4"
case 8:
return "#9f19dd"
default:
return "transparent"
}
},
orderPayStatusBg(params) {
switch (params) {
case 1:
return "#3575C7"
case 2:
return "#43A65D"
case 3:
return "#ff0000"
default:
return "transparent"
}
},
orderVoucherStatusBg(params) {
switch (params) {
case 1:
return "#3575C7"
case 2:
@ -54,14 +95,14 @@ const menu = {
case 4:
return "#0026ff"
case 5:
return "#ca6b61"
return "#3575C7"
case 6:
return "#ca6b61"
return "#3575C7"
case 7:
return "#9655b4"
case 8:
return "#9f19dd"
case 333:
default:
return "transparent"
}
},

View File

@ -103,6 +103,7 @@ export default class addKnockGold extends Component {
irregularTime: [[]], //
ruleDate: [[]], //
ruleWeek: [], //
send_num: 1,
provider: "lsxd", //
receive_mode: 1
},
@ -483,6 +484,7 @@ export default class addKnockGold extends Component {
transformData.channel_activity_id = this.state.model.channel_activity_id //
transformData.price = this.state.model.price //
transformData.recharge_amount = this.state.model.recharge_amount //
transformData.send_num = this.state.model.send_num
transformData.denomination = this.state.model.denomination
transformData.reduce_amount = this.state.model.reduce_amount
transformData.all_budget = this.state.model.all_budget
@ -785,7 +787,7 @@ export default class addKnockGold extends Component {
>
<RadioButton value={"1"}>支付宝</RadioButton>
<RadioButton value={"2"}>微信</RadioButton>
{!this.props.ysf && <RadioButton value={"3"}>云闪付</RadioButton>}
{!this.props.ysf ? <RadioButton value={"3"}>云闪付</RadioButton> : null}
</RadioGroup>
</FormItem>
<FormItem labelname="主体名称" prop="provider" id="provider" key="provider">
@ -826,9 +828,7 @@ export default class addKnockGold extends Component {
<RadioButton value={2}>账号领取</RadioButton>
</RadioGroup>
</FormItem>
) : (
<></>
)}
) : null}
<FormItem labelname="立减金平台批次号" prop="channel_activity_id" id="batch_number">
<Ipt
onChange={(value) => {
@ -1038,6 +1038,26 @@ export default class addKnockGold extends Component {
alignment={"left"}
/>
</FormItem>
<FormItem id="send_num" labelname="单次到账" prop="send_num">
<Ipt
onChange={(value) => {
this.onHandleChange(value, "send_num")
}}
onClearItem={() => {
this.onHandleChange("", "send_num")
}}
disabled={this.props?.data?.id ? true : false}
value={this.state.model.send_num}
placeholder={"请输入"}
labelWidth={"0px"}
maxLength={9}
height={"36px"}
unit="张"
countShow={false}
width={"520px"}
alignment={"left"}
/>
</FormItem>
<FormItem id="receive_number" labelname="用户可领个数" prop="receive_number">
<Ipt
onChange={(value) => {
@ -1524,7 +1544,7 @@ export default class addKnockGold extends Component {
}}
width="520px"
text={this.state.model.instruction}
limitLength={this.state.model.channel != 3 ? 500 : 1000}
limitLength={5000}
key={this.state.model.channel}
/>
</FormItem>

View File

@ -3,6 +3,12 @@
width: 0 !important
}
.send_num {
font-size: 16px;
margin-left: 5px;
color: #ee1920;
}
#reduceKnockGold {
position: fixed !important;
top: 130px !important;

View File

@ -30,7 +30,8 @@ export default ({ data }) => {
</div>
<div className="coupon-right">
<p className={data.batch_goods_name.length < 20 ? "title" : "isTitle"}>
{data.batch_goods_name ? data.batch_goods_name : "xxx"}
{data.batch_goods_name ? data.batch_goods_name : "立减金"}
{data.send_num > 1 ? <span className="send_num">x{data.send_num}</span> : null}
</p>
<p>
{data?.card_type.length > 0

View File

@ -1,100 +1,108 @@
export default {
basic: {
batch_goods_name: [{ type: 'required', message: '请输入批次商品名称' }], // 批次商品名称
batch_goods_name: [{ type: "required", message: "请输入批次商品名称" }], // 批次商品名称
/* 批次号 */
channel_activity_id: [
{ type: 'required', message: '请输入批次号' },
{ type: "required", message: "请输入批次号" },
{
type: 'regExp',
message: '请输入由数字或英文组成的批次号',
reg: '^[A-Za-z0-9]+$'
type: "regExp",
message: "请输入由数字或英文组成的批次号",
reg: "^[A-Za-z0-9]+$"
}
],
/* 模板编号 */
temp_no: [
{ type: 'required', message: '请输入模板编号' },
{ type: "required", message: "请输入模板编号" },
{
type: 'regExp',
message: '请输入由数字或英文组成的模板编号',
reg: '^[A-Za-z0-9]+$'
type: "regExp",
message: "请输入由数字或英文组成的模板编号",
reg: "^[A-Za-z0-9]+$"
}
],
/* 合同单价 */
price: [
{ type: 'required', message: '请输入合同单价' },
{ type: "required", message: "请输入合同单价" },
{
type: 'regExp',
message: '最多保留4位小数',
reg: '^[0-9]+(.[0-9]{1,4})?$'
type: "regExp",
message: "最多保留4位小数",
reg: "^[0-9]+(.[0-9]{1,4})?$"
}
],
/* 充值金额 */
recharge_amount: [
{ type: 'required', message: '请输入充值金额' },
{ type: "required", message: "请输入充值金额" },
{
type: 'regExp',
message: '最多保留2位小数',
reg: '^[0-9]+(.[0-9]{1,2})?$'
type: "regExp",
message: "最多保留2位小数",
reg: "^[0-9]+(.[0-9]{1,2})?$"
}
],
/* 权重 */
weight: [
{ type: 'required', message: '请输入权重' },
{ type: "required", message: "请输入权重" },
{
type: 'regExp',
message: '请输入0~100权重数字',
reg: '^([0-9]{0,2}|100)$'
type: "regExp",
message: "请输入0~100权重数字",
reg: "^([0-9]{0,2}|100)$"
}
]
},
/* 总预算 */
grant: {
denomination: [{ type: 'required', message: '请输入面额' }], // 面额
denomination: [{ type: "required", message: "请输入面额" }], // 面额
all_budget: [
{ type: 'required', message: '请输入总预算' },
{ type: "required", message: "请输入总预算" },
{
type: 'regExp',
message: '最多保留2位小数',
reg: '^[0-9]+(.[0-9]{1,2})?$'
type: "regExp",
message: "最多保留2位小数",
reg: "^[0-9]+(.[0-9]{1,2})?$"
}
],
/* 单天预算 */
day_budget: [
{ type: 'required', message: '请输入单天预算' },
{ type: "required", message: "请输入单天预算" },
{
type: 'regExp',
message: '最多保留2位小数',
reg: '^[0-9]+(.[0-9]{1,2})?$'
type: "regExp",
message: "最多保留2位小数",
reg: "^[0-9]+(.[0-9]{1,2})?$"
}
],
card_type: [{ type: 'required', message: '请选择卡种类型' }], // '卡种类型',
natural_limit: [{ type: 'required', message: '请选择是否开启自然人限制' }], //'是否开启自然人限制',
brush_limit: [{ type: 'required', message: '请选择是否开启防刷限制' }], //'是否开启防刷限制',
card_type: [{ type: "required", message: "请选择卡种类型" }], // '卡种类型',
natural_limit: [{ type: "required", message: "请选择是否开启自然人限制" }], //'是否开启自然人限制',
brush_limit: [{ type: "required", message: "请选择是否开启防刷限制" }], //'是否开启防刷限制',
receive_number: [
{ type: 'required', message: '请输入用户可领个数' },
{ type: "required", message: "请输入用户可领个数" },
{
type: 'regExp',
message: '请输入0~9999的整数',
reg: '^([0-9][0-9]{0,3})$'
type: "regExp",
message: "请输入0~9999的整数",
reg: "^([0-9][0-9]{0,3})$"
}
], // 领取个数/
send_num: [
{ type: "required", message: "请输入单次到账张数" },
{
type: "regExp",
message: "请输入1~60的整数",
reg: /^(?:[1-9]|[1-5]\d|60)$/
}
] // 领取个数
},
time: {
entry_time: [{ type: 'required', message: '请选择生效时间段' }], // 生效时间
time_limit: [{ type: 'required', message: '请输入充值金额' }], // '时间限制配置',
timer: [{ type: 'required', message: '请选择领取时间段' }] // '时间限制配置',
entry_time: [{ type: "required", message: "请选择生效时间段" }], // 生效时间
time_limit: [{ type: "required", message: "请输入充值金额" }], // '时间限制配置',
timer: [{ type: "required", message: "请选择领取时间段" }] // '时间限制配置',
},
warning: {
early_per: [{ type: 'required', message: '请输入或选择预警百分比' }], //'预警百分比',
early_notifier: [{ type: 'required', message: '请选择预警通知人' }] //'预警通知人',
early_per: [{ type: "required", message: "请输入或选择预警百分比" }], //'预警百分比',
early_notifier: [{ type: "required", message: "请选择预警通知人" }] //'预警通知人',
},
addNew: {
addNew: [
{ type: 'required', message: '请输入加款金额' },
{ type: "required", message: "请输入加款金额" },
{
type: 'regExp',
message: '最多保留2位小数',
reg: '^[0-9]+(.[0-9]{1,2})?$'
type: "regExp",
message: "最多保留2位小数",
reg: "^[0-9]+(.[0-9]{1,2})?$"
}
]
}

View File

@ -26,7 +26,10 @@ export default ({ data }) => {
alt=""
/>
<div className="content">
<p className="title">{data.batch_goods_name || "云闪付立减金"}</p>
<p className="title">
{data.batch_goods_name || "云闪付立减金"}
{data.send_num > 1 ? <span className="send_num">x{data.send_num}</span> : null}
</p>
<div className="information">
<p className="money" style={{ fontSize: fonts().a }}>
{data.denomination ? parseFloat(data.denomination) : 100.1}元减

View File

@ -26,7 +26,10 @@ export default ({ data }) => {
alt=""
/>
<div className="content">
<p className="title">{data.batch_goods_name || "支付宝立减金"}</p>
<p className="title">
{data.batch_goods_name || "支付宝立减金"}
{data.send_num > 1 ? <span className="send_num">x{data.send_num}</span> : null}
</p>
<div className="information">
<p className="money" style={{ fontSize: fonts().a }}>
{data.denomination ? parseFloat(data.denomination) : 100.1}元减

View File

@ -1129,7 +1129,7 @@ export default class addKnockGold extends Component {
}}
width="520px"
text={this.state.model.instruction}
limitLength={this.state.model.channel != 3 ? 500 : 1000}
limitLength={5000}
key={this.state.model.channel}
/>
</FormItem>

View File

@ -18,7 +18,7 @@ import Grid from "@/components/gird/main.js"
import Ipt from "@/components/input/main"
import KnockGold from "@/components/knockGold" /* 立减金 */
import RedPackets from "@/components/redPackets" /* 红包 */
import { divNum } from "@/tools/number"
import { divNum, mulNum } from "@/tools/number"
import { deWeightThree } from "@/tools/utils.js"
import { isSameDay } from "date-fns"
import { cloneDeep, differenceWith, filter, forEach, isEqual, map, omit } from "lodash-es"
@ -271,8 +271,9 @@ export default class exchangeAdd extends React.Component {
let data = reductionFn(item)
/* 复制状态 */
if (this.state.isState === 1) {
data.quantity = parseInt(divNum(item.all_budget, item.reduce_amount)) //
data.stock = parseInt(divNum(item.all_budget, item.reduce_amount)) //
const all = parseInt(divNum(item.all_budget, mulNum(item.reduce_amount, item.send_num)))
data.quantity = all //
data.stock = all //
data.usage = 0 //使
data.origin = omit(item, ["id", "total_stock", "use_stock", "stock", "goods_id"])
data = omit(data, ["product_id"])

View File

@ -1,4 +1,4 @@
import { divNum } from "@/tools/number"
import { divNum, mulNum } from "@/tools/number"
import { productTypeMenu } from "@/tools"
//基本信息
export const codeInfo = {
@ -218,6 +218,7 @@ export function redPacketsDataFn(params) {
/* 转换立减金数据 */
export function reductionFn(params) {
const all = parseInt(divNum(params.all_budget, mulNum(params.reduce_amount, params.send_num)))
const newObj = {}
newObj.product_name = params.batch_goods_name || params.product_name //名字
newObj.channel_activity_id = params.channel_activity_id //批次号
@ -232,8 +233,8 @@ export function reductionFn(params) {
params.time_limit?.effect_time.start_time + " 至 " + params.time_limit?.effect_time.end_time //有效时间
newObj.contract_price = params.contract_price || params.price //单价
newObj.official_price = params.official_price || params.reduce_amount //官方价
newObj.quantity = params.quantity || parseInt(divNum(params.all_budget, params.reduce_amount)) //总库
newObj.stock = params.stock || parseInt(divNum(params.all_budget, params.reduce_amount)) //剩余
newObj.quantity = params.quantity || all //总库
newObj.stock = params.stock || all //剩余
newObj.usage = params.usage || 0 //已使用
newObj.origin = params
newObj.id = params.goods_id || params.id

View File

@ -6,7 +6,8 @@ import {
putOrderCancel,
putOrderSuccess,
refund,
resendCardCode
resendCardCode,
receiveRetry
} from "@/assets/api.js"
import "@/assets/comm.css"
import { nowDay, nowMonth } from "@/assets/comm.js"
@ -501,6 +502,19 @@ export default class orderList extends React.Component {
})
}
/* 重试领取 */
handlerReceiveRetry(order_number) {
receiveRetry({ order_number }).then(({ code, message }) => {
Notify.clear()
if (code === 200) {
Notify.success(message)
this.getOrderFn()
} else {
Notify.error(message)
}
})
}
// 监听组件内部状态的变化:
componentDidUpdate(prevProps, prevState) {
// 参数分别为改变之前的数据状态对象
@ -648,10 +662,13 @@ export default class orderList extends React.Component {
<font
className="icon"
style={{
background: menu.orderStatusBg(parseInt(rowData.status))
background: menu.orderStatusBg(rowData)
}}
></font>
{rowData.status_text}
{rowData.type === 2 && [1, 2].includes(rowData.status)
? `${rowData.received_num}/${rowData.num}`
: ""}
</span>
</p>
)
@ -663,7 +680,7 @@ export default class orderList extends React.Component {
<font
className="icon"
style={{
background: menu.orderStatusBg(
background: menu.orderPayStatusBg(
rowData.pay_status === 1 ? "" : parseInt(rowData.pay_status)
)
}}
@ -688,12 +705,15 @@ export default class orderList extends React.Component {
<font
className="icon"
style={{
background: menu.orderStatusBg(
parseInt(rowData.orderVoucher ? rowData.orderVoucher.status : 333)
background: menu.orderVoucherStatusBg(
parseInt(rowData.orderVoucher ? rowData.orderVoucher.status : 0)
)
}}
></font>
{this.usageFunction(rowData.orderVoucher?.status)}
{rowData.type === 2 && rowData.orderVoucher?.status === 2
? `${rowData.used_num}/${rowData.num}`
: ""}
</span>
</p>
)
@ -733,22 +753,24 @@ export default class orderList extends React.Component {
<span className="grid-link" onClick={(e) => this.moreFn(e, rowData)}>
详情
</span>
{rowData.status == 1 ||
(rowData.status == 0 && rowData.type == 1) ||
rowData.status == 6 ||
(rowData.status == 0 && rowData.type == 3) ? (
{rowData.type != 2 &&
(rowData.status == 1 ||
(rowData.status == 0 && rowData.type == 1) ||
rowData.status == 6 ||
(rowData.status == 0 && rowData.type == 3)) ? (
<span className="grid-link" onClick={(e) => this.deleteFn(e, rowData)}>
作废
</span>
) : null}
{(rowData.status == 1 || (rowData.status == 0 && rowData.type == 3)) && (
<span
className="grid-link"
onClick={(e) => this.changeSuccessFn(e, rowData)}
>
改为成功
</span>
)}
{rowData.type != 2 &&
(rowData.status == 1 || (rowData.status == 0 && rowData.type == 3)) && (
<span
className="grid-link"
onClick={(e) => this.changeSuccessFn(e, rowData)}
>
改为成功
</span>
)}
{rowData.status == 3 && rowData.pay_status == 2 ? (
<>
<span
@ -770,6 +792,16 @@ export default class orderList extends React.Component {
</span>
</>
) : null}
{rowData.type === 2 &&
[1, 2].includes(rowData.status) &&
rowData.received_num !== rowData.num ? (
<span
className="grid-link"
onClick={() => this.handlerReceiveRetry(rowData.order_number)}
>
重试领取
</span>
) : null}
{rowData.type == 1 &&
rowData.product_type == 2 &&
rowData.product.card_show == 1 &&

View File

@ -74,7 +74,7 @@ export const Column = [
name: "statusDom",
prop: "statusDom",
type: "slot",
width: "80px"
width: "120px"
},
{
title: "支付状态",
@ -137,7 +137,7 @@ export const Column = [
title: "核销状态",
name: "usage_status",
prop: "usage_status",
width: "60px",
width: "120px",
type: "slot"
},

View File

@ -1,16 +1,16 @@
import { divNum } from "./number"
import { Notify } from "zent"
import { divNum, mulNum } from "./number"
// 判断
const kgType = (item) => {
let type = sessionStorage.getItem("KeyPcType")
const all = parseInt(divNum(item.all_budget, mulNum(item.reduce_amount, item.send_num)))
if (type === "2" || type === "3") {
return parseInt(divNum(item.all_budget, item.reduce_amount))
return all
} else {
if (item.stock) {
return item.stock
} else {
return parseInt(divNum(item.all_budget, item.reduce_amount))
return all
}
}
}