Commit 449ad3c2 by chenxin

fix:merge 营销活动

parents 39f1c414 6a2629b7
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.164aad99272ccb367fc6393d5fe8ac90.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.09.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.f7b95ba357d2312814e3.js></script><script type=text/javascript src=/marketing/static/js/vendor.810e43468685c3e36778.js></script><script type=text/javascript src=/marketing/static/js/main.15242208f911ce5b624a.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.2a6b11e584b8226d3ff7fd01b6695ee6.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.09.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.42.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.7debc6aa3b53c3df33cc.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.001e16eeb822fbadc0d5.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,f,u,d=0,s=[];d<t.length;d++)f=t[d],n[f]&&s.push(n[f][0]),n[f]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var t={},n={13:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"e46aff4f2a87d072430d",1:"e6918ea36a1ea43ebdb0",2:"4704dbe7187bbd1109ce",3:"e05b70ea00428726e563",4:"69a1b2a19e34d3897876",5:"68d7370c63d44df6d2f2",6:"1f5590bfcd2c76d0ecde",7:"6b01b5c54fda16700576",8:"d3304681f13b1275eccf",9:"277de150e09f4110519f",10:"2e28c020a9f9c0e96471"}[e]+".js";var i=setTimeout(f,12e4);function f(){c.onerror=c.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=f,a.appendChild(c),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,c){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(n,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var n={},t={12:0};function a(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,a),t.l=!0,t.exports}a.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,a){r=t[e]=[n,a]});r[2]=n;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"36d4fc9d21a0f3e2faef",1:"aaad12ef77b2d1dcbb81",2:"2bdef3c684efe96a3e56",3:"199c4481125e0e614194",4:"5a9aa118501dd044d44a",5:"b090dfd9075bbe1dfaed",6:"ad8c0b54be8c763d1e6d",7:"516825a38f453f021bf6",8:"46659646c443af0ae7a2",9:"9c04c538012a34e52f24"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),n},a.m=e,a.c=n,a.d=function(e,r,n){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
webpackJsonp([10],{"+2+s":function(t,n,r){"use strict";var e=r("Ds5P"),o=r("49qz")(!0);e(e.P,"String",{at:function(t){return o(this,t)}})},"+CM9":function(t,n,r){"use strict";var e=r("Ds5P"),o=r("ot5s")(!1),i=[].indexOf,u=!!i&&1/[1].indexOf(1,-0)<0;e(e.P+e.F*(u||!r("NNrz")(i)),"Array",{indexOf:function(t){return u?i.apply(this,arguments)||0:o(this,t,arguments[1])}})},"+E39":function(t,n,r){t.exports=!r("S82l")(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},"+Mt+":function(t,n,r){"use strict";var e=r("Ds5P"),o=r("7gX0"),i=r("OzIq"),u=r("7O1s"),c=r("nphH");e(e.P+e.R,"Promise",{finally:function(t){var n=u(this,o.Promise||i.Promise),r="function"==typeof t;return this.then(r?function(r){return c(n,t()).then(function(){return r})}:t,r?function(r){return c(n,t()).then(function(){throw r})}:t)}})},"+ZMJ":function(t,n,r){var e=r("lOnJ");t.exports=function(t,n,r){if(e(t),void 0===n)return t;switch(r){case 1:return function(r){return t.call(n,r)};case 2:return function(r,e){return t.call(n,r,e)};case 3:return function(r,e,o){return t.call(n,r,e,o)}}return function(){return t.apply(n,arguments)}}},"+tPU":function(t,n,r){r("xGkn");for(var e=r("7KvD"),o=r("hJx8"),i=r("/bQp"),u=r("dSzd")("toStringTag"),c="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),a=0;a<c.length;a++){var s=c[a],f=e[s],l=f&&f.prototype;l&&!l[u]&&o(l,u,s),i[s]=i.Array}},"+vXH":function(t,n,r){r("77Ug")("Float64",8,function(t){return function(n,r,e){return t(this,n,r,e)}})},"+yjc":function(t,n,r){var e=r("UKM+");r("3i66")("isSealed",function(t){return function(n){return!e(n)||!!t&&t(n)}})},"//Fk":function(t,n,r){t.exports={default:r("U5ju"),__esModule:!0}},"/bQp":function(t,n){t.exports={}},"/whu":function(t,n){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},"07k+":function(t,n,r){for(var e,o=r("OzIq"),i=r("2p1q"),u=r("ulTY"),c=u("typed_array"),a=u("view"),s=!(!o.ArrayBuffer||!o.DataView),f=s,l=0,h="Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array".split(",");l<9;)(e=o[h[l++]])?(i(e.prototype,c,!0),i(e.prototype,a,!0)):f=!1;t.exports={ABV:s,CONSTR:f,TYPED:c,VIEW:a}},"0Rih":function(t,n,r){"use strict";var e=r("OzIq"),o=r("Ds5P"),i=r("R3AP"),u=r("A16L"),c=r("1aA0"),a=r("vmSO"),s=r("9GpA"),f=r("UKM+"),l=r("zgIt"),h=r("qkyc"),p=r("yYvK"),v=r("kic5");t.exports=function(t,n,r,d,y,g){var m=e[t],x=m,b=y?"set":"add",w=x&&x.prototype,P={},S=function(t){var n=w[t];i(w,t,"delete"==t?function(t){return!(g&&!f(t))&&n.call(this,0===t?0:t)}:"has"==t?function(t){return!(g&&!f(t))&&n.call(this,0===t?0:t)}:"get"==t?function(t){return g&&!f(t)?void 0:n.call(this,0===t?0:t)}:"add"==t?function(t){return n.call(this,0===t?0:t),this}:function(t,r){return n.call(this,0===t?0:t,r),this})};if("function"==typeof x&&(g||w.forEach&&!l(function(){(new x).entries().next()}))){var O=new x,_=O[b](g?{}:-0,1)!=O,D=l(function(){O.has(1)}),E=h(function(t){new x(t)}),j=!g&&l(function(){for(var t=new x,n=5;n--;)t[b](n,n);return!t.has(-0)});E||((x=n(function(n,r){s(n,x,t);var e=v(new m,n,x);return void 0!=r&&a(r,y,e[b],e),e})).prototype=w,w.constructor=x),(D||j)&&(S("delete"),S("has"),y&&S("get")),(j||_)&&S(b),g&&w.clear&&delete w.clear}else x=d.getConstructor(n,t,y,b),u(x.prototype,r),c.NEED=!0;return p(x,t),P[t]=x,o(o.G+o.W+o.F*(x!=m),P),g||d.setStrong(x,t,y),x}},"0j1G":function(t,n,r){"use strict";var e=r("Ds5P");t.exports=function(t){e(e.S,t,{of:function(){for(var t=arguments.length,n=new Array(t);t--;)n[t]=arguments[t];return new this(n)}})}},"0pGU":function(t,n,r){"use strict";var e=r("DIVP");t.exports=function(){var t=e(this),n="";return t.global&&(n+="g"),t.ignoreCase&&(n+="i"),t.multiline&&(n+="m"),t.unicode&&(n+="u"),t.sticky&&(n+="y"),n}},"1A13":function(t,n,r){"use strict";var e=r("49qz")(!0);r("uc2A")(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,n=this._t,r=this._i;return r>=n.length?{value:void 0,done:!0}:(t=e(n,r),this._i+=t.length,{value:t,done:!1})})},"1ETD":function(t,n,r){var e=r("kkCw")("match");t.exports=function(t){var n=/./;try{"/./"[t](n)}catch(r){try{return n[e]=!1,!"/./"[t](n)}catch(t){}}return!0}},"1H6C":function(t,n,r){var e=function(){return this}()||Function("return this")(),o=e.regeneratorRuntime&&Object.getOwnPropertyNames(e).indexOf("regeneratorRuntime")>=0,i=o&&e.regeneratorRuntime;if(e.regeneratorRuntime=void 0,t.exports=r("HhN8"),o)e.regeneratorRuntime=i;else try{delete e.regeneratorRuntime}catch(t){e.regeneratorRuntime=void 0}},"1Yoh":function(t,n){
webpackJsonp([11],{"+2+s":function(t,n,r){"use strict";var e=r("Ds5P"),o=r("49qz")(!0);e(e.P,"String",{at:function(t){return o(this,t)}})},"+CM9":function(t,n,r){"use strict";var e=r("Ds5P"),o=r("ot5s")(!1),i=[].indexOf,u=!!i&&1/[1].indexOf(1,-0)<0;e(e.P+e.F*(u||!r("NNrz")(i)),"Array",{indexOf:function(t){return u?i.apply(this,arguments)||0:o(this,t,arguments[1])}})},"+E39":function(t,n,r){t.exports=!r("S82l")(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},"+Mt+":function(t,n,r){"use strict";var e=r("Ds5P"),o=r("7gX0"),i=r("OzIq"),u=r("7O1s"),c=r("nphH");e(e.P+e.R,"Promise",{finally:function(t){var n=u(this,o.Promise||i.Promise),r="function"==typeof t;return this.then(r?function(r){return c(n,t()).then(function(){return r})}:t,r?function(r){return c(n,t()).then(function(){throw r})}:t)}})},"+ZMJ":function(t,n,r){var e=r("lOnJ");t.exports=function(t,n,r){if(e(t),void 0===n)return t;switch(r){case 1:return function(r){return t.call(n,r)};case 2:return function(r,e){return t.call(n,r,e)};case 3:return function(r,e,o){return t.call(n,r,e,o)}}return function(){return t.apply(n,arguments)}}},"+tPU":function(t,n,r){r("xGkn");for(var e=r("7KvD"),o=r("hJx8"),i=r("/bQp"),u=r("dSzd")("toStringTag"),c="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),a=0;a<c.length;a++){var s=c[a],f=e[s],l=f&&f.prototype;l&&!l[u]&&o(l,u,s),i[s]=i.Array}},"+vXH":function(t,n,r){r("77Ug")("Float64",8,function(t){return function(n,r,e){return t(this,n,r,e)}})},"+yjc":function(t,n,r){var e=r("UKM+");r("3i66")("isSealed",function(t){return function(n){return!e(n)||!!t&&t(n)}})},"//Fk":function(t,n,r){t.exports={default:r("U5ju"),__esModule:!0}},"/bQp":function(t,n){t.exports={}},"/whu":function(t,n){t.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},"07k+":function(t,n,r){for(var e,o=r("OzIq"),i=r("2p1q"),u=r("ulTY"),c=u("typed_array"),a=u("view"),s=!(!o.ArrayBuffer||!o.DataView),f=s,l=0,h="Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array".split(",");l<9;)(e=o[h[l++]])?(i(e.prototype,c,!0),i(e.prototype,a,!0)):f=!1;t.exports={ABV:s,CONSTR:f,TYPED:c,VIEW:a}},"0Rih":function(t,n,r){"use strict";var e=r("OzIq"),o=r("Ds5P"),i=r("R3AP"),u=r("A16L"),c=r("1aA0"),a=r("vmSO"),s=r("9GpA"),f=r("UKM+"),l=r("zgIt"),h=r("qkyc"),p=r("yYvK"),v=r("kic5");t.exports=function(t,n,r,d,y,g){var m=e[t],x=m,b=y?"set":"add",w=x&&x.prototype,P={},S=function(t){var n=w[t];i(w,t,"delete"==t?function(t){return!(g&&!f(t))&&n.call(this,0===t?0:t)}:"has"==t?function(t){return!(g&&!f(t))&&n.call(this,0===t?0:t)}:"get"==t?function(t){return g&&!f(t)?void 0:n.call(this,0===t?0:t)}:"add"==t?function(t){return n.call(this,0===t?0:t),this}:function(t,r){return n.call(this,0===t?0:t,r),this})};if("function"==typeof x&&(g||w.forEach&&!l(function(){(new x).entries().next()}))){var O=new x,_=O[b](g?{}:-0,1)!=O,D=l(function(){O.has(1)}),E=h(function(t){new x(t)}),j=!g&&l(function(){for(var t=new x,n=5;n--;)t[b](n,n);return!t.has(-0)});E||((x=n(function(n,r){s(n,x,t);var e=v(new m,n,x);return void 0!=r&&a(r,y,e[b],e),e})).prototype=w,w.constructor=x),(D||j)&&(S("delete"),S("has"),y&&S("get")),(j||_)&&S(b),g&&w.clear&&delete w.clear}else x=d.getConstructor(n,t,y,b),u(x.prototype,r),c.NEED=!0;return p(x,t),P[t]=x,o(o.G+o.W+o.F*(x!=m),P),g||d.setStrong(x,t,y),x}},"0j1G":function(t,n,r){"use strict";var e=r("Ds5P");t.exports=function(t){e(e.S,t,{of:function(){for(var t=arguments.length,n=new Array(t);t--;)n[t]=arguments[t];return new this(n)}})}},"0pGU":function(t,n,r){"use strict";var e=r("DIVP");t.exports=function(){var t=e(this),n="";return t.global&&(n+="g"),t.ignoreCase&&(n+="i"),t.multiline&&(n+="m"),t.unicode&&(n+="u"),t.sticky&&(n+="y"),n}},"1A13":function(t,n,r){"use strict";var e=r("49qz")(!0);r("uc2A")(String,"String",function(t){this._t=String(t),this._i=0},function(){var t,n=this._t,r=this._i;return r>=n.length?{value:void 0,done:!0}:(t=e(n,r),this._i+=t.length,{value:t,done:!1})})},"1ETD":function(t,n,r){var e=r("kkCw")("match");t.exports=function(t){var n=/./;try{"/./"[t](n)}catch(r){try{return n[e]=!1,!"/./"[t](n)}catch(t){}}return!0}},"1H6C":function(t,n,r){var e=function(){return this}()||Function("return this")(),o=e.regeneratorRuntime&&Object.getOwnPropertyNames(e).indexOf("regeneratorRuntime")>=0,i=o&&e.regeneratorRuntime;if(e.regeneratorRuntime=void 0,t.exports=r("HhN8"),o)e.regeneratorRuntime=i;else try{delete e.regeneratorRuntime}catch(t){e.regeneratorRuntime=void 0}},"1Yoh":function(t,n){
/*!
* Determine if an object is a Buffer
*
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -328,12 +328,3 @@
.el-table__empty-block{
min-height: 240px;
}
/* 数字字体 */
@font-face {
font-family: 'din';
src: url('/static/font/DIN-Alternate-Bold.woff') format('woff'), url('/static//font//DIN-Alternate-Bold.ttf') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
}
.roboto {
font-family: 'din';
}
\ No newline at end of file
......@@ -6,10 +6,10 @@
<el-select remote filterable clearable v-loadmore="getMore" :remote-method="remoteMethod" @change="updateActId" class="w250 act-select" size="small" v-model="marketingActivityId" :disabled="readOnly" placeholder="选择营销活动">
<el-option v-for="item in tableList" :key="item.marketingActivityId" :label="item.name" :value="item.marketingActivityId"></el-option>
</el-select>
<el-button type="text" class="ml10" @click="$router.push('/activity/add')">去新建</el-button>
<el-button type="text" class="ml10" @click="toAdd">去新建</el-button>
</div>
<div v-else>
<span class="dm-input_label">营销活动</span>
<span class="dm-input_label">营销活动</span>
<p class="inline-block">{{ info.name || '--' }} <span v-if="info.status === 0" class="fz12 gray ml10">当前计划使用的营销活动已删除</span></p>
</div>
</template>
......@@ -79,6 +79,16 @@ export default {
}
},
methods: {
toAdd() {
if(process.env['NODE_ENV'] !== 'development') { // eslint-disable-line
// 强制切换 避免顶部菜单没切换
console.log(window.location.origin + window.location.pathname + 'activity/add');
window.location.href = window.location.origin + window.location.pathname + '#/activity/add';
window.location.reload();
} else {
this.$router.push('/activity/add');
}
},
// 获取详情
getActivityInfo() {
this.loading = true;
......@@ -103,6 +113,7 @@ export default {
this.listParams.search = search;
this.listParams.currentPage = 1;
this.tableList = [];
this.nomore = false;
// this.marketingActivityId = '';
// this.updateActId('');
this.getList();
......
......@@ -18,3 +18,6 @@ export const getActivityInfo = params => requests(PREFIX + 'get-marketing-activi
// 营销活动-- 新建/修改 [保存]计划信息
export const saveActivity = params => requests(PREFIX + 'save-edit-marketing-activity', params);
// 营销活动-- 查看数据概览
export const activityViewData = params => requests(PREFIX + 'marketing-activity-statistics', params);
......@@ -5,9 +5,9 @@
<dm-input v-model="ruleForm.name" class="w300" placeholder="请输入活动名称" :byteType="1" :maxlength="10"></dm-input>
</el-form-item>
<el-form-item prop="dateTime" label="活动时间">
<el-date-picker :disabled="disabled" v-model="ruleForm.beginDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始日期"></el-date-picker>
<el-date-picker :disabled="disabled" :picker-options="pickerOptions" v-model="ruleForm.beginDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="开始日期"></el-date-picker>
<span style="color:#909299;margin-left:5px;margin-right:5px;">~</span>
<el-date-picker :disabled="disabled" v-model="ruleForm.endDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束日期"></el-date-picker>
<el-date-picker :disabled="disabled" :picker-options="pickerOptions" v-model="ruleForm.endDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">确认{{ isAdd ? '新建' : '保存' }}</el-button>
......@@ -23,6 +23,9 @@ export default {
name: 'activity-form',
data() {
const validateDateLessYear = (rule, value, callback) => {
if (this.isEdit) {
callback();
}
const date1 = this.ruleForm.beginDate;
const date2 = this.ruleForm.endDate;
if (!date1 || !date2) {
......@@ -48,6 +51,11 @@ export default {
name: [{ required: true, message: '请输入活动名称', trigger: 'change' }],
dateTime: [{ required: true, validator: validateDateLessYear, trigger: 'change' }]
},
pickerOptions: {
disabledDate(val) {
return Date.now() >= val.getTime() + 24 * 60 * 60 * 1000;
}
},
isAdd: this.$route.meta.type === 'add',
isEdit: this.$route.meta.type === 'edit'
};
......
......@@ -3,8 +3,6 @@
<div class="clearfix pb22">
<el-date-picker class="w400" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-input v-model="listParams.search" class="w300" placeholder="请输入活动名称/创建人" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" @click="$router.push('/activity/add')">新建营销活动</el-button>
<el-button class="fr mr10" @click="$router.push('/activity/history-list')">查看历史活动</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
<el-table-column v-for="(v, i) in tableHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter">
......@@ -13,9 +11,9 @@
<span v-else>{{ scope.row[v.prop] || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="210px" fixed="right">
<el-table-column label="操作" align="left" width="240px" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="$router.push(`/activity/data-view/${scope.row.marketingActivityId}`)">数据概览</el-button>
<el-button type="text" @click="$router.push(`/activity/data-view/${scope.row.marketingActivityId}`)">历史数据概览</el-button>
<el-button type="text" @click="$router.push(`/activity/edit/${scope.row.marketingActivityId}`)">编辑</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该营销活动?">
<el-button type="text">删除</el-button>
......@@ -64,7 +62,7 @@ export default {
},
{ label: '创建人', prop: 'creatorName', minWidth: '120', align: 'left' },
{ label: '状态', prop: 'stateDesc', minWidth: '120', align: 'left' },
{ label: '合计营销人次', prop: 'aa', minWidth: '120', tooltip: true, align: 'left' }
{ label: '合计营销人次', prop: 'activityMbrCntTd', minWidth: '120', tooltip: true, align: 'left' }
],
listParams: {
expireType: 1, // -1: 进行中/未开始 1: 已过期 0: 使用中
......
......@@ -67,9 +67,9 @@ export default {
},
{ label: '创建人', prop: 'creatorName', minWidth: '120', align: 'left' },
{ label: '状态', prop: 'stateDesc', minWidth: '120', align: 'left' },
{ label: '昨日营销人次', prop: 'aa', minWidth: '120', tooltip: true, align: 'left' },
{ label: '本月营销人次', prop: 'aa', minWidth: '120', tooltip: true, align: 'left' },
{ label: '合计营销人次', prop: 'aa', minWidth: '120', tooltip: true, align: 'left' }
{ label: '昨日营销人次', prop: 'activityMbrCntD', minWidth: '120', tooltip: true, align: 'left' },
{ label: '本月营销人次', prop: 'activityMbrCntM', minWidth: '120', tooltip: true, align: 'left' },
{ label: '合计营销人次', prop: 'activityMbrCntTd', minWidth: '120', tooltip: true, align: 'left' }
],
listParams: {
expireType: -1, // -1: 进行中/未开始 1: 已过期 0: 使用中
......
......@@ -4,13 +4,13 @@
<li class="text">{{ text }}</li>
<li class="num" :class="{ blue: numBlue }">
<template v-if="!run">{{ num | famount }}</template>
<count-to v-else :startVal="0" :endVal="num" :duration="duration" />
<count-to v-else :startVal="0" :endVal="num" :duration="duration" :decimals="decimals" />
</li>
</template>
<template v-else>
<li class="num" :class="{ blue: numBlue }">
<template v-if="!run">{{ num | famount }}</template>
<count-to v-else :startVal="0" :endVal="num" :duration="duration" />
<count-to v-else :startVal="0" :endVal="num" :duration="duration" :decimals="decimals" />
</li>
<li class="text">{{ text }}</li>
</template>
......@@ -38,6 +38,11 @@ export default {
type: Boolean,
default: false
},
decimals: {
// 小数位
type: Number,
default: 0
},
duration: {
type: Number,
default: 2000
......@@ -45,7 +50,7 @@ export default {
},
filters: {
famount(s) {
var str = s.toString();
var str = s ? s.toString() : '0';
var reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g;
return str.replace(reg, '$1,');
}
......
......@@ -14,6 +14,9 @@
</el-select>
<el-date-picker :disabled="isInfo" class="w250" v-if="form.putOnType" v-model="form.putOnTime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item label="营销场景" v-if="!isAdd && form.sceneSettingName">
<el-input class="w250" disabled v-model="form.sceneSettingName"></el-input>
</el-form-item>
<activity-select class="ml30" :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</div>
<div class="dm-form__wrap">
......
......@@ -48,6 +48,9 @@
</div>
</el-checkbox-group>
</el-form-item>
<el-form-item label="营销场景" v-if="!isAdd && form.sceneSettingName">
<el-input class="w400" disabled v-model="form.sceneSettingName"></el-input>
</el-form-item>
<activity-select style="margin-left:42px" :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</section>
<!-- 消费触发配置 -->
......
......@@ -75,7 +75,7 @@ export default {
},
{ label: '营销方式', prop: 'marketingType', minWidth: '160', align: 'left' },
{
label: '营销场景',
label: '营销活动',
prop: 'marketingActivityName',
width: '160',
align: 'left',
......
......@@ -24,9 +24,11 @@
<span class="primary-font-color">模板类型:</span>
<span class="regular-font-color">{{ info.sendType === 0 ? '普通短信' : '营销短信' }}</span>
</el-col>
<el-col :span="8" v-if="info.sceneSettingName">
<span class="primary-font-color">营销场景:</span>
<span class="regular-font-color">{{ info.sceneSettingName }}</span>
</el-col>
<el-col :span="8">
<!-- <span class="primary-font-color">营销场景:</span>
<span class="regular-font-color">{{ info.sceneSettingName }}</span> -->
<activity-select :actId.sync="info.marketingActivityId" readOnly></activity-select>
</el-col>
<el-col :span="24">
......
......@@ -2,6 +2,10 @@
<div v-loading="loading">
<section class="dm-form__wrap">
<activity-select class="mb20" :actId.sync="info.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
<div class="mb20" v-if="!isAdd && info.sceneSettingName">
<span class="dm-input_label">营销场景:</span>
{{ info.sceneSettingName }}
</div>
<div>
<span class="dm-input_label">发送时间:</span>
<el-select class="w250" v-model="info.sendType" :disabled="isInfo">
......
......@@ -132,7 +132,7 @@ export default {
}
},
{
label: '营销场景',
label: '营销活动',
prop: 'marketingActivityName',
width: '160',
align: 'left',
......
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