冲突解决

4b19bdf3 · huaxinzhu · b1cd2dc0 · c4b3f7e5 · 4b19bdf3 · 4b19bdf3
--- a/dist/index.html
+++ b/dist/index.html
@@ -181,7 +181,15 @@
      font-size: 13px;
      color: #FFF;
      opacity: 0.5;
+<<<<<<< HEAD
    }</style><link href=/static/css/chunk-libs.c09507d5.css rel=stylesheet><link href=/static/css/app.ff6b2697.css rel=stylesheet></head><body><div id=app><div id=loader-wrapper><div id=loader></div><div class="loader-section section-left"></div><div class="loader-section section-right"></div><div class=load_title>正在加载系统资源，请耐心等待</div></div></div><script src=/static/js/chunk-elementUI.ede1d689.js></script><script src=/static/js/chunk-libs.783b3875.js></script><script>(function(e){function n(n){for(var t,u,f=n[0],o=n[1],h=n[2],d=0,i=[];d<f.length;d++)u=f[d],r[u]&&i.push(r[u][0]),r[u]=0;for(t in o)Object.prototype.hasOwnProperty.call(o,t)&&(e[t]=o[t]);k&&k(n);while(i.length)i.shift()();return a.push.apply(a,h||[]),c()}function c(){for(var e,n=0;n<a.length;n++){for(var c=a[n],t=!0,u=1;u<c.length;u++){var f=c[u];0!==r[f]&&(t=!1)}t&&(a.splice(n--,1),e=o(o.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function f(e){return o.p+"static/js/"+({}[e]||e)+"."+{"chunk-1d571893":"0643034c","chunk-242f810e":"7f248e2a","chunk-2cf0247a":"3afff7b9","chunk-2d0c741e":"9a348a52","chunk-8e67e28e":"648113a8","chunk-2d0c7ece":"92549903","chunk-2d0cbf05":"598ccefa","chunk-08486bce":"57498488","chunk-2d0d67a2":"929eb124","chunk-2d0f012d":"7a9a98ab","chunk-2d226555":"e093ec60","chunk-0b4a9e9a":"2c7e0b39","chunk-2d0e28b6":"851865e9","chunk-b8688b2a":"38143ada","chunk-461f59e3":"3890c413","chunk-31be90b5":"ae8d009a","chunk-35399048":"6413fc60","chunk-57872cf8":"e5876f3f","chunk-79f6792a":"ef8a0546","chunk-7c2f4fe6":"1ef9d51a","chunk-7f2f7f9d":"e07af9b0","chunk-8e230f56":"d8cc1ce1","chunk-3bbb4d22":"633df13b","chunk-f56d557c":"e18e3051","chunk-fa6b139a":"af89dea0"}[e]+".js"}function o(n){if(t[n])return t[n].exports;var c=t[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,o),c.l=!0,c.exports}o.e=function(e){var n=[],c={"chunk-1d571893":1,"chunk-242f810e":1,"chunk-2cf0247a":1,"chunk-8e67e28e":1,"chunk-461f59e3":1,"chunk-31be90b5":1,"chunk-35399048":1,"chunk-57872cf8":1,"chunk-79f6792a":1,"chunk-7f2f7f9d":1,"chunk-8e230f56":1,"chunk-3bbb4d22":1,"chunk-f56d557c":1,"chunk-fa6b139a":1};u[e]?n.push(u[e]):0!==u[e]&&c[e]&&n.push(u[e]=new Promise((function(n,c){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-1d571893":"0615606c","chunk-242f810e":"c9a455ad","chunk-2cf0247a":"06132cc6","chunk-2d0c741e":"31d6cfe0","chunk-8e67e28e":"3c72d4e5","chunk-2d0c7ece":"31d6cfe0","chunk-2d0cbf05":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0d67a2":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2d226555":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-b8688b2a":"31d6cfe0","chunk-461f59e3":"3eaccc8d","chunk-31be90b5":"5818f70b","chunk-35399048":"e9fe80ee","chunk-57872cf8":"9183fc08","chunk-79f6792a":"9a695bbc","chunk-7c2f4fe6":"31d6cfe0","chunk-7f2f7f9d":"ca8aeaeb","chunk-8e230f56":"687a6a11","chunk-3bbb4d22":"04b54fdb","chunk-f56d557c":"ab78c05d","chunk-fa6b139a":"fe6be668"}[e]+".css",r=o.p+t,a=document.getElementsByTagName("link"),f=0;f<a.length;f++){var h=a[f],d=h.getAttribute("data-href")||h.getAttribute("href");if("stylesheet"===h.rel&&(d===t||d===r))return n()}var i=document.getElementsByTagName("style");for(f=0;f<i.length;f++){h=i[f],d=h.getAttribute("data-href");if(d===t||d===r)return n()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=n,k.onerror=function(n){var t=n&&n.target&&n.target.src||r,a=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");a.request=t,delete u[e],k.parentNode.removeChild(k),c(a)},k.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=a);var h,d=document.createElement("script");d.charset="utf-8",d.timeout=120,o.nc&&d.setAttribute("nonce",o.nc),d.src=f(e),h=function(n){d.onerror=d.onload=null,clearTimeout(i);var c=r[e];if(0!==c){if(c){var t=n&&("load"===n.type?"missing":n.type),u=n&&n.target&&n.target.src,a=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");a.type=t,a.request=u,c[1](a)}r[e]=void 0}};var i=setTimeout((function(){h({type:"timeout",target:d})}),12e4);d.onerror=d.onload=h,document.head.appendChild(d)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,c){o.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},o.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,n){if(1&n&&(e=o(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(o.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)o.d(c,t,function(n){return e[n]}.bind(null,t));return c},o.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/",o.oe=function(e){throw console.error(e),e};var h=window["webpackJsonp"]=window["webpackJsonp"]||[],d=h.push.bind(h);h.push=n,h=h.slice();for(var i=0;i<h.length;i++)n(h[i]);var k=d;c()})([]);</script><script src=/static/js/app.7a40f7e0.js></script></body><script>window.onload = function() {
+=======
+<<<<<<< HEAD
+    }</style><link href=/static/css/chunk-libs.9306e674.css rel=stylesheet><link href=/static/css/app.1b1ce3f2.css rel=stylesheet></head><body><div id=app><div id=loader-wrapper><div id=loader></div><div class="loader-section section-left"></div><div class="loader-section section-right"></div><div class=load_title>正在加载系统资源，请耐心等待</div></div></div><script src=/static/js/chunk-elementUI.e19103bf.js></script><script src=/static/js/chunk-libs.191b10c7.js></script><script>(function(e){function c(c){for(var t,u,a=c[0],d=c[1],o=c[2],h=0,i=[];h<a.length;h++)u=a[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);k&&k(c);while(i.length)i.shift()();return f.push.apply(f,o||[]),n()}function n(){for(var e,c=0;c<f.length;c++){for(var n=f[c],t=!0,u=1;u<n.length;u++){var a=n[u];0!==r[a]&&(t=!1)}t&&(f.splice(c--,1),e=d(d.s=n[0]))}return e}var t={},u={runtime:0},r={runtime:0},f=[];function a(e){return d.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"ed4c9710","chunk-0e0bdc00":"ca5e05af","chunk-2d0c7ece":"45001674","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"d0af0990","chunk-2d0e28b6":"1306f738","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-ac7c2c64":"ba823fae","chunk-68d5bf9e":"05315b0a","chunk-2d0d67a2":"2faff61e","chunk-08486bce":"fe975702","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"52eaad38","chunk-443e47f8":"e16760fa","chunk-3a35df6c":"81b90129","chunk-5f18f729":"91b8ccb6","chunk-6c237b40":"c1d15112","chunk-727a03af":"fe0f68ca","chunk-792fc926":"c82f674a","chunk-7c2f4fe6":"ea46273c","chunk-7f914c91":"0c8b074a","chunk-a2b82bd2":"5f4d6a89","chunk-f18f73fa":"72dc7274"}[e]+".js"}function d(c){if(t[c])return t[c].exports;var n=t[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,d),n.l=!0,n.exports}d.e=function(e){var c=[],n={"chunk-0a90d205":1,"chunk-0e0bdc00":1,"chunk-ac7c2c64":1,"chunk-68d5bf9e":1,"chunk-2f2393fa":1,"chunk-443e47f8":1,"chunk-3a35df6c":1,"chunk-5f18f729":1,"chunk-6c237b40":1,"chunk-727a03af":1,"chunk-792fc926":1,"chunk-7f914c91":1,"chunk-a2b82bd2":1,"chunk-f18f73fa":1};u[e]?c.push(u[e]):0!==u[e]&&n[e]&&c.push(u[e]=new Promise((function(c,n){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-0a90d205":"9183fc08","chunk-0e0bdc00":"02f06e77","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-ac7c2c64":"c262f314","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-443e47f8":"e9fe80ee","chunk-3a35df6c":"04b54fdb","chunk-5f18f729":"c9a455ad","chunk-6c237b40":"fe6be668","chunk-727a03af":"06132cc6","chunk-792fc926":"5818f70b","chunk-7c2f4fe6":"31d6cfe0","chunk-7f914c91":"9a695bbc","chunk-a2b82bd2":"687a6a11","chunk-f18f73fa":"0615606c"}[e]+".css",r=d.p+t,f=document.getElementsByTagName("link"),a=0;a<f.length;a++){var o=f[a],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return c()}var i=document.getElementsByTagName("style");for(a=0;a<i.length;a++){o=i[a],h=o.getAttribute("data-href");if(h===t||h===r)return c()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=c,k.onerror=function(c){var t=c&&c.target&&c.target.src||r,f=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");f.request=t,delete u[e],k.parentNode.removeChild(k),n(f)},k.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)c.push(t[2]);else{var f=new Promise((function(c,n){t=r[e]=[c,n]}));c.push(t[2]=f);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,d.nc&&h.setAttribute("nonce",d.nc),h.src=a(e),o=function(c){h.onerror=h.onload=null,clearTimeout(i);var n=r[e];if(0!==n){if(n){var t=c&&("load"===c.type?"missing":c.type),u=c&&c.target&&c.target.src,f=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");f.type=t,f.request=u,n[1](f)}r[e]=void 0}};var i=setTimeout((function(){o({type:"timeout",target:h})}),12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(c)},d.m=e,d.c=t,d.d=function(e,c,n){d.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,c){if(1&c&&(e=d(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(d.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var t in e)d.d(n,t,function(c){return e[c]}.bind(null,t));return n},d.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="/",d.oe=function(e){throw console.error(e),e};var o=window["webpackJsonp"]=window["webpackJsonp"]||[],h=o.push.bind(o);o.push=c,o=o.slice();for(var i=0;i<o.length;i++)c(o[i]);var k=h;n()})([]);</script><script src=/static/js/app.57a5bc81.js></script></body><script>window.onload = function() {
+=======
+    }</style><link href=/static/css/chunk-libs.61976a7c.css rel=stylesheet><link href=/static/css/app.6ce9e1d3.css rel=stylesheet></head><body><div id=app><div id=loader-wrapper><div id=loader></div><div class="loader-section section-left"></div><div class="loader-section section-right"></div><div class=load_title>正在加载系统资源，请耐心等待</div></div></div><script src=/static/js/chunk-elementUI.c1dc07ee.js></script><script src=/static/js/chunk-libs.d4542a8b.js></script><script>(function(e){function c(c){for(var t,u,a=c[0],d=c[1],o=c[2],h=0,i=[];h<a.length;h++)u=a[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[t]);k&&k(c);while(i.length)i.shift()();return f.push.apply(f,o||[]),n()}function n(){for(var e,c=0;c<f.length;c++){for(var n=f[c],t=!0,u=1;u<n.length;u++){var a=n[u];0!==r[a]&&(t=!1)}t&&(f.splice(c--,1),e=d(d.s=n[0]))}return e}var t={},u={runtime:0},r={runtime:0},f=[];function a(e){return d.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"0189bbe0","chunk-0e0bdc00":"483a0dbf","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-ac7c2c64":"b8f00ef6","chunk-68d5bf9e":"05315b0a","chunk-2d0d67a2":"2a791f8c","chunk-08486bce":"a6625ee5","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-443e47f8":"34f98a48","chunk-3a35df6c":"03f135d2","chunk-5f18f729":"565ed286","chunk-6c237b40":"54fd57df","chunk-727a03af":"4fb5c41d","chunk-792fc926":"e9e04949","chunk-7c2f4fe6":"33c37f8e","chunk-7f914c91":"217e6f58","chunk-a2b82bd2":"6f0e7c66","chunk-f18f73fa":"4162e24b"}[e]+".js"}function d(c){if(t[c])return t[c].exports;var n=t[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,d),n.l=!0,n.exports}d.e=function(e){var c=[],n={"chunk-0a90d205":1,"chunk-0e0bdc00":1,"chunk-ac7c2c64":1,"chunk-68d5bf9e":1,"chunk-2f2393fa":1,"chunk-443e47f8":1,"chunk-3a35df6c":1,"chunk-5f18f729":1,"chunk-6c237b40":1,"chunk-727a03af":1,"chunk-792fc926":1,"chunk-7f914c91":1,"chunk-a2b82bd2":1,"chunk-f18f73fa":1};u[e]?c.push(u[e]):0!==u[e]&&n[e]&&c.push(u[e]=new Promise((function(c,n){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-0a90d205":"9183fc08","chunk-0e0bdc00":"02f06e77","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-ac7c2c64":"c262f314","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-443e47f8":"e9fe80ee","chunk-3a35df6c":"04b54fdb","chunk-5f18f729":"c9a455ad","chunk-6c237b40":"fe6be668","chunk-727a03af":"06132cc6","chunk-792fc926":"5818f70b","chunk-7c2f4fe6":"31d6cfe0","chunk-7f914c91":"9a695bbc","chunk-a2b82bd2":"687a6a11","chunk-f18f73fa":"0615606c"}[e]+".css",r=d.p+t,f=document.getElementsByTagName("link"),a=0;a<f.length;a++){var o=f[a],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return c()}var i=document.getElementsByTagName("style");for(a=0;a<i.length;a++){o=i[a],h=o.getAttribute("data-href");if(h===t||h===r)return c()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=c,k.onerror=function(c){var t=c&&c.target&&c.target.src||r,f=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");f.request=t,delete u[e],k.parentNode.removeChild(k),n(f)},k.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)c.push(t[2]);else{var f=new Promise((function(c,n){t=r[e]=[c,n]}));c.push(t[2]=f);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,d.nc&&h.setAttribute("nonce",d.nc),h.src=a(e),o=function(c){h.onerror=h.onload=null,clearTimeout(i);var n=r[e];if(0!==n){if(n){var t=c&&("load"===c.type?"missing":c.type),u=c&&c.target&&c.target.src,f=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");f.type=t,f.request=u,n[1](f)}r[e]=void 0}};var i=setTimeout((function(){o({type:"timeout",target:h})}),12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(c)},d.m=e,d.c=t,d.d=function(e,c,n){d.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,c){if(1&c&&(e=d(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(d.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var t in e)d.d(n,t,function(c){return e[c]}.bind(null,t));return n},d.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="/",d.oe=function(e){throw console.error(e),e};var o=window["webpackJsonp"]=window["webpackJsonp"]||[],h=o.push.bind(o);o.push=c,o=o.slice();for(var i=0;i<o.length;i++)c(o[i]);var k=h;n()})([]);</script><script src=/static/js/app.32e1d083.js></script></body><script>window.onload = function() {
+>>>>>>> master_fix_searchList
+>>>>>>> dev_hxz
      var op = 'open'
      var ssa = window.location.host

--- a/dist/static/css/app.1b1ce3f2.css
+++ b/dist/static/css/app.1b1ce3f2.css
--- a/dist/static/css/chunk-libs.9306e674.css
+++ b/dist/static/css/chunk-libs.9306e674.css
+/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:.67em 0}figcaption,figure,main{display:block}figure{margin:1em 40px}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:inherit;font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item}canvas{display:inline-block}[hidden],template{display:none}#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;-webkit-transform:rotate(3deg) translateY(-4px);-ms-transform:rotate(3deg) translateY(-4px);transform:rotate(3deg) translateY(-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner .4s linear infinite;animation:nprogress-spinner .4s linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@font-face{font-family:swiper-icons;src:url("data:application/font-woff;charset=utf-8;base64, d09GRgABAAAAAAZgABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAGRAAAABoAAAAci6qHkUdERUYAAAWgAAAAIwAAACQAYABXR1BPUwAABhQAAAAuAAAANuAY7+xHU1VCAAAFxAAAAFAAAABm2fPczU9TLzIAAAHcAAAASgAAAGBP9V5RY21hcAAAAkQAAACIAAABYt6F0cBjdnQgAAACzAAAAAQAAAAEABEBRGdhc3AAAAWYAAAACAAAAAj//wADZ2x5ZgAAAywAAADMAAAD2MHtryVoZWFkAAABbAAAADAAAAA2E2+eoWhoZWEAAAGcAAAAHwAAACQC9gDzaG10eAAAAigAAAAZAAAArgJkABFsb2NhAAAC0AAAAFoAAABaFQAUGG1heHAAAAG8AAAAHwAAACAAcABAbmFtZQAAA/gAAAE5AAACXvFdBwlwb3N0AAAFNAAAAGIAAACE5s74hXjaY2BkYGAAYpf5Hu/j+W2+MnAzMYDAzaX6QjD6/4//Bxj5GA8AuRwMYGkAPywL13jaY2BkYGA88P8Agx4j+/8fQDYfA1AEBWgDAIB2BOoAeNpjYGRgYNBh4GdgYgABEMnIABJzYNADCQAACWgAsQB42mNgYfzCOIGBlYGB0YcxjYGBwR1Kf2WQZGhhYGBiYGVmgAFGBiQQkOaawtDAoMBQxXjg/wEGPcYDDA4wNUA2CCgwsAAAO4EL6gAAeNpj2M0gyAACqxgGNWBkZ2D4/wMA+xkDdgAAAHjaY2BgYGaAYBkGRgYQiAHyGMF8FgYHIM3DwMHABGQrMOgyWDLEM1T9/w8UBfEMgLzE////P/5//f/V/xv+r4eaAAeMbAxwIUYmIMHEgKYAYjUcsDAwsLKxc3BycfPw8jEQA/gZBASFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTQZBgMAAMR+E+gAEQFEAAAAKgAqACoANAA+AEgAUgBcAGYAcAB6AIQAjgCYAKIArAC2AMAAygDUAN4A6ADyAPwBBgEQARoBJAEuATgBQgFMAVYBYAFqAXQBfgGIAZIBnAGmAbIBzgHsAAB42u2NMQ6CUAyGW568x9AneYYgm4MJbhKFaExIOAVX8ApewSt4Bic4AfeAid3VOBixDxfPYEza5O+Xfi04YADggiUIULCuEJK8VhO4bSvpdnktHI5QCYtdi2sl8ZnXaHlqUrNKzdKcT8cjlq+rwZSvIVczNiezsfnP/uznmfPFBNODM2K7MTQ45YEAZqGP81AmGGcF3iPqOop0r1SPTaTbVkfUe4HXj97wYE+yNwWYxwWu4v1ugWHgo3S1XdZEVqWM7ET0cfnLGxWfkgR42o2PvWrDMBSFj/IHLaF0zKjRgdiVMwScNRAoWUoH78Y2icB/yIY09An6AH2Bdu/UB+yxopYshQiEvnvu0dURgDt8QeC8PDw7Fpji3fEA4z/PEJ6YOB5hKh4dj3EvXhxPqH/SKUY3rJ7srZ4FZnh1PMAtPhwP6fl2PMJMPDgeQ4rY8YT6Gzao0eAEA409DuggmTnFnOcSCiEiLMgxCiTI6Cq5DZUd3Qmp10vO0LaLTd2cjN4fOumlc7lUYbSQcZFkutRG7g6JKZKy0RmdLY680CDnEJ+UMkpFFe1RN7nxdVpXrC4aTtnaurOnYercZg2YVmLN/d/gczfEimrE/fs/bOuq29Zmn8tloORaXgZgGa78yO9/cnXm2BpaGvq25Dv9S4E9+5SIc9PqupJKhYFSSl47+Qcr1mYNAAAAeNptw0cKwkAAAMDZJA8Q7OUJvkLsPfZ6zFVERPy8qHh2YER+3i/BP83vIBLLySsoKimrqKqpa2hp6+jq6RsYGhmbmJqZSy0sraxtbO3sHRydnEMU4uR6yx7JJXveP7WrDycAAAAAAAH//wACeNpjYGRgYOABYhkgZgJCZgZNBkYGLQZtIJsFLMYAAAw3ALgAeNolizEKgDAQBCchRbC2sFER0YD6qVQiBCv/H9ezGI6Z5XBAw8CBK/m5iQQVauVbXLnOrMZv2oLdKFa8Pjuru2hJzGabmOSLzNMzvutpB3N42mNgZGBg4GKQYzBhYMxJLMlj4GBgAYow/P/PAJJhLM6sSoWKfWCAAwDAjgbRAAB42mNgYGBkAIIbCZo5IPrmUn0hGA0AO8EFTQAA") format("woff");font-weight:400;font-style:normal}:root{--swiper-theme-color:#007aff}.swiper-container{margin-left:auto;margin-right:auto;position:relative;overflow:hidden;list-style:none;padding:0;z-index:1}.swiper-container-vertical>.swiper-wrapper{flex-direction:column}.swiper-wrapper{position:relative;width:100%;height:100%;z-index:1;display:flex;transition-property:transform;box-sizing:content-box}.swiper-container-android .swiper-slide,.swiper-wrapper{transform:translateZ(0)}.swiper-container-multirow>.swiper-wrapper{flex-wrap:wrap}.swiper-container-multirow-column>.swiper-wrapper{flex-wrap:wrap;flex-direction:column}.swiper-container-free-mode>.swiper-wrapper{transition-timing-function:ease-out;margin:0 auto}.swiper-container-pointer-events{touch-action:pan-y}.swiper-container-pointer-events.swiper-container-vertical{touch-action:pan-x}.swiper-slide{flex-shrink:0;width:100%;height:100%;position:relative;transition-property:transform}.swiper-slide-invisible-blank{visibility:hidden}.swiper-container-autoheight,.swiper-container-autoheight .swiper-slide{height:auto}.swiper-container-autoheight .swiper-wrapper{align-items:flex-start;transition-property:transform,height}.swiper-container-3d{perspective:1200px}.swiper-container-3d .swiper-cube-shadow,.swiper-container-3d .swiper-slide,.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top,.swiper-container-3d .swiper-wrapper{transform-style:preserve-3d}.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top{position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;z-index:10}.swiper-container-3d .swiper-slide-shadow-left{background-image:linear-gradient(270deg,rgba(0,0,0,.5),transparent)}.swiper-container-3d .swiper-slide-shadow-right{background-image:linear-gradient(90deg,rgba(0,0,0,.5),transparent)}.swiper-container-3d .swiper-slide-shadow-top{background-image:linear-gradient(0deg,rgba(0,0,0,.5),transparent)}.swiper-container-3d .swiper-slide-shadow-bottom{background-image:linear-gradient(180deg,rgba(0,0,0,.5),transparent)}.swiper-container-css-mode>.swiper-wrapper{overflow:auto;scrollbar-width:none;-ms-overflow-style:none}.swiper-container-css-mode>.swiper-wrapper::-webkit-scrollbar{display:none}.swiper-container-css-mode>.swiper-wrapper>.swiper-slide{scroll-snap-align:start start}.swiper-container-horizontal.swiper-container-css-mode>.swiper-wrapper{scroll-snap-type:x mandatory}.swiper-container-vertical.swiper-container-css-mode>.swiper-wrapper{scroll-snap-type:y mandatory}:root{--swiper-navigation-size:44px}.swiper-button-next,.swiper-button-prev{position:absolute;top:50%;width:calc(var(--swiper-navigation-size)/44*27);height:var(--swiper-navigation-size);margin-top:calc(0px - var(--swiper-navigation-size)/2);z-index:10;cursor:pointer;display:flex;align-items:center;justify-content:center;color:var(--swiper-navigation-color,var(--swiper-theme-color))}.swiper-button-next.swiper-button-disabled,.swiper-button-prev.swiper-button-disabled{opacity:.35;cursor:auto;pointer-events:none}.swiper-button-next:after,.swiper-button-prev:after{font-family:swiper-icons;font-size:var(--swiper-navigation-size);text-transform:none!important;letter-spacing:0;text-transform:none;font-variant:normal;line-height:1}.swiper-button-prev,.swiper-container-rtl .swiper-button-next{left:10px;right:auto}.swiper-button-prev:after,.swiper-container-rtl .swiper-button-next:after{content:"prev"}.swiper-button-next,.swiper-container-rtl .swiper-button-prev{right:10px;left:auto}.swiper-button-next:after,.swiper-container-rtl .swiper-button-prev:after{content:"next"}.swiper-button-next.swiper-button-white,.swiper-button-prev.swiper-button-white{--swiper-navigation-color:#fff}.swiper-button-next.swiper-button-black,.swiper-button-prev.swiper-button-black{--swiper-navigation-color:#000}.swiper-button-lock{display:none}.swiper-pagination{position:absolute;text-align:center;transition:opacity .3s;transform:translateZ(0);z-index:10}.swiper-pagination.swiper-pagination-hidden{opacity:0}.swiper-container-horizontal>.swiper-pagination-bullets,.swiper-pagination-custom,.swiper-pagination-fraction{bottom:10px;left:0;width:100%}.swiper-pagination-bullets-dynamic{overflow:hidden;font-size:0}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{transform:scale(.33);position:relative}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active,.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-main{transform:scale(1)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev{transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev-prev{transform:scale(.33)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next{transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next-next{transform:scale(.33)}.swiper-pagination-bullet{width:8px;height:8px;display:inline-block;border-radius:50%;background:#000;opacity:.2}button.swiper-pagination-bullet{border:none;margin:0;padding:0;box-shadow:none;-webkit-appearance:none;appearance:none}.swiper-pagination-clickable .swiper-pagination-bullet{cursor:pointer}.swiper-pagination-bullet-active{opacity:1;background:var(--swiper-pagination-color,var(--swiper-theme-color))}.swiper-container-vertical>.swiper-pagination-bullets{right:10px;top:50%;transform:translate3d(0,-50%,0)}.swiper-container-vertical>.swiper-pagination-bullets .swiper-pagination-bullet{margin:6px 0;display:block}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{top:50%;transform:translateY(-50%);width:8px}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{display:inline-block;transition:transform .2s,top .2s}.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{margin:0 4px}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{left:50%;transform:translateX(-50%);white-space:nowrap}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{transition:transform .2s,left .2s}.swiper-container-horizontal.swiper-container-rtl>.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{transition:transform .2s,right .2s}.swiper-pagination-progressbar{background:rgba(0,0,0,.25);position:absolute}.swiper-pagination-progressbar .swiper-pagination-progressbar-fill{background:var(--swiper-pagination-color,var(--swiper-theme-color));position:absolute;left:0;top:0;width:100%;height:100%;transform:scale(0);transform-origin:left top}.swiper-container-rtl .swiper-pagination-progressbar .swiper-pagination-progressbar-fill{transform-origin:right top}.swiper-container-horizontal>.swiper-pagination-progressbar,.swiper-container-vertical>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite{width:100%;height:4px;left:0;top:0}.swiper-container-horizontal>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,.swiper-container-vertical>.swiper-pagination-progressbar{width:4px;height:100%;left:0;top:0}.swiper-pagination-white{--swiper-pagination-color:#fff}.swiper-pagination-black{--swiper-pagination-color:#000}.swiper-pagination-lock{display:none}.swiper-scrollbar{border-radius:10px;position:relative;-ms-touch-action:none;background:rgba(0,0,0,.1)}.swiper-container-horizontal>.swiper-scrollbar{position:absolute;left:1%;bottom:3px;z-index:50;height:5px;width:98%}.swiper-container-vertical>.swiper-scrollbar{position:absolute;right:3px;top:1%;z-index:50;width:5px;height:98%}.swiper-scrollbar-drag{height:100%;width:100%;position:relative;background:rgba(0,0,0,.5);border-radius:10px;left:0;top:0}.swiper-scrollbar-cursor-drag{cursor:move}.swiper-scrollbar-lock{display:none}.swiper-zoom-container{width:100%;height:100%;display:flex;justify-content:center;align-items:center;text-align:center}.swiper-zoom-container>canvas,.swiper-zoom-container>img,.swiper-zoom-container>svg{max-width:100%;max-height:100%;object-fit:contain}.swiper-slide-zoomed{cursor:move}.swiper-lazy-preloader{width:42px;height:42px;position:absolute;left:50%;top:50%;margin-left:-21px;margin-top:-21px;z-index:10;transform-origin:50%;animation:swiper-preloader-spin 1s linear infinite;box-sizing:border-box;border:4px solid var(--swiper-preloader-color,var(--swiper-theme-color));border-radius:50%;border-top-color:transparent}.swiper-lazy-preloader-white{--swiper-preloader-color:#fff}.swiper-lazy-preloader-black{--swiper-preloader-color:#000}@keyframes swiper-preloader-spin{to{transform:rotate(1turn)}}.swiper-container .swiper-notification{position:absolute;left:0;top:0;pointer-events:none;opacity:0;z-index:-1000}.swiper-container-fade.swiper-container-free-mode .swiper-slide{transition-timing-function:ease-out}.swiper-container-fade .swiper-slide{pointer-events:none;transition-property:opacity}.swiper-container-fade .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-fade .swiper-slide-active,.swiper-container-fade .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube{overflow:visible}.swiper-container-cube .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1;visibility:hidden;transform-origin:0 0;width:100%;height:100%}.swiper-container-cube .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-cube.swiper-container-rtl .swiper-slide{transform-origin:100% 0}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-next,.swiper-container-cube .swiper-slide-next+.swiper-slide,.swiper-container-cube .swiper-slide-prev{pointer-events:auto;visibility:visible}.swiper-container-cube .swiper-slide-shadow-bottom,.swiper-container-cube .swiper-slide-shadow-left,.swiper-container-cube .swiper-slide-shadow-right,.swiper-container-cube .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-cube .swiper-cube-shadow{position:absolute;left:0;bottom:0;width:100%;height:100%;opacity:.6;z-index:0}.swiper-container-cube .swiper-cube-shadow:before{content:"";background:#000;position:absolute;left:0;top:0;bottom:0;right:0;filter:blur(50px)}.swiper-container-flip{overflow:visible}.swiper-container-flip .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1}.swiper-container-flip .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-flip .swiper-slide-active,.swiper-container-flip .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-flip .swiper-slide-shadow-bottom,.swiper-container-flip .swiper-slide-shadow-left,.swiper-container-flip .swiper-slide-shadow-right,.swiper-container-flip .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}
+/*!
+ * Quill Editor v1.3.7
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
+ */
+/*!
+ * Quill Editor v1.3.7
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
+ */.ql-snow.ql-toolbar:after,.ql-snow .ql-toolbar:after{clear:both;content:"";display:table}.ql-snow.ql-toolbar button,.ql-snow .ql-toolbar button{background:none;border:none;cursor:pointer;display:inline-block;float:left;height:24px;padding:3px 5px;width:28px}.ql-snow.ql-toolbar button svg,.ql-snow .ql-toolbar button svg{float:left;height:100%}.ql-snow.ql-toolbar button:active:hover,.ql-snow .ql-toolbar button:active:hover{outline:none}.ql-snow.ql-toolbar input.ql-image[type=file],.ql-snow .ql-toolbar input.ql-image[type=file]{display:none}.ql-snow.ql-toolbar .ql-picker-item.ql-selected,.ql-snow .ql-toolbar .ql-picker-item.ql-selected,.ql-snow.ql-toolbar .ql-picker-item:hover,.ql-snow .ql-toolbar .ql-picker-item:hover,.ql-snow.ql-toolbar .ql-picker-label.ql-active,.ql-snow .ql-toolbar .ql-picker-label.ql-active,.ql-snow.ql-toolbar .ql-picker-label:hover,.ql-snow .ql-toolbar .ql-picker-label:hover,.ql-snow.ql-toolbar button.ql-active,.ql-snow .ql-toolbar button.ql-active,.ql-snow.ql-toolbar button:focus,.ql-snow .ql-toolbar button:focus,.ql-snow.ql-toolbar button:hover,.ql-snow .ql-toolbar button:hover{color:#06c}.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-fill,.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-fill,.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,.ql-snow.ql-toolbar .ql-picker-item:hover .ql-fill,.ql-snow .ql-toolbar .ql-picker-item:hover .ql-fill,.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-fill,.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-fill,.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,.ql-snow.ql-toolbar .ql-picker-label:hover .ql-fill,.ql-snow .ql-toolbar .ql-picker-label:hover .ql-fill,.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,.ql-snow.ql-toolbar button.ql-active .ql-fill,.ql-snow .ql-toolbar button.ql-active .ql-fill,.ql-snow.ql-toolbar button.ql-active .ql-stroke.ql-fill,.ql-snow .ql-toolbar button.ql-active .ql-stroke.ql-fill,.ql-snow.ql-toolbar button:focus .ql-fill,.ql-snow .ql-toolbar button:focus .ql-fill,.ql-snow.ql-toolbar button:focus .ql-stroke.ql-fill,.ql-snow .ql-toolbar button:focus .ql-stroke.ql-fill,.ql-snow.ql-toolbar button:hover .ql-fill,.ql-snow .ql-toolbar button:hover .ql-fill,.ql-snow.ql-toolbar button:hover .ql-stroke.ql-fill,.ql-snow .ql-toolbar button:hover .ql-stroke.ql-fill{fill:#06c}.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke,.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke,.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke,.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke,.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke-miter,.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke-miter,.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke,.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke,.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke,.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke,.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke-miter,.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke-miter,.ql-snow.ql-toolbar button.ql-active .ql-stroke,.ql-snow .ql-toolbar button.ql-active .ql-stroke,.ql-snow.ql-toolbar button.ql-active .ql-stroke-miter,.ql-snow .ql-toolbar button.ql-active .ql-stroke-miter,.ql-snow.ql-toolbar button:focus .ql-stroke,.ql-snow .ql-toolbar button:focus .ql-stroke,.ql-snow.ql-toolbar button:focus .ql-stroke-miter,.ql-snow .ql-toolbar button:focus .ql-stroke-miter,.ql-snow.ql-toolbar button:hover .ql-stroke,.ql-snow .ql-toolbar button:hover .ql-stroke,.ql-snow.ql-toolbar button:hover .ql-stroke-miter,.ql-snow .ql-toolbar button:hover .ql-stroke-miter{stroke:#06c}@media (pointer:coarse){.ql-snow.ql-toolbar button:hover:not(.ql-active),.ql-snow .ql-toolbar button:hover:not(.ql-active){color:#444}.ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-fill,.ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-fill,.ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill,.ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill{fill:#444}.ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke,.ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke,.ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter,.ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter{stroke:#444}}.ql-snow,.ql-snow *{box-sizing:border-box}.ql-snow .ql-hidden{display:none}.ql-snow .ql-out-bottom,.ql-snow .ql-out-top{visibility:hidden}.ql-snow .ql-tooltip{position:absolute;transform:translateY(10px)}.ql-snow .ql-tooltip a{cursor:pointer;text-decoration:none}.ql-snow .ql-tooltip.ql-flip{transform:translateY(-10px)}.ql-snow .ql-formats{display:inline-block;vertical-align:middle}.ql-snow .ql-formats:after{clear:both;content:"";display:table}.ql-snow .ql-stroke{fill:none;stroke:#444;stroke-linecap:round;stroke-linejoin:round;stroke-width:2}.ql-snow .ql-stroke-miter{fill:none;stroke:#444;stroke-miterlimit:10;stroke-width:2}.ql-snow .ql-fill,.ql-snow .ql-stroke.ql-fill{fill:#444}.ql-snow .ql-empty{fill:none}.ql-snow .ql-even{fill-rule:evenodd}.ql-snow .ql-stroke.ql-thin,.ql-snow .ql-thin{stroke-width:1}.ql-snow .ql-transparent{opacity:.4}.ql-snow .ql-direction svg:last-child{display:none}.ql-snow .ql-direction.ql-active svg:last-child{display:inline}.ql-snow .ql-direction.ql-active svg:first-child{display:none}.ql-snow .ql-editor h1{font-size:2em}.ql-snow .ql-editor h2{font-size:1.5em}.ql-snow .ql-editor h3{font-size:1.17em}.ql-snow .ql-editor h4{font-size:1em}.ql-snow .ql-editor h5{font-size:.83em}.ql-snow .ql-editor h6{font-size:.67em}.ql-snow .ql-editor a{text-decoration:underline}.ql-snow .ql-editor blockquote{border-left:4px solid #ccc;margin-bottom:5px;margin-top:5px;padding-left:16px}.ql-snow .ql-editor code,.ql-snow .ql-editor pre{background-color:#f0f0f0;border-radius:3px}.ql-snow .ql-editor pre{white-space:pre-wrap;margin-bottom:5px;margin-top:5px;padding:5px 10px}.ql-snow .ql-editor code{font-size:85%;padding:2px 4px}.ql-snow .ql-editor pre.ql-syntax{background-color:#23241f;color:#f8f8f2;overflow:visible}.ql-snow .ql-editor img{max-width:100%}.ql-snow .ql-picker{color:#444;display:inline-block;float:left;font-size:14px;font-weight:500;height:24px;position:relative;vertical-align:middle}.ql-snow .ql-picker-label{cursor:pointer;display:inline-block;height:100%;padding-left:8px;padding-right:2px;position:relative;width:100%}.ql-snow .ql-picker-label:before{display:inline-block;line-height:22px}.ql-snow .ql-picker-options{background-color:#fff;display:none;min-width:100%;padding:4px 8px;position:absolute;white-space:nowrap}.ql-snow .ql-picker-options .ql-picker-item{cursor:pointer;display:block;padding-bottom:5px;padding-top:5px}.ql-snow .ql-picker.ql-expanded .ql-picker-label{color:#ccc;z-index:2}.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-fill{fill:#ccc}.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-stroke{stroke:#ccc}.ql-snow .ql-picker.ql-expanded .ql-picker-options{display:block;margin-top:-1px;top:100%;z-index:1}.ql-snow .ql-color-picker,.ql-snow .ql-icon-picker{width:28px}.ql-snow .ql-color-picker .ql-picker-label,.ql-snow .ql-icon-picker .ql-picker-label{padding:2px 4px}.ql-snow .ql-color-picker .ql-picker-label svg,.ql-snow .ql-icon-picker .ql-picker-label svg{right:4px}.ql-snow .ql-icon-picker .ql-picker-options{padding:4px 0}.ql-snow .ql-icon-picker .ql-picker-item{height:24px;width:24px;padding:2px 4px}.ql-snow .ql-color-picker .ql-picker-options{padding:3px 5px;width:152px}.ql-snow .ql-color-picker .ql-picker-item{border:1px solid transparent;float:left;height:16px;margin:2px;padding:0;width:16px}.ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{position:absolute;margin-top:-9px;right:0;top:50%;width:18px}.ql-snow .ql-picker.ql-font .ql-picker-item[data-label]:not([data-label=""]):before,.ql-snow .ql-picker.ql-font .ql-picker-label[data-label]:not([data-label=""]):before,.ql-snow .ql-picker.ql-header .ql-picker-item[data-label]:not([data-label=""]):before,.ql-snow .ql-picker.ql-header .ql-picker-label[data-label]:not([data-label=""]):before,.ql-snow .ql-picker.ql-size .ql-picker-item[data-label]:not([data-label=""]):before,.ql-snow .ql-picker.ql-size .ql-picker-label[data-label]:not([data-label=""]):before{content:attr(data-label)}.ql-snow .ql-picker.ql-header{width:98px}.ql-snow .ql-picker.ql-header .ql-picker-item:before,.ql-snow .ql-picker.ql-header .ql-picker-label:before{content:"Normal"}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]:before,.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]:before{content:"Heading 1"}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]:before,.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]:before{content:"Heading 2"}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]:before,.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]:before{content:"Heading 3"}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]:before,.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]:before{content:"Heading 4"}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]:before,.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]:before{content:"Heading 5"}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]:before,.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]:before{content:"Heading 6"}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]:before{font-size:2em}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]:before{font-size:1.5em}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]:before{font-size:1.17em}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]:before{font-size:1em}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]:before{font-size:.83em}.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]:before{font-size:.67em}.ql-snow .ql-picker.ql-font{width:108px}.ql-snow .ql-picker.ql-font .ql-picker-item:before,.ql-snow .ql-picker.ql-font .ql-picker-label:before{content:"Sans Serif"}.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]:before,.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=serif]:before{content:"Serif"}.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]:before,.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=monospace]:before{content:"Monospace"}.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]:before{font-family:Georgia,Times New Roman,serif}.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]:before{font-family:Monaco,Courier New,monospace}.ql-snow .ql-picker.ql-size{width:98px}.ql-snow .ql-picker.ql-size .ql-picker-item:before,.ql-snow .ql-picker.ql-size .ql-picker-label:before{content:"Normal"}.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]:before,.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=small]:before{content:"Small"}.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]:before,.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=large]:before{content:"Large"}.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]:before,.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=huge]:before{content:"Huge"}.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]:before{font-size:10px}.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]:before{font-size:18px}.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]:before{font-size:32px}.ql-snow .ql-color-picker.ql-background .ql-picker-item{background-color:#fff}.ql-snow .ql-color-picker.ql-color .ql-picker-item{background-color:#000}.ql-toolbar.ql-snow{border:1px solid #ccc;box-sizing:border-box;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;padding:8px}.ql-toolbar.ql-snow .ql-formats{margin-right:15px}.ql-toolbar.ql-snow .ql-picker-label{border:1px solid transparent}.ql-toolbar.ql-snow .ql-picker-options{border:1px solid transparent;box-shadow:0 2px 8px rgba(0,0,0,.2)}.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label,.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{border-color:#ccc}.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item.ql-selected,.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item:hover{border-color:#000}.ql-toolbar.ql-snow+.ql-container.ql-snow{border-top:0}.ql-snow .ql-tooltip{background-color:#fff;border:1px solid #ccc;box-shadow:0 0 5px #ddd;color:#444;padding:5px 12px;white-space:nowrap}.ql-snow .ql-tooltip:before{content:"Visit URL:";line-height:26px;margin-right:8px}.ql-snow .ql-tooltip input[type=text]{display:none;border:1px solid #ccc;font-size:13px;height:26px;margin:0;padding:3px 5px;width:170px}.ql-snow .ql-tooltip a.ql-preview{display:inline-block;max-width:200px;overflow-x:hidden;text-overflow:ellipsis;vertical-align:top}.ql-snow .ql-tooltip a.ql-action:after{border-right:1px solid #ccc;content:"Edit";margin-left:16px;padding-right:8px}.ql-snow .ql-tooltip a.ql-remove:before{content:"Remove";margin-left:8px}.ql-snow .ql-tooltip a{line-height:26px}.ql-snow .ql-tooltip.ql-editing a.ql-preview,.ql-snow .ql-tooltip.ql-editing a.ql-remove{display:none}.ql-snow .ql-tooltip.ql-editing input[type=text]{display:inline-block}.ql-snow .ql-tooltip.ql-editing a.ql-action:after{border-right:0;content:"Save";padding-right:0}.ql-snow .ql-tooltip[data-mode=link]:before{content:"Enter link:"}.ql-snow .ql-tooltip[data-mode=formula]:before{content:"Enter formula:"}.ql-snow .ql-tooltip[data-mode=video]:before{content:"Enter video:"}.ql-snow a{color:#06c}.ql-container.ql-snow{border:1px solid #ccc}
+/*!
+ * Quill Editor v1.3.7
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
+ */.ql-container{box-sizing:border-box;font-family:Helvetica,Arial,sans-serif;font-size:13px;height:100%;margin:0;position:relative}.ql-container.ql-disabled .ql-tooltip{visibility:hidden}.ql-container.ql-disabled .ql-editor ul[data-checked]>li:before{pointer-events:none}.ql-clipboard{left:-100000px;height:1px;overflow-y:hidden;position:absolute;top:50%}.ql-clipboard p{margin:0;padding:0}.ql-editor{box-sizing:border-box;line-height:1.42;height:100%;outline:none;overflow-y:auto;padding:12px 15px;tab-size:4;-moz-tab-size:4;text-align:left;white-space:pre-wrap;word-wrap:break-word}.ql-editor>*{cursor:text}.ql-editor blockquote,.ql-editor h1,.ql-editor h2,.ql-editor h3,.ql-editor h4,.ql-editor h5,.ql-editor h6,.ql-editor ol,.ql-editor p,.ql-editor pre,.ql-editor ul{margin:0;padding:0;counter-reset:list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}.ql-editor ol,.ql-editor ul{padding-left:1.5em}.ql-editor ol>li,.ql-editor ul>li{list-style-type:none}.ql-editor ul>li:before{content:"\2022"}.ql-editor ul[data-checked=false],.ql-editor ul[data-checked=true]{pointer-events:none}.ql-editor ul[data-checked=false]>li *,.ql-editor ul[data-checked=true]>li *{pointer-events:all}.ql-editor ul[data-checked=false]>li:before,.ql-editor ul[data-checked=true]>li:before{color:#777;cursor:pointer;pointer-events:all}.ql-editor ul[data-checked=true]>li:before{content:"\2611"}.ql-editor ul[data-checked=false]>li:before{content:"\2610"}.ql-editor li:before{display:inline-block;white-space:nowrap;width:1.2em}.ql-editor li:not(.ql-direction-rtl):before{margin-left:-1.5em;margin-right:.3em;text-align:right}.ql-editor li.ql-direction-rtl:before{margin-left:.3em;margin-right:-1.5em}.ql-editor ol li:not(.ql-direction-rtl),.ql-editor ul li:not(.ql-direction-rtl){padding-left:1.5em}.ql-editor ol li.ql-direction-rtl,.ql-editor ul li.ql-direction-rtl{padding-right:1.5em}.ql-editor ol li{counter-reset:list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;counter-increment:list-0}.ql-editor ol li:before{content:counter(list-0,decimal) ". "}.ql-editor ol li.ql-indent-1{counter-increment:list-1}.ql-editor ol li.ql-indent-1:before{content:counter(list-1,lower-alpha) ". "}.ql-editor ol li.ql-indent-1{counter-reset:list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9}.ql-editor ol li.ql-indent-2{counter-increment:list-2}.ql-editor ol li.ql-indent-2:before{content:counter(list-2,lower-roman) ". "}.ql-editor ol li.ql-indent-2{counter-reset:list-3 list-4 list-5 list-6 list-7 list-8 list-9}.ql-editor ol li.ql-indent-3{counter-increment:list-3}.ql-editor ol li.ql-indent-3:before{content:counter(list-3,decimal) ". "}.ql-editor ol li.ql-indent-3{counter-reset:list-4 list-5 list-6 list-7 list-8 list-9}.ql-editor ol li.ql-indent-4{counter-increment:list-4}.ql-editor ol li.ql-indent-4:before{content:counter(list-4,lower-alpha) ". "}.ql-editor ol li.ql-indent-4{counter-reset:list-5 list-6 list-7 list-8 list-9}.ql-editor ol li.ql-indent-5{counter-increment:list-5}.ql-editor ol li.ql-indent-5:before{content:counter(list-5,lower-roman) ". "}.ql-editor ol li.ql-indent-5{counter-reset:list-6 list-7 list-8 list-9}.ql-editor ol li.ql-indent-6{counter-increment:list-6}.ql-editor ol li.ql-indent-6:before{content:counter(list-6,decimal) ". "}.ql-editor ol li.ql-indent-6{counter-reset:list-7 list-8 list-9}.ql-editor ol li.ql-indent-7{counter-increment:list-7}.ql-editor ol li.ql-indent-7:before{content:counter(list-7,lower-alpha) ". "}.ql-editor ol li.ql-indent-7{counter-reset:list-8 list-9}.ql-editor ol li.ql-indent-8{counter-increment:list-8}.ql-editor ol li.ql-indent-8:before{content:counter(list-8,lower-roman) ". "}.ql-editor ol li.ql-indent-8{counter-reset:list-9}.ql-editor ol li.ql-indent-9{counter-increment:list-9}.ql-editor ol li.ql-indent-9:before{content:counter(list-9,decimal) ". "}.ql-editor .ql-indent-1:not(.ql-direction-rtl){padding-left:3em}.ql-editor li.ql-indent-1:not(.ql-direction-rtl){padding-left:4.5em}.ql-editor .ql-indent-1.ql-direction-rtl.ql-align-right{padding-right:3em}.ql-editor li.ql-indent-1.ql-direction-rtl.ql-align-right{padding-right:4.5em}.ql-editor .ql-indent-2:not(.ql-direction-rtl){padding-left:6em}.ql-editor li.ql-indent-2:not(.ql-direction-rtl){padding-left:7.5em}.ql-editor .ql-indent-2.ql-direction-rtl.ql-align-right{padding-right:6em}.ql-editor li.ql-indent-2.ql-direction-rtl.ql-align-right{padding-right:7.5em}.ql-editor .ql-indent-3:not(.ql-direction-rtl){padding-left:9em}.ql-editor li.ql-indent-3:not(.ql-direction-rtl){padding-left:10.5em}.ql-editor .ql-indent-3.ql-direction-rtl.ql-align-right{padding-right:9em}.ql-editor li.ql-indent-3.ql-direction-rtl.ql-align-right{padding-right:10.5em}.ql-editor .ql-indent-4:not(.ql-direction-rtl){padding-left:12em}.ql-editor li.ql-indent-4:not(.ql-direction-rtl){padding-left:13.5em}.ql-editor .ql-indent-4.ql-direction-rtl.ql-align-right{padding-right:12em}.ql-editor li.ql-indent-4.ql-direction-rtl.ql-align-right{padding-right:13.5em}.ql-editor .ql-indent-5:not(.ql-direction-rtl){padding-left:15em}.ql-editor li.ql-indent-5:not(.ql-direction-rtl){padding-left:16.5em}.ql-editor .ql-indent-5.ql-direction-rtl.ql-align-right{padding-right:15em}.ql-editor li.ql-indent-5.ql-direction-rtl.ql-align-right{padding-right:16.5em}.ql-editor .ql-indent-6:not(.ql-direction-rtl){padding-left:18em}.ql-editor li.ql-indent-6:not(.ql-direction-rtl){padding-left:19.5em}.ql-editor .ql-indent-6.ql-direction-rtl.ql-align-right{padding-right:18em}.ql-editor li.ql-indent-6.ql-direction-rtl.ql-align-right{padding-right:19.5em}.ql-editor .ql-indent-7:not(.ql-direction-rtl){padding-left:21em}.ql-editor li.ql-indent-7:not(.ql-direction-rtl){padding-left:22.5em}.ql-editor .ql-indent-7.ql-direction-rtl.ql-align-right{padding-right:21em}.ql-editor li.ql-indent-7.ql-direction-rtl.ql-align-right{padding-right:22.5em}.ql-editor .ql-indent-8:not(.ql-direction-rtl){padding-left:24em}.ql-editor li.ql-indent-8:not(.ql-direction-rtl){padding-left:25.5em}.ql-editor .ql-indent-8.ql-direction-rtl.ql-align-right{padding-right:24em}.ql-editor li.ql-indent-8.ql-direction-rtl.ql-align-right{padding-right:25.5em}.ql-editor .ql-indent-9:not(.ql-direction-rtl){padding-left:27em}.ql-editor li.ql-indent-9:not(.ql-direction-rtl){padding-left:28.5em}.ql-editor .ql-indent-9.ql-direction-rtl.ql-align-right{padding-right:27em}.ql-editor li.ql-indent-9.ql-direction-rtl.ql-align-right{padding-right:28.5em}.ql-editor .ql-video{display:block;max-width:100%}.ql-editor .ql-video.ql-align-center{margin:0 auto}.ql-editor .ql-video.ql-align-right{margin:0 0 0 auto}.ql-editor .ql-bg-black{background-color:#000}.ql-editor .ql-bg-red{background-color:#e60000}.ql-editor .ql-bg-orange{background-color:#f90}.ql-editor .ql-bg-yellow{background-color:#ff0}.ql-editor .ql-bg-green{background-color:#008a00}.ql-editor .ql-bg-blue{background-color:#06c}.ql-editor .ql-bg-purple{background-color:#93f}.ql-editor .ql-color-white{color:#fff}.ql-editor .ql-color-red{color:#e60000}.ql-editor .ql-color-orange{color:#f90}.ql-editor .ql-color-yellow{color:#ff0}.ql-editor .ql-color-green{color:#008a00}.ql-editor .ql-color-blue{color:#06c}.ql-editor .ql-color-purple{color:#93f}.ql-editor .ql-font-serif{font-family:Georgia,Times New Roman,serif}.ql-editor .ql-font-monospace{font-family:Monaco,Courier New,monospace}.ql-editor .ql-size-small{font-size:.75em}.ql-editor .ql-size-large{font-size:1.5em}.ql-editor .ql-size-huge{font-size:2.5em}.ql-editor .ql-direction-rtl{direction:rtl;text-align:inherit}.ql-editor .ql-align-center{text-align:center}.ql-editor .ql-align-justify{text-align:justify}.ql-editor .ql-align-right{text-align:right}.ql-editor.ql-blank:before{color:rgba(0,0,0,.6);content:attr(data-placeholder);font-style:italic;left:15px;pointer-events:none;position:absolute;right:15px}.ql-bubble.ql-toolbar:after,.ql-bubble .ql-toolbar:after{clear:both;content:"";display:table}.ql-bubble.ql-toolbar button,.ql-bubble .ql-toolbar button{background:none;border:none;cursor:pointer;display:inline-block;float:left;height:24px;padding:3px 5px;width:28px}.ql-bubble.ql-toolbar button svg,.ql-bubble .ql-toolbar button svg{float:left;height:100%}.ql-bubble.ql-toolbar button:active:hover,.ql-bubble .ql-toolbar button:active:hover{outline:none}.ql-bubble.ql-toolbar input.ql-image[type=file],.ql-bubble .ql-toolbar input.ql-image[type=file]{display:none}.ql-bubble.ql-toolbar .ql-picker-item.ql-selected,.ql-bubble .ql-toolbar .ql-picker-item.ql-selected,.ql-bubble.ql-toolbar .ql-picker-item:hover,.ql-bubble .ql-toolbar .ql-picker-item:hover,.ql-bubble.ql-toolbar .ql-picker-label.ql-active,.ql-bubble .ql-toolbar .ql-picker-label.ql-active,.ql-bubble.ql-toolbar .ql-picker-label:hover,.ql-bubble .ql-toolbar .ql-picker-label:hover,.ql-bubble.ql-toolbar button.ql-active,.ql-bubble .ql-toolbar button.ql-active,.ql-bubble.ql-toolbar button:focus,.ql-bubble .ql-toolbar button:focus,.ql-bubble.ql-toolbar button:hover,.ql-bubble .ql-toolbar button:hover{color:#fff}.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-fill,.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-fill,.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-fill,.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-fill,.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-fill,.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-fill,.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-fill,.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-fill,.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,.ql-bubble.ql-toolbar button.ql-active .ql-fill,.ql-bubble .ql-toolbar button.ql-active .ql-fill,.ql-bubble.ql-toolbar button.ql-active .ql-stroke.ql-fill,.ql-bubble .ql-toolbar button.ql-active .ql-stroke.ql-fill,.ql-bubble.ql-toolbar button:focus .ql-fill,.ql-bubble .ql-toolbar button:focus .ql-fill,.ql-bubble.ql-toolbar button:focus .ql-stroke.ql-fill,.ql-bubble .ql-toolbar button:focus .ql-stroke.ql-fill,.ql-bubble.ql-toolbar button:hover .ql-fill,.ql-bubble .ql-toolbar button:hover .ql-fill,.ql-bubble.ql-toolbar button:hover .ql-stroke.ql-fill,.ql-bubble .ql-toolbar button:hover .ql-stroke.ql-fill{fill:#fff}.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-stroke,.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-stroke,.ql-bubble.ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,.ql-bubble .ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-stroke,.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-stroke,.ql-bubble.ql-toolbar .ql-picker-item:hover .ql-stroke-miter,.ql-bubble .ql-toolbar .ql-picker-item:hover .ql-stroke-miter,.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-stroke,.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-stroke,.ql-bubble.ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,.ql-bubble .ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-stroke,.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-stroke,.ql-bubble.ql-toolbar .ql-picker-label:hover .ql-stroke-miter,.ql-bubble .ql-toolbar .ql-picker-label:hover .ql-stroke-miter,.ql-bubble.ql-toolbar button.ql-active .ql-stroke,.ql-bubble .ql-toolbar button.ql-active .ql-stroke,.ql-bubble.ql-toolbar button.ql-active .ql-stroke-miter,.ql-bubble .ql-toolbar button.ql-active .ql-stroke-miter,.ql-bubble.ql-toolbar button:focus .ql-stroke,.ql-bubble .ql-toolbar button:focus .ql-stroke,.ql-bubble.ql-toolbar button:focus .ql-stroke-miter,.ql-bubble .ql-toolbar button:focus .ql-stroke-miter,.ql-bubble.ql-toolbar button:hover .ql-stroke,.ql-bubble .ql-toolbar button:hover .ql-stroke,.ql-bubble.ql-toolbar button:hover .ql-stroke-miter,.ql-bubble .ql-toolbar button:hover .ql-stroke-miter{stroke:#fff}@media (pointer:coarse){.ql-bubble.ql-toolbar button:hover:not(.ql-active),.ql-bubble .ql-toolbar button:hover:not(.ql-active){color:#ccc}.ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-fill,.ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-fill,.ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill,.ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill{fill:#ccc}.ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-stroke,.ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-stroke,.ql-bubble.ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter,.ql-bubble .ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter{stroke:#ccc}}.ql-bubble,.ql-bubble *{box-sizing:border-box}.ql-bubble .ql-hidden{display:none}.ql-bubble .ql-out-bottom,.ql-bubble .ql-out-top{visibility:hidden}.ql-bubble .ql-tooltip{position:absolute;transform:translateY(10px)}.ql-bubble .ql-tooltip a{cursor:pointer;text-decoration:none}.ql-bubble .ql-tooltip.ql-flip{transform:translateY(-10px)}.ql-bubble .ql-formats{display:inline-block;vertical-align:middle}.ql-bubble .ql-formats:after{clear:both;content:"";display:table}.ql-bubble .ql-stroke{fill:none;stroke:#ccc;stroke-linecap:round;stroke-linejoin:round;stroke-width:2}.ql-bubble .ql-stroke-miter{fill:none;stroke:#ccc;stroke-miterlimit:10;stroke-width:2}.ql-bubble .ql-fill,.ql-bubble .ql-stroke.ql-fill{fill:#ccc}.ql-bubble .ql-empty{fill:none}.ql-bubble .ql-even{fill-rule:evenodd}.ql-bubble .ql-stroke.ql-thin,.ql-bubble .ql-thin{stroke-width:1}.ql-bubble .ql-transparent{opacity:.4}.ql-bubble .ql-direction svg:last-child{display:none}.ql-bubble .ql-direction.ql-active svg:last-child{display:inline}.ql-bubble .ql-direction.ql-active svg:first-child{display:none}.ql-bubble .ql-editor h1{font-size:2em}.ql-bubble .ql-editor h2{font-size:1.5em}.ql-bubble .ql-editor h3{font-size:1.17em}.ql-bubble .ql-editor h4{font-size:1em}.ql-bubble .ql-editor h5{font-size:.83em}.ql-bubble .ql-editor h6{font-size:.67em}.ql-bubble .ql-editor a{text-decoration:underline}.ql-bubble .ql-editor blockquote{border-left:4px solid #ccc;margin-bottom:5px;margin-top:5px;padding-left:16px}.ql-bubble .ql-editor code,.ql-bubble .ql-editor pre{background-color:#f0f0f0;border-radius:3px}.ql-bubble .ql-editor pre{white-space:pre-wrap;margin-bottom:5px;margin-top:5px;padding:5px 10px}.ql-bubble .ql-editor code{font-size:85%;padding:2px 4px}.ql-bubble .ql-editor pre.ql-syntax{background-color:#23241f;color:#f8f8f2;overflow:visible}.ql-bubble .ql-editor img{max-width:100%}.ql-bubble .ql-picker{color:#ccc;display:inline-block;float:left;font-size:14px;font-weight:500;height:24px;position:relative;vertical-align:middle}.ql-bubble .ql-picker-label{cursor:pointer;display:inline-block;height:100%;padding-left:8px;padding-right:2px;position:relative;width:100%}.ql-bubble .ql-picker-label:before{display:inline-block;line-height:22px}.ql-bubble .ql-picker-options{background-color:#444;display:none;min-width:100%;padding:4px 8px;position:absolute;white-space:nowrap}.ql-bubble .ql-picker-options .ql-picker-item{cursor:pointer;display:block;padding-bottom:5px;padding-top:5px}.ql-bubble .ql-picker.ql-expanded .ql-picker-label{color:#777;z-index:2}.ql-bubble .ql-picker.ql-expanded .ql-picker-label .ql-fill{fill:#777}.ql-bubble .ql-picker.ql-expanded .ql-picker-label .ql-stroke{stroke:#777}.ql-bubble .ql-picker.ql-expanded .ql-picker-options{display:block;margin-top:-1px;top:100%;z-index:1}.ql-bubble .ql-color-picker,.ql-bubble .ql-icon-picker{width:28px}.ql-bubble .ql-color-picker .ql-picker-label,.ql-bubble .ql-icon-picker .ql-picker-label{padding:2px 4px}.ql-bubble .ql-color-picker .ql-picker-label svg,.ql-bubble .ql-icon-picker .ql-picker-label svg{right:4px}.ql-bubble .ql-icon-picker .ql-picker-options{padding:4px 0}.ql-bubble .ql-icon-picker .ql-picker-item{height:24px;width:24px;padding:2px 4px}.ql-bubble .ql-color-picker .ql-picker-options{padding:3px 5px;width:152px}.ql-bubble .ql-color-picker .ql-picker-item{border:1px solid transparent;float:left;height:16px;margin:2px;padding:0;width:16px}.ql-bubble .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{position:absolute;margin-top:-9px;right:0;top:50%;width:18px}.ql-bubble .ql-picker.ql-font .ql-picker-item[data-label]:not([data-label=""]):before,.ql-bubble .ql-picker.ql-font .ql-picker-label[data-label]:not([data-label=""]):before,.ql-bubble .ql-picker.ql-header .ql-picker-item[data-label]:not([data-label=""]):before,.ql-bubble .ql-picker.ql-header .ql-picker-label[data-label]:not([data-label=""]):before,.ql-bubble .ql-picker.ql-size .ql-picker-item[data-label]:not([data-label=""]):before,.ql-bubble .ql-picker.ql-size .ql-picker-label[data-label]:not([data-label=""]):before{content:attr(data-label)}.ql-bubble .ql-picker.ql-header{width:98px}.ql-bubble .ql-picker.ql-header .ql-picker-item:before,.ql-bubble .ql-picker.ql-header .ql-picker-label:before{content:"Normal"}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="1"]:before,.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="1"]:before{content:"Heading 1"}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="2"]:before,.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="2"]:before{content:"Heading 2"}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="3"]:before,.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="3"]:before{content:"Heading 3"}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="4"]:before,.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="4"]:before{content:"Heading 4"}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="5"]:before,.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="5"]:before{content:"Heading 5"}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="6"]:before,.ql-bubble .ql-picker.ql-header .ql-picker-label[data-value="6"]:before{content:"Heading 6"}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="1"]:before{font-size:2em}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="2"]:before{font-size:1.5em}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="3"]:before{font-size:1.17em}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="4"]:before{font-size:1em}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="5"]:before{font-size:.83em}.ql-bubble .ql-picker.ql-header .ql-picker-item[data-value="6"]:before{font-size:.67em}.ql-bubble .ql-picker.ql-font{width:108px}.ql-bubble .ql-picker.ql-font .ql-picker-item:before,.ql-bubble .ql-picker.ql-font .ql-picker-label:before{content:"Sans Serif"}.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=serif]:before,.ql-bubble .ql-picker.ql-font .ql-picker-label[data-value=serif]:before{content:"Serif"}.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=monospace]:before,.ql-bubble .ql-picker.ql-font .ql-picker-label[data-value=monospace]:before{content:"Monospace"}.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=serif]:before{font-family:Georgia,Times New Roman,serif}.ql-bubble .ql-picker.ql-font .ql-picker-item[data-value=monospace]:before{font-family:Monaco,Courier New,monospace}.ql-bubble .ql-picker.ql-size{width:98px}.ql-bubble .ql-picker.ql-size .ql-picker-item:before,.ql-bubble .ql-picker.ql-size .ql-picker-label:before{content:"Normal"}.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=small]:before,.ql-bubble .ql-picker.ql-size .ql-picker-label[data-value=small]:before{content:"Small"}.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=large]:before,.ql-bubble .ql-picker.ql-size .ql-picker-label[data-value=large]:before{content:"Large"}.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=huge]:before,.ql-bubble .ql-picker.ql-size .ql-picker-label[data-value=huge]:before{content:"Huge"}.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=small]:before{font-size:10px}.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=large]:before{font-size:18px}.ql-bubble .ql-picker.ql-size .ql-picker-item[data-value=huge]:before{font-size:32px}.ql-bubble .ql-color-picker.ql-background .ql-picker-item{background-color:#fff}.ql-bubble .ql-color-picker.ql-color .ql-picker-item{background-color:#000}.ql-bubble .ql-toolbar .ql-formats{margin:8px 12px 8px 0}.ql-bubble .ql-toolbar .ql-formats:first-child{margin-left:12px}.ql-bubble .ql-color-picker svg{margin:1px}.ql-bubble .ql-color-picker .ql-picker-item.ql-selected,.ql-bubble .ql-color-picker .ql-picker-item:hover{border-color:#fff}.ql-bubble .ql-tooltip{background-color:#444;border-radius:25px;color:#fff}.ql-bubble .ql-tooltip-arrow{border-left:6px solid transparent;border-right:6px solid transparent;content:" ";display:block;left:50%;margin-left:-6px;position:absolute}.ql-bubble .ql-tooltip:not(.ql-flip) .ql-tooltip-arrow{border-bottom:6px solid #444;top:-6px}.ql-bubble .ql-tooltip.ql-flip .ql-tooltip-arrow{border-top:6px solid #444;bottom:-6px}.ql-bubble .ql-tooltip.ql-editing .ql-tooltip-editor{display:block}.ql-bubble .ql-tooltip.ql-editing .ql-formats{visibility:hidden}.ql-bubble .ql-tooltip-editor{display:none}.ql-bubble .ql-tooltip-editor input[type=text]{background:transparent;border:none;color:#fff;font-size:13px;height:100%;outline:none;padding:10px 20px;position:absolute;width:100%}.ql-bubble .ql-tooltip-editor a{top:10px;position:absolute;right:20px}.ql-bubble .ql-tooltip-editor a:before{color:#ccc;content:"\D7";font-size:16px;font-weight:700}.ql-container.ql-bubble:not(.ql-disabled) a{position:relative;white-space:nowrap}.ql-container.ql-bubble:not(.ql-disabled) a:before{background-color:#444;border-radius:15px;top:-5px;font-size:12px;color:#fff;content:attr(href);font-weight:400;overflow:hidden;padding:5px 15px;text-decoration:none;z-index:1}.ql-container.ql-bubble:not(.ql-disabled) a:after{border-top:6px solid #444;border-left:6px solid transparent;border-right:6px solid transparent;top:0;content:" ";height:0;width:0}.ql-container.ql-bubble:not(.ql-disabled) a:after,.ql-container.ql-bubble:not(.ql-disabled) a:before{left:0;margin-left:50%;position:absolute;transform:translate(-50%,-100%);transition:visibility 0s ease .2s;visibility:hidden}.ql-container.ql-bubble:not(.ql-disabled) a:hover:after,.ql-container.ql-bubble:not(.ql-disabled) a:hover:before{visibility:visible}
\ No newline at end of file
--- a/dist/static/js/app.57a5bc81.js
+++ b/dist/static/js/app.57a5bc81.js
--- a/dist/static/js/chunk-08486bce.fe975702.js
+++ b/dist/static/js/chunk-08486bce.fe975702.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-08486bce"],{"1e8b":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"用户昵称",prop:"user_nickname"}},[r("el-input",{model:{value:e.user.user_nickname,callback:function(t){e.$set(e.user,"user_nickname",t)},expression:"user.user_nickname"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"手机号码",prop:"mobile"}},[r("el-input",{attrs:{maxlength:"11"},model:{value:e.user.mobile,callback:function(t){e.$set(e.user,"mobile",t)},expression:"user.mobile"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"邮箱",prop:"user_email"}},[r("el-input",{attrs:{maxlength:"50"},model:{value:e.user.user_email,callback:function(t){e.$set(e.user,"user_email",t)},expression:"user.user_email"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"性别"}},[r("el-radio-group",{model:{value:e.user.sex,callback:function(t){e.$set(e.user,"sex",t)},expression:"user.sex"}},[r("el-radio",{attrs:{label:0}},[e._v("保密")]),e._v(" "),r("el-radio",{attrs:{label:1}},[e._v("男")]),e._v(" "),r("el-radio",{attrs:{label:2}},[e._v("女")])],1)],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),r("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=r("c0c7"),o={props:{user:{type:Object}},data:function(){return{rules:{user_nickname:[{required:!0,message:"用户昵称不能为空",trigger:"blur"}],user_email:[{required:!0,message:"邮箱地址不能为空",trigger:"blur"},{type:"email",message:"'请输入正确的邮箱地址",trigger:["blur","change"]}],mobile:[{required:!0,message:"手机号码不能为空",trigger:"blur"},{pattern:/^1[3|4|5|6|7|8|9][0-9]\d{8}$/,message:"请输入正确的手机号码",trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["l"])(e.user).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},n=o,l=r("2877"),u=Object(l["a"])(n,s,a,!1,null,null,null);t["default"]=u.exports},"4c1b":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{staticClass:"app-container"},[r("el-row",{attrs:{gutter:20}},[r("el-col",{attrs:{span:6,xs:24}},[r("el-card",{staticClass:"box-card"},[r("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[r("span",[e._v("个人信息")])]),e._v(" "),r("div",[r("div",{staticClass:"text-center"},[r("userAvatar",{attrs:{user:e.user}})],1),e._v(" "),r("ul",{staticClass:"list-group list-group-striped"},[r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"user"}}),e._v("用户名称\n              "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_name))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"phone"}}),e._v("手机号码\n              "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.mobile))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"email"}}),e._v("用户邮箱\n              "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_email))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"tree"}}),e._v("所属部门\n              "),e.user.dept_info?r("div",{staticClass:"pull-right"},[e._v(e._s(e.user.dept_info.deptName)+" / "+e._s(e.postGroup))]):e._e()],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"peoples"}}),e._v("所属角色\n              "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.roleGroup))])],1),e._v(" "),r("li",{staticClass:"list-group-item"},[r("svg-icon",{attrs:{"icon-class":"date"}}),e._v("创建日期\n              "),r("div",{staticClass:"pull-right"},[e._v(e._s(e.parseTime(e.user.create_time)))])],1)])])])],1),e._v(" "),r("el-col",{attrs:{span:18,xs:24}},[r("el-card",[r("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[r("span",[e._v("基本资料")])]),e._v(" "),r("el-tabs",{model:{value:e.activeTab,callback:function(t){e.activeTab=t},expression:"activeTab"}},[r("el-tab-pane",{attrs:{label:"基本资料",name:"userinfo"}},[r("userInfo",{attrs:{user:e.user}})],1),e._v(" "),r("el-tab-pane",{attrs:{label:"修改密码",name:"resetPwd"}},[r("resetPwd",{attrs:{user:e.user}})],1)],1)],1)],1)],1)],1)},a=[],i=(r("7f7f"),r("9429")),o=r("1e8b"),n=r("ee46"),l=r("c0c7"),u={name:"Profile",components:{userAvatar:i["default"],userInfo:o["default"],resetPwd:n["default"]},data:function(){return{user:{},activeTab:"userinfo"}},created:function(){this.getUser()},computed:{postGroup:function(){return Array.isArray(this.user.posts)?this.user.posts.reduce((function(e,t,r,s){return e+t.post_name+" "}),""):""},roleGroup:function(){return Array.isArray(this.user.roles)?this.user.roles.reduce((function(e,t,r,s){return e+t.name+" "}),""):""}},methods:{getUser:function(){var e=this;Object(l["g"])().then((function(t){e.user=t.data}))}}},c=u,d=r("2877"),p=Object(d["a"])(c,s,a,!1,null,null,null);t["default"]=p.exports},9429:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",[r("img",{staticClass:"img-circle img-lg",attrs:{src:e.options.img,title:"点击上传头像"},on:{click:function(t){return e.editCropper()}}}),e._v(" "),r("el-dialog",{attrs:{title:e.title,visible:e.open,width:"800px","append-to-body":""},on:{"update:visible":function(t){e.open=t}}},[r("el-row",[r("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[r("vue-cropper",{ref:"cropper",attrs:{img:e.options.img,info:!0,autoCrop:e.options.autoCrop,autoCropWidth:e.options.autoCropWidth,autoCropHeight:e.options.autoCropHeight,fixedBox:e.options.fixedBox},on:{realTime:e.realTime}})],1),e._v(" "),r("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[r("div",{staticClass:"avatar-upload-preview"},[r("img",{style:e.previews.img,attrs:{src:e.previews.url}})])])],1),e._v(" "),r("br"),e._v(" "),r("el-row",[r("el-col",{attrs:{lg:2,md:2}},[r("el-upload",{attrs:{action:"#","http-request":e.requestUpload,"show-file-list":!1,"before-upload":e.beforeUpload}},[r("el-button",{attrs:{size:"small"}},[e._v("\n            上传\n            "),r("i",{staticClass:"el-icon-upload el-icon--right"})])],1)],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:2},md:2}},[r("el-button",{attrs:{icon:"el-icon-plus",size:"small"},on:{click:function(t){return e.changeScale(1)}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-minus",size:"small"},on:{click:function(t){return e.changeScale(-1)}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-refresh-left",size:"small"},on:{click:function(t){return e.rotateLeft()}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[r("el-button",{attrs:{icon:"el-icon-refresh-right",size:"small"},on:{click:function(t){return e.rotateRight()}}})],1),e._v(" "),r("el-col",{attrs:{lg:{span:2,offset:6},md:2}},[r("el-button",{attrs:{type:"primary",size:"small"},on:{click:function(t){return e.uploadImg()}}},[e._v("提 交")])],1)],1)],1)],1)},a=[],i=r("ade3"),o=r("4360"),n=r("7e79"),l=r("c0c7"),u={components:{VueCropper:n["VueCropper"]},props:{user:{type:Object}},data:function(){var e;return{open:!1,title:"修改头像",options:(e={img:o["a"].getters.avatar},Object(i["a"])(e,"img",""),Object(i["a"])(e,"autoCrop",!0),Object(i["a"])(e,"autoCropWidth",200),Object(i["a"])(e,"autoCropHeight",200),Object(i["a"])(e,"fixedBox",!0),e),previews:{}}},methods:{editCropper:function(){this.open=!0},requestUpload:function(){},rotateLeft:function(){this.$refs.cropper.rotateLeft()},rotateRight:function(){this.$refs.cropper.rotateRight()},changeScale:function(e){e=e||1,this.$refs.cropper.changeScale(e)},beforeUpload:function(e){var t=this;if(-1==e.type.indexOf("image/"))this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");else{var r=new FileReader;r.readAsDataURL(e),r.onload=function(){t.options.img=r.result}}},uploadImg:function(){var e=this;this.$refs.cropper.getCropBlob((function(t){var r=t.type,s={"image/jpeg":"jpeg","image/png":"png"},a="temp.jpg";s[r]&&(a="temp."+s[r]);var i=new FormData;i.append("avatarfile",t,a),Object(l["n"])(i).then((function(t){0===t.code?(e.open=!1,e.options.img="http://192.168.26.179:6605/api/v1/"+t.data.fileInfo.fileUrl,e.msgSuccess("修改成功")):e.msgError(t.msg),e.$refs.cropper.clearCrop()}))}))},realTime:function(e){this.previews=e},setAvatarBase64:function(e,t){var r=this,s=new Image;s.src=e+"?v="+Math.random(),s.crossOrigin="*",s.onload=function(){var e=r.transBase64FromImage(s);t&&t(e)}},transBase64FromImage:function(e){var t=document.createElement("canvas");t.width=e.width,t.height=e.height;var r=t.getContext("2d");return r.drawImage(e,0,0,e.width,e.height),t.toDataURL("image/png")}},watch:{user:function(e){var t=this;e.avatar&&this.setAvatarBase64("http://192.168.26.179:6605/api/v1/"+e.avatar,(function(e){t.options.img=e}))}}},c=u,d=r("2877"),p=Object(d["a"])(c,s,a,!1,null,null,null);t["default"]=p.exports},c0c7:function(e,t,r){"use strict";r.d(t,"i",(function(){return a})),r.d(t,"f",(function(){return i})),r.d(t,"e",(function(){return o})),r.d(t,"a",(function(){return n})),r.d(t,"k",(function(){return l})),r.d(t,"c",(function(){return u})),r.d(t,"d",(function(){return c})),r.d(t,"j",(function(){return d})),r.d(t,"b",(function(){return p})),r.d(t,"g",(function(){return m})),r.d(t,"l",(function(){return f})),r.d(t,"m",(function(){return v})),r.d(t,"n",(function(){return g})),r.d(t,"h",(function(){return h}));var s=r("b775");r("c38a");function a(e){return Object(s["a"])({url:"/system/auth/userList",method:"get",params:e})}function i(){return Object(s["a"])({url:"/system/auth/addUser",method:"get"})}function o(e){return Object(s["a"])({url:"/system/auth/editUser?id="+e,method:"get"})}function n(e){return Object(s["a"])({url:"/system/auth/addUser",method:"post",data:e})}function l(e){return Object(s["a"])({url:"/system/auth/editUser",method:"post",data:e})}function u(e){return Object(s["a"])({url:"/system/auth/deleteAdmin",method:"delete",params:{ids:e}})}function c(e){return Object(s["a"])({url:"/system/user/export",method:"get",params:e})}function d(e,t){var r={userId:e,password:t};return Object(s["a"])({url:"/system/auth/resetUserPwd",method:"put",data:r})}function p(e,t){var r={userId:e,status:t};return Object(s["a"])({url:"/system/auth/changeUserStatus ",method:"put",data:r})}function m(){return Object(s["a"])({url:"/system/user/profile",method:"get"})}function f(e){return Object(s["a"])({url:"/system/user/edit",method:"post",data:e})}function v(e,t){var r={oldPassword:e,newPassword:t};return Object(s["a"])({url:"/system/user/updatePwd",method:"post",data:r})}function g(e){return Object(s["a"])({url:"/system/user/avatar",method:"post",data:e})}function h(){return Object(s["a"])({url:"/system/user/importTemplate",method:"get"})}},ee46:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"旧密码",prop:"oldPassword"}},[r("el-input",{attrs:{placeholder:"请输入旧密码",type:"password"},model:{value:e.user.oldPassword,callback:function(t){e.$set(e.user,"oldPassword",t)},expression:"user.oldPassword"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"新密码",prop:"newPassword"}},[r("el-input",{attrs:{placeholder:"请输入新密码",type:"password"},model:{value:e.user.newPassword,callback:function(t){e.$set(e.user,"newPassword",t)},expression:"user.newPassword"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"确认密码",prop:"confirmPassword"}},[r("el-input",{attrs:{placeholder:"请确认密码",type:"password"},model:{value:e.user.confirmPassword,callback:function(t){e.$set(e.user,"confirmPassword",t)},expression:"user.confirmPassword"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),r("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=r("c0c7"),o={data:function(){var e=this,t=function(t,r,s){e.user.newPassword!==r?s(new Error("两次输入的密码不一致")):s()};return{test:"1test",user:{oldPassword:void 0,newPassword:void 0,confirmPassword:void 0},rules:{oldPassword:[{required:!0,message:"旧密码不能为空",trigger:"blur"}],newPassword:[{required:!0,message:"新密码不能为空",trigger:"blur"},{min:6,max:20,message:"长度在 6 到 20 个字符",trigger:"blur"}],confirmPassword:[{required:!0,message:"确认密码不能为空",trigger:"blur"},{required:!0,validator:t,trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["m"])(e.user.oldPassword,e.user.newPassword).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},n=o,l=r("2877"),u=Object(l["a"])(n,s,a,!1,null,null,null);t["default"]=u.exports}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-0a90d205.ed4c9710.js
+++ b/dist/static/js/chunk-0a90d205.ed4c9710.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0a90d205"],{"514f":function(t,e,n){},cc6c:function(t,e,n){t.exports=n.p+"static/img/401.089007e7.gif"},ec55:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"errPage-container"},[n("el-button",{staticClass:"pan-back-btn",attrs:{icon:"arrow-left"},on:{click:t.back}},[t._v("\n    返回\n  ")]),t._v(" "),n("el-row",[n("el-col",{attrs:{span:12}},[n("h1",{staticClass:"text-jumbo text-ginormous"},[t._v("\n        401错误!\n      ")]),t._v(" "),n("h2",[t._v("您没有访问权限！")]),t._v(" "),n("h6",[t._v("对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面")]),t._v(" "),n("ul",{staticClass:"list-unstyled"},[n("li",{staticClass:"link-type"},[n("router-link",{attrs:{to:"/"}},[t._v("\n            回首页\n          ")])],1)])]),t._v(" "),n("el-col",{attrs:{span:12}},[n("img",{attrs:{src:t.errGif,width:"313",height:"428",alt:"Girl has dropped her ice cream."}})])],1)],1)},s=[],c=n("cc6c"),r=n.n(c),i={name:"Page401",data:function(){return{errGif:r.a+"?"+ +new Date}},methods:{back:function(){this.$route.query.noGoBack?this.$router.push({path:"/"}):this.$router.go(-1)}}},o=i,l=(n("ecf6"),n("2877")),u=Object(l["a"])(o,a,s,!1,null,"f2e02586",null);e["default"]=u.exports},ecf6:function(t,e,n){"use strict";n("514f")}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-0b4a9e9a.d0af0990.js
+++ b/dist/static/js/chunk-0b4a9e9a.d0af0990.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0b4a9e9a"],{"4b72":function(e,t,l){"use strict";l.d(t,"e",(function(){return o})),l.d(t,"d",(function(){return a})),l.d(t,"b",(function(){return r})),l.d(t,"g",(function(){return s})),l.d(t,"c",(function(){return i})),l.d(t,"f",(function(){return c})),l.d(t,"a",(function(){return u}));var n=l("b775");function o(e){return Object(n["a"])({url:"/system/tools/gen/tableList",method:"get",params:e})}function a(e){return Object(n["a"])({url:"/system/tools/gen/dataList",method:"get",params:e})}function r(e){return Object(n["a"])({url:"/system/tools/gen/columnList?tableId="+e,method:"get"})}function s(e){return Object(n["a"])({url:"/system/tools/gen/editSave",method:"put",data:e})}function i(e){return Object(n["a"])({url:"/system/tools/gen/importTableSave",method:"post",params:e})}function c(e){return Object(n["a"])({url:"/system/tools/gen/preview?tableId="+e,method:"get"})}function u(e){return Object(n["a"])({url:"/system/tools/gen/delete",method:"delete",data:{ids:e}})}},"6a66":function(e,t,l){"use strict";l.r(t);var n=function(){var e=this,t=e.$createElement,l=e._self._c||t;return l("el-form",{ref:"genInfoForm",attrs:{model:e.info,rules:e.rules,"label-width":"150px"}},[l("el-row",[l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{prop:"tpl_category"}},[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("生成模板")]),e._v(" "),l("el-select",{model:{value:e.info.tpl_category,callback:function(t){e.$set(e.info,"tpl_category",t)},expression:"info.tpl_category"}},[l("el-option",{attrs:{label:"单表（增删改查）",value:"crud"}}),e._v(" "),l("el-option",{attrs:{label:"树表（增删改查）",value:"tree"}})],1)],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{prop:"package_name"}},[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n          生成包路径\n          "),l("el-tooltip",{attrs:{content:"生成在哪个java包下，例如 com.ruoyi.system",placement:"top"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-input",{model:{value:e.info.package_name,callback:function(t){e.$set(e.info,"package_name",t)},expression:"info.package_name"}})],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{prop:"module_name"}},[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n          生成模块名\n          "),l("el-tooltip",{attrs:{content:"可理解为子系统名，例如 system",placement:"top"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-input",{model:{value:e.info.module_name,callback:function(t){e.$set(e.info,"module_name",t)},expression:"info.module_name"}})],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{prop:"business_name"}},[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n          生成业务名\n          "),l("el-tooltip",{attrs:{content:"可理解为功能英文名，例如 user",placement:"top"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-input",{model:{value:e.info.business_name,callback:function(t){e.$set(e.info,"business_name",t)},expression:"info.business_name"}})],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{prop:"function_name"}},[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n          生成功能名\n          "),l("el-tooltip",{attrs:{content:"用作类描述，例如 用户",placement:"top"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-input",{model:{value:e.info.function_name,callback:function(t){e.$set(e.info,"function_name",t)},expression:"info.function_name"}})],1)],1)],1),e._v(" "),l("el-row",{directives:[{name:"show",rawName:"v-show",value:"tree"==e.info.tpl_category,expression:"info.tpl_category == 'tree'"}]},[l("h4",{staticClass:"form-header"},[e._v("其他信息")]),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n          树编码字段\n          "),l("el-tooltip",{attrs:{content:"树显示的编码字段名， 如：dept_id",placement:"top"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-select",{attrs:{placeholder:"请选择"},model:{value:e.info.tree_code,callback:function(t){e.$set(e.info,"tree_code",t)},expression:"info.tree_code"}},e._l(e.info.columns,(function(e){return l("el-option",{key:e.column_name,attrs:{label:e.column_name+"："+e.column_comment,value:e.column_name}})})),1)],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n          树父编码字段\n          "),l("el-tooltip",{attrs:{content:"树显示的父编码字段名， 如：parent_Id",placement:"top"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-select",{attrs:{placeholder:"请选择"},model:{value:e.info.tree_parent_code,callback:function(t){e.$set(e.info,"tree_parent_code",t)},expression:"info.tree_parent_code"}},e._l(e.info.columns,(function(e){return l("el-option",{key:e.column_name,attrs:{label:e.column_name+"："+e.column_comment,value:e.column_name}})})),1)],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n          树名称字段\n          "),l("el-tooltip",{attrs:{content:"树节点的显示名称字段名， 如：dept_name",placement:"top"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-select",{attrs:{placeholder:"请选择"},model:{value:e.info.tree_name,callback:function(t){e.$set(e.info,"tree_name",t)},expression:"info.tree_name"}},e._l(e.info.columns,(function(e){return l("el-option",{key:e.column_name,attrs:{label:e.column_name+"："+e.column_comment,value:e.column_name}})})),1)],1)],1)],1)],1)},o=[],a={name:"BasicInfoForm",props:{info:{type:Object,default:null}},data:function(){return{rules:{tpl_category:[{required:!0,message:"请选择生成模板",trigger:"blur"}],package_name:[{required:!0,message:"请输入生成包路径",trigger:"blur"}],module_name:[{required:!0,message:"请输入生成模块名",trigger:"blur"}],business_name:[{required:!0,message:"请输入生成业务名",trigger:"blur"}],function_name:[{required:!0,message:"请输入生成功能名",trigger:"blur"}]}}},beforeCreate:function(){}},r=a,s=l("2877"),i=Object(s["a"])(r,n,o,!1,null,null,null);t["default"]=i.exports},"6ff4":function(e,t,l){"use strict";l.r(t);var n=function(){var e=this,t=e.$createElement,l=e._self._c||t;return l("el-form",{ref:"basicInfoForm",attrs:{model:e.info,rules:e.rules,"label-width":"150px"}},[l("el-row",[l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{label:"表名称",prop:"table_name"}},[l("el-input",{attrs:{placeholder:"请输入仓库名称"},model:{value:e.info.table_name,callback:function(t){e.$set(e.info,"table_name",t)},expression:"info.table_name"}})],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{label:"表描述",prop:"table_comment"}},[l("el-input",{attrs:{placeholder:"请输入"},model:{value:e.info.table_comment,callback:function(t){e.$set(e.info,"table_comment",t)},expression:"info.table_comment"}})],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{label:"实体类名称",prop:"class_name"}},[l("el-input",{attrs:{placeholder:"请输入"},model:{value:e.info.class_name,callback:function(t){e.$set(e.info,"class_name",t)},expression:"info.class_name"}})],1)],1),e._v(" "),l("el-col",{attrs:{span:12}},[l("el-form-item",{attrs:{label:"作者",prop:"function_author"}},[l("el-input",{attrs:{placeholder:"请输入"},model:{value:e.info.function_author,callback:function(t){e.$set(e.info,"function_author",t)},expression:"info.function_author"}})],1)],1),e._v(" "),l("el-col",{attrs:{span:24}},[l("el-form-item",{attrs:{label:"备注",prop:"remark"}},[l("el-input",{attrs:{type:"textarea",rows:3},model:{value:e.info.remark,callback:function(t){e.$set(e.info,"remark",t)},expression:"info.remark"}})],1)],1)],1)],1)},o=[],a={name:"BasicInfoForm",props:{info:{type:Object,default:null}},data:function(){return{rules:{tableName:[{required:!0,message:"请输入表名称",trigger:"blur"}],tableComment:[{required:!0,message:"请输入表描述",trigger:"blur"}],className:[{required:!0,message:"请输入实体类名称",trigger:"blur"}],functionAuthor:[{required:!0,message:"请输入作者",trigger:"blur"}]}}}},r=a,s=l("2877"),i=Object(s["a"])(r,n,o,!1,null,null,null);t["default"]=i.exports},c6bd:function(e,t,l){"use strict";l.r(t);var n=function(){var e=this,t=e.$createElement,l=e._self._c||t;return l("el-card",[l("el-tabs",{model:{value:e.activeName,callback:function(t){e.activeName=t},expression:"activeName"}},[l("el-tab-pane",{attrs:{label:"基本信息",name:"basic"}},[l("basic-info-form",{ref:"basicInfo",attrs:{info:e.info}})],1),e._v(" "),l("el-tab-pane",{attrs:{label:"字段信息",name:"cloum"}},[l("el-table",{ref:"dragTable",attrs:{data:e.cloumns,"row-key":"columnId","max-height":e.tableHeight}},[l("el-table-column",{attrs:{label:"序号",type:"index","min-width":"5%","class-name":"allowDrag"}}),e._v(" "),l("el-table-column",{attrs:{label:"字段列名",prop:"column_name","min-width":"10%","show-overflow-tooltip":!0}}),e._v(" "),l("el-table-column",{attrs:{label:"字段描述","min-width":"10%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-input",{model:{value:t.row.column_comment,callback:function(l){e.$set(t.row,"column_comment",l)},expression:"scope.row.column_comment"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"物理类型",prop:"column_type","min-width":"10%","show-overflow-tooltip":!0}}),e._v(" "),l("el-table-column",{attrs:{label:"go类型","min-width":"11%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-select",{model:{value:t.row.go_type,callback:function(l){e.$set(t.row,"go_type",l)},expression:"scope.row.go_type"}},[l("el-option",{attrs:{label:"int",value:"int"}}),e._v(" "),l("el-option",{attrs:{label:"uint",value:"uint"}}),e._v(" "),l("el-option",{attrs:{label:"int64",value:"int64"}}),e._v(" "),l("el-option",{attrs:{label:"uint64",value:"uint64"}}),e._v(" "),l("el-option",{attrs:{label:"float64",value:"float64"}}),e._v(" "),l("el-option",{attrs:{label:"string",value:"string"}}),e._v(" "),l("el-option",{attrs:{label:"Time",value:"Time"}}),e._v(" "),l("el-option",{attrs:{label:"byte",value:"byte"}})],1)]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"go属性","min-width":"10%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-input",{model:{value:t.row.go_field,callback:function(l){e.$set(t.row,"go_field",l)},expression:"scope.row.go_field"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"插入","min-width":"5%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.is_insert,callback:function(l){e.$set(t.row,"is_insert",l)},expression:"scope.row.is_insert"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"编辑","min-width":"5%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.is_edit,callback:function(l){e.$set(t.row,"is_edit",l)},expression:"scope.row.is_edit"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"列表","min-width":"5%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.is_list,callback:function(l){e.$set(t.row,"is_list",l)},expression:"scope.row.is_list"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"查询","min-width":"5%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.is_query,callback:function(l){e.$set(t.row,"is_query",l)},expression:"scope.row.is_query"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"查询方式","min-width":"10%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-select",{model:{value:t.row.query_type,callback:function(l){e.$set(t.row,"query_type",l)},expression:"scope.row.query_type"}},[l("el-option",{attrs:{label:"=",value:"EQ"}}),e._v(" "),l("el-option",{attrs:{label:"!=",value:"NE"}}),e._v(" "),l("el-option",{attrs:{label:">",value:"GT"}}),e._v(" "),l("el-option",{attrs:{label:">=",value:"GTE"}}),e._v(" "),l("el-option",{attrs:{label:"<",value:"LT"}}),e._v(" "),l("el-option",{attrs:{label:"<=",value:"LTE"}}),e._v(" "),l("el-option",{attrs:{label:"LIKE",value:"LIKE"}}),e._v(" "),l("el-option",{attrs:{label:"BETWEEN",value:"BETWEEN"}})],1)]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"必填","min-width":"5%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.is_required,callback:function(l){e.$set(t.row,"is_required",l)},expression:"scope.row.is_required"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"显示类型","min-width":"12%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-select",{model:{value:t.row.html_type,callback:function(l){e.$set(t.row,"html_type",l)},expression:"scope.row.html_type"}},[l("el-option",{attrs:{label:"文本框",value:"input"}}),e._v(" "),l("el-option",{attrs:{label:"文本域",value:"textarea"}}),e._v(" "),l("el-option",{attrs:{label:"下拉框",value:"select"}}),e._v(" "),l("el-option",{attrs:{label:"单选框",value:"radio"}}),e._v(" "),l("el-option",{attrs:{label:"复选框",value:"checkbox"}}),e._v(" "),l("el-option",{attrs:{label:"日期控件",value:"datetime"}})],1)]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"字典类型","min-width":"12%"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-select",{attrs:{clearable:"",filterable:"",placeholder:"请选择"},model:{value:t.row.dict_type,callback:function(l){e.$set(t.row,"dict_type",l)},expression:"scope.row.dict_type"}},e._l(e.dictOptions,(function(t){return l("el-option",{key:t.dict_type,attrs:{label:t.dict_name,value:t.dict_type}},[l("span",{staticStyle:{float:"left"}},[e._v(e._s(t.dict_name))]),e._v(" "),l("span",{staticStyle:{float:"right",color:"#8492a6","font-size":"13px"}},[e._v(e._s(t.dict_type))])])})),1)]}}])})],1)],1),e._v(" "),l("el-tab-pane",{attrs:{label:"生成信息",name:"genInfo"}},[l("gen-info-form",{ref:"genInfo",attrs:{info:e.info}})],1)],1),e._v(" "),l("el-form",{attrs:{"label-width":"100px"}},[l("el-form-item",{staticStyle:{"text-align":"center","margin-left":"-100px","margin-top":"10px"}},[l("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.submitForm()}}},[e._v("提交")]),e._v(" "),l("el-button",{on:{click:function(t){return e.close()}}},[e._v("返回")])],1)],1)],1)},o=[],a=(l("ac6a"),l("5df3"),l("4b72")),r=l("ed45"),s=l("6ff4"),i=l("6a66"),c=l("53fe"),u=l.n(c),m={name:"GenEdit",components:{basicInfoForm:s["default"],genInfoForm:i["default"]},data:function(){return{activeName:"cloum",tableHeight:document.documentElement.scrollHeight-245+"px",cloumns:[],dictOptions:[],info:{}}},beforeCreate:function(){var e=this,t=this.$route.query.tableId;t&&(Object(a["b"])(t).then((function(t){e.cloumns=t.data.rows,e.info=t.data.info,e.info.columns=e.cloumns})),Object(r["f"])().then((function(t){e.dictOptions=t.data})))},methods:{submitForm:function(){var e=this,t=this.$refs.basicInfo.$refs.basicInfoForm,l=this.$refs.genInfo.$refs.genInfoForm;Promise.all([t,l].map(this.getFormPromise)).then((function(n){var o=n.every((function(e){return!!e}));if(o){var r=Object.assign({},t.model,l.model);r.columns=e.cloumns,r.params={treeCode:r.treeCode,treeName:r.treeName,treeParentCode:r.treeParentCode},Object(a["g"])(r).then((function(t){e.msgSuccess(t.msg),0===t.code&&e.close()}))}else e.msgError("表单校验未通过，请重新检查提交内容")}))},setInfoColumn:function(e){this.info.column=e},getFormPromise:function(e){return new Promise((function(t){e.validate((function(e){t(e)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/system/tools/gen",query:{t:Date.now()}})}},mounted:function(){var e=this,t=this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];u.a.create(t,{handle:".allowDrag",onEnd:function(t){var l=e.cloumns.splice(t.oldIndex,1)[0];for(var n in e.cloumns.splice(t.newIndex,0,l),e.cloumns)e.cloumns[n].sort=parseInt(n)+1}})}},f=m,p=l("2877"),d=Object(p["a"])(f,n,o,!1,null,null,null);t["default"]=d.exports},ed45:function(e,t,l){"use strict";l.d(t,"e",(function(){return o})),l.d(t,"d",(function(){return a})),l.d(t,"a",(function(){return r})),l.d(t,"g",(function(){return s})),l.d(t,"f",(function(){return i})),l.d(t,"b",(function(){return c})),l.d(t,"c",(function(){return u}));var n=l("b775");function o(e){return Object(n["a"])({url:"/system/config/dict/list",method:"get",params:e})}function a(e){return Object(n["a"])({url:"/system/config/dict/edit?dictId="+e,method:"get"})}function r(e){return Object(n["a"])({url:"/system/config/dict/add",method:"post",data:e})}function s(e){return Object(n["a"])({url:"/system/config/dict/edit",method:"post",data:e})}function i(){return Object(n["a"])({url:"/system/config/dict/optionSelect",method:"get"})}function c(e){return Object(n["a"])({url:"/system/config/dict/delete",method:"delete",data:{dictIds:e}})}function u(e){return Object(n["a"])({url:"/system/dict/type/export",method:"get",params:e})}}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-0e0bdc00.ca5e05af.js
+++ b/dist/static/js/chunk-0e0bdc00.ca5e05af.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0e0bdc00"],{"037c":function(t,s){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAPCAYAAAA/I0V3AAAC/0lEQVQ4TzWLW0hUeQCHf/85c2bGc+Y+41yyMi+zaZTd1Mkgsi26WCJRLtFLFFRQUbG7sHSlkh6Eegsi7aJrtCAOPXSBMossKWNKXGOz26hTGjOTx7k7c+ac84+N+p6+h+8j+AGlnUwsWFQYS0qVgeFXG0JCtKR8ceVTG6t/UFDsGCIGT+RnS/4XSimJC6PezpYrh7Pv+1a4xJCZyzdqc0WlydGIJeSt9N7y/jqvmRiWfB8JpZRJR8Yqum5cP9HbfaeuMRfQFkcy0Ds4iDMs6HH9gsGQLbJvz6azc8udHcS0XCDZbLysq/XS+Yt/P1/T5B3VVPSO4Ou4ChlKwStx8FsqcMFaRT8H6MTZM9vOFZTXtpLJib7dv5/sbvrv1ajz9qJeqLqCCNkdUDgWCIRQWKrFw20NONCRp7Q019yrq288TmJ9fz052q6qGfqQZXy1PUh2vIdQPQfG5W4wj8fhZNN4VLUaB9usuHpaNbVyQ0MbSfq2Tl4eKLE2+yzw7exG0ccAJjJ6aIutcJIctG4tjj2bh57XVtw68VGZ5SrpJ7GOdalhjYerP+XBrkw7Ti0eQRhG5Ex6zOazGHmTw9pntajZUYqL9X4qSvYREvNtSTCzzfqDvmrcO3cXpzU9cFm04NwGcFDj5hCLa/b1aLugwSrbZyXFlL0kwfbN01ZDRhfkF+JQqw3+px+wUBfFfGMSd4N2CDo39m5ncGTjIHJpkcJV9ZZ8uv/Hp+l3L11GZNRKiQfvYINaTCIfUfybKIBM1VgqvgWfm6DKzKKUeUHDY5KN+o+EB1r2p4YGC0y8DvnVM0FFGbJIwebnQZ6axuTrMNJ5Bsm8oO6+1dPYRKTE8G/xsbbm9JfBOTRJoDPkAWoNoFDI0SkokgQYNaC8SeHdm7pMM1b9SaTUwMZM1H8oFXyxlCaiPJFljSKDgFLIWQmEU0usxZRmnR5BZ6/8R8d6LhEq+E3TDMrEsFCbGOtfpsqOFxMxbWJYwsDoiLPWwrDaOH9Aa3c8kajQz3Hmr98ADYdOjKeqoB8AAAAASUVORK5CYII="},"45d0":function(t,s,a){},"899d":function(t,s,a){"use strict";a("45d0")},aad8:function(t,s,a){"use strict";a.r(s);var e=function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"content"},[e("div",{ref:"searchBar",staticClass:"yc-content"},[e("header",{class:{"head-scroll":t.isScroll}},[e("div",{staticClass:"header-con pc-hide"},[e("ul",{staticClass:"nav"},[t.settitle&&t.settitle.topLogo?e("li",[e("img",{staticStyle:{width:"114px",height:"35px"},attrs:{src:t.settitle.topLogo,alt:""}})]):t._e(),t._v(" "),t._m(0),t._v(" "),t.navigationObj.open?e("li",[e("a",{attrs:{href:"//"+t.navigationObj.open,target:"_blank"}},[t._v("开放平台")])]):t._e(),t._v(" "),t.navigationObj.shop?e("li",[e("a",{attrs:{href:"//"+t.navigationObj.shop}},[t._v("云仓")])]):t._e(),t._v(" "),e("li",[e("a",{attrs:{href:"//"+t.navigationObj.aboutUs+"/user",target:"_blank"}},[t._v("关于我们")])])]),t._v(" "),e("div",{staticClass:"register-login-btn"},[e("div",{staticClass:"register-btn",on:{click:t.toRegister}},[t._v("注 册")]),t._v(" "),e("div",{staticClass:"login-btn",on:{click:t.toLogin}},[t._v("登 录")])])])]),t._v(" "),e("section",{staticClass:"banner"},[t.bannerList&&t.bannerList.length>0?e("swiper",{attrs:{options:t.swiperOption}},t._l(t.bannerList,(function(t,s){return e("swiper-slide",{key:s},[e("a",{attrs:{href:"//"+t.redirect_url,target:"_blank"}},[e("img",{staticStyle:{width:"100%",height:"562px"},attrs:{src:t.image_url,alt:""}})])])})),1):t._e()],1),t._v(" "),e("section",{staticStyle:{"margin-bottom":"100px"}},[e("div",{staticClass:"advantage",class:{mgB100:t.isAdHover}},[e("p",{staticClass:"advantage-title"},[t._v("核心优势")]),t._v(" "),e("div",{staticClass:"advantage-con",class:{mgT20:t.isAdHover}},t._l(t.cloud_advantage_lst,(function(s,a){return e("div",{key:a,staticClass:"pre-advantage",style:{zIndex:t.cloud_advantage_lst.length-a},on:{mouseover:function(s){return t.adHover(a+1)},mouseleave:function(s){return t.adLeave(a+1)}}},[e("dl",{staticClass:"dl-con",class:{noDlCon:t.indexAddom===a+1}},[e("dt",{class:"dl-con-ad"+(a+1)}),t._v(" "),e("dd",[t._v(t._s(s.title))])]),t._v(" "),e("div",{staticClass:"pre-advantage-details",class:{"up-ad-details":t.indexAddom===a+1}},[e("p",{staticClass:"ad-details-title"},[t._v(t._s(s.title))]),t._v(" "),e("p",{staticClass:"ad-details"},[t._v(t._s(s.content_summary))])])])})),0)])]),t._v(" "),t._m(1),t._v(" "),e("section",{staticClass:"brand"},[e("p",{staticClass:"brands-title"},[t._v("这些品牌都已入驻")]),t._v(" "),e("p",{staticClass:"brands-tip"},[t._v("我们已与各行业领域的优秀品牌达成合作")]),t._v(" "),e("div",[e("p",{staticClass:"brand-type"},[e("span",{staticClass:"clothes",class:{"light-word":0===t.isLight},on:{click:function(s){return t.brandTypeChange(0)}}},[t._v(t._s(t.detail_img1.type))]),t._v(" "),e("span",{staticClass:"electrical",class:{"light-word":1===t.isLight},on:{click:function(s){return t.brandTypeChange(1)}}},[t._v(t._s(t.detail_img2.type))]),t._v(" "),e("span",{staticClass:"food",class:{"light-word":2===t.isLight},on:{click:function(s){return t.brandTypeChange(2)}}},[t._v(t._s(t.detail_img3.type))]),t._v(" "),e("span",{staticClass:"maternal",class:{"light-word":3===t.isLight},on:{click:function(s){return t.brandTypeChange(3)}}},[t._v(t._s(t.detail_img4.type))])]),t._v(" "),e("div",{staticClass:"brand-carousel"},[e("el-carousel",{ref:"cardShow",staticClass:"card-show",attrs:{autoplay:!1,arrow:"never","indicator-position":"none",type:"card",height:"400px"},on:{change:function(s){return t.brandCarChange()}}},[e("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"1"}},t._l(t.detail_img1.logo_urls,(function(t,s){return e("div",{key:s,staticClass:"pre-img-con"},[e("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0),t._v(" "),e("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"2"}},t._l(t.detail_img2.logo_urls,(function(t,s){return e("div",{key:s,staticClass:"pre-img-con"},[e("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0),t._v(" "),e("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"3"}},t._l(t.detail_img3.logo_urls,(function(t,s){return e("div",{key:s,staticClass:"pre-img-con"},[e("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0),t._v(" "),e("el-carousel-item",{staticClass:"pre-el-carousel-item el-carousel-item-spe",attrs:{name:"4"}},t._l(t.detail_img4.logo_urls,(function(t,s){return e("div",{key:s,staticClass:"pre-img-con"},[e("img",{staticClass:"pre-img",attrs:{src:t.url,alt:""}})])})),0)],1)],1)])]),t._v(" "),e("footer",[e("div",{staticClass:"contact"},[t._m(2),t._v(" "),e("p",[t._v(t._s(t.settitle.contactTel))])]),t._v(" "),e("div",{staticClass:"about-con"},[e("div",{staticClass:"about-list"},[e("ul",t._l(t.footerList,(function(s,a){return e("li",{key:a,on:{click:function(a){return t.goToUser(s.id)}}},[t._v(t._s(s.title))])})),0),t._v(" "),e("p",{staticClass:"about-gs"},[t._v("\n              "+t._s(t.settitle.bottomCopyright)+"  "),e("img",{staticClass:"icon-image",staticStyle:{"margin-right":"4px"},attrs:{src:a("037c")}}),t._v(t._s(t.settitle.recordNum)+"\n            ")])]),t._v(" "),e("div",{staticClass:"about-us"},[e("p",{staticClass:"us-title"},[t._v("联系我们")]),t._v(" "),e("p",[t._v("联系电话："+t._s(t.settitle.contactTel))]),t._v(" "),e("p",[t._v("公司地址:"+t._s(t.settitle.companyAddress))])])])])])])},i=[function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("li",[a("a",{attrs:{href:"/"}},[t._v("首页")])])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("section",{staticStyle:{"padding-bottom":"90px","background-color":"#f9f9fa"}},[a("p",{staticClass:"process-title"},[t._v("入驻流程和材料")]),t._v(" "),a("div",{staticClass:"process-con"},[a("div",{staticClass:"process-steps"},[a("div",{staticClass:"pro-step"},[a("dl",[a("dt",{staticClass:"step-one"}),t._v(" "),a("dd",[t._v("第一步：注册账号")])]),t._v(" "),a("span",[t._v("无需等待")]),t._v(" "),a("p",[t._v("进入云仓官网，注册账号")]),t._v(" "),a("p",[t._v("注册完成后，填写相关信息")])]),t._v(" "),a("div",{staticClass:"pro-step"},[a("dl",[a("dt",{staticClass:"step-two"}),t._v(" "),a("dd",[t._v("第二步：填写信息")])]),t._v(" "),a("span",[t._v("约20分钟")]),t._v(" "),a("p",[t._v("确认在线协议填写公司主体信息")]),t._v(" "),a("p",[t._v("填写店铺信息提交相关资质")])]),t._v(" "),a("div",{staticClass:"pro-step"},[a("dl",[a("dt",{staticClass:"step-three"}),t._v(" "),a("dd",[t._v("第三步：等待审核")])]),t._v(" "),a("span",[t._v("约1-3个工作日")]),t._v(" "),a("p",[t._v("云仓工作人员会在1-3个工作日内")]),t._v(" "),a("p",[t._v("反馈审核结果，商家可通过登录查询审核进度")])]),t._v(" "),a("div",{staticClass:"pro-step"},[a("dl",[a("dt",{staticClass:"step-four"}),t._v(" "),a("dd",[t._v("第四步：发布商品")])]),t._v(" "),a("span",[t._v("无需等待")]),t._v(" "),a("p",[t._v("审核通过，商家登录后台")]),t._v(" "),a("p",[t._v("商家发布商品并上架")])])]),t._v(" "),a("div",{staticClass:"process-mater"},[a("div",{staticClass:"pro-ma"},[a("p",{staticClass:"set-in-ma m-bg"},[t._v("入驻必备材料")]),t._v(" "),a("div",{staticClass:"optional"},[a("ul",[a("li",[t._v("营业执照电子版")]),t._v(" "),a("li",[t._v("法人证件电子版")])])])]),t._v(" "),a("div",{staticClass:"pro-ma"},[a("p",{staticClass:"set-in-ma n-m-bg"},[t._v("入驻选填材料")]),t._v(" "),a("div",{staticClass:"optional"},[a("ul",[a("li",[t._v("品牌LOGO")]),t._v(" "),a("li",[t._v("其它行业资质")])]),t._v(" "),a("ul",[a("li",[t._v("品牌授权（代理品需提供）")]),t._v(" "),a("li",[t._v("店铺LOGO")])])])])])])])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("p",[t._v("如果你想要更多的"),a("span",[t._v("了解")]),t._v("，请联系我们")])}],l=(a("6762"),a("2fdb"),a("4360")),n=a("5302"),o=a("6d3b"),r=a("d17a");o["a"].use([r["a"]]),function(){var t=document.documentElement.clientWidth;if(t<961){var s=document.querySelector("html");t/375<1.5?s.style.fontSize="16px":1.5<=t/375<2?s.style.fontSize="24px":2<=t/375<=2.56&&(s.style.fontSize="32px"),console.log("根html字体大小：",s.style.fontSize)}}();var c={name:"newyuncang",metaInfo:function(){return{title:this.keyTitle,meta:[{name:"keywords",content:this.keyWords},{name:"description",content:this.keyDescriptions}]}},data:function(){return{ssourl:"",keyTitle:"",keyWords:"",keyDescriptions:"",bannerList:[],cloud_advantage_lst:[],settitle:{bottomCopyright:"",businessHours:1,companyAddress:"",contactTel:"",custServiceQrcode:"",hotlineTel1:"",hotlineTel2:"",onlineTimeEnd:"18:00",onlineTimeStart:"09:00",recordNum:"",topLogo:""},channel_id:0,isScroll:!1,isAdHover:!1,isHasBorder:!1,indexAddom:!1,isLight:0,navigationObj:{home:"",open:"",shop:"",aboutUs:""},gwToken:"",swiperOption:{loop:!0,pagination:{el:".swiper-pagination",clickable:!0,bulletActiveClass:"my-bullet"},autoplay:{delay:4e3,disableOnInteraction:!1},initialSlide:0,direction:"horizontal",slidesPerView:1},detail_img1:{index:1,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},detail_img2:{index:2,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},detail_img3:{index:3,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},detail_img4:{index:4,type:"",logo_urls:[{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""},{url:""}]},footerList:[{id:1,title:"企业简介"},{id:2,title:"发展历程"},{id:3,title:"荣誉资质"},{id:4,title:"团队介绍"},{id:5,title:"新闻动态"}]}},created:function(){this.IsPc();this.getssourl()},mounted:function(){this.getIndexInfo(),window.addEventListener("scroll",this.handleScroll,!0)},destroyed:function(){window.removeEventListener("scroll",this.handleScroll)},methods:{getssourl:function(){var t=this,s=window.location.host,a={domain:s};this.$store.dispatch("getssourl",a).then((function(s){1==s.code&&(t.ssourl=s.data.sso_url)})).catch((function(){}))},IsPc:function(){var t=navigator.userAgent,s=["Android","iPhone","SymbianOS","Windows Phone","iPad","iPod"];return console.log("userAgent:",t),s.some((function(s){return t.includes(s)}))},getIndexInfo:function(){var t=this,s=window.location.host,a={domain:s};Object(n["e"])(a).then((function(s){1==s.code&&(t.channel_id=s.data.channel_id,t.keyTitle=s.data.title,t.keyWords=s.data.keywords,t.keyDescriptions=s.data.describe,t.getWebSite(),t.getDomain(),t.getAllcloud())}))},getWebSite:function(){var t=this,s={channel_ids:this.channel_id};Object(n["f"])(s).then((function(s){1==s.code&&s.data.universal_lst&&"null"!=s.data.universal_lst&&(t.settitle=s.data.universal_lst)}))},getDomain:function(){var t=this,s={channel_ids:this.channel_id};Object(n["c"])(s).then((function(s){1==s.code&&s.data&&(t.navigationObj.home="",t.navigationObj.open=s.data.Open.domain,t.navigationObj.shop=s.data.Cloud.domain,t.navigationObj.aboutUs=s.data.Official.domain)}))},getAllcloud:function(){var t=this,s={new_channel_id:this.channel_id};Object(n["b"])(s).then((function(s){1==s.code&&s.data&&(s.data.cloud_advantage_lst&&s.data.cloud_advantage_lst.length>0&&(t.cloud_advantage_lst=s.data.cloud_advantage_lst),s.data.cloud_banner_lst&&s.data.cloud_banner_lst.banners_json&&s.data.cloud_banner_lst.banners_json.length>0&&(t.bannerList=s.data.cloud_banner_lst.banners_json),s.data.cloud_supplier_lst&&s.data.cloud_supplier_lst.detail_json&&(t.detail_img1=s.data.cloud_supplier_lst.detail_json[0],t.detail_img2=s.data.cloud_supplier_lst.detail_json[1],t.detail_img3=s.data.cloud_supplier_lst.detail_json[2],t.detail_img4=s.data.cloud_supplier_lst.detail_json[3]))}))},handleScroll:function(){var t=window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop;this.isScroll=t>100},brandTypeChange:function(t){this.$refs.cardShow.setActiveItem(t),this.isLight=t},brandCarChange:function(){this.isLight=this.$refs.cardShow.activeIndex},adHover:function(t){this.isAdHover=!0,this.indexAddom=t},adLeave:function(t){this.isAdHover=!1,this.indexAddom=-1},goToUser:function(t){var s="";this.navigationObj.aboutUs&&(s=this.navigationObj.aboutUs+"/user?id="+t,window.location.href="//"+s)},toRegister:function(){var t=this;l["a"].dispatch("LogOut").then((function(){var s=window.location.host,a=document.location.protocol;window.location.href=a+"//"+t.ssourl+"/login?redirect="+a+"//"+s+"/platformlogin"}))},toLogin:function(){var t=window.location.host,s=document.location.protocol;window.location.href=s+"//"+this.ssourl+"/login?redirect="+s+"//"+t+"/platformlogin"}}},d=c,u=(a("899d"),a("2877")),_=Object(u["a"])(d,e,i,!1,null,"279c0830",null);s["default"]=_.exports}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-2d0c7ece.45001674.js
+++ b/dist/static/js/chunk-2d0c7ece.45001674.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0c7ece"],{5360:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"app-container"},[a("el-form",{ref:"queryForm",attrs:{model:t.queryParams,inline:!0}},[a("el-form-item",{attrs:{label:"字典类型",prop:"dictType"}},[a("el-input",{attrs:{placeholder:"请输入字典类型",clearable:"",size:"small"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.handleQuery(e)}},model:{value:t.queryParams.dictType,callback:function(e){t.$set(t.queryParams,"dictType",e)},expression:"queryParams.dictType"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"字典标签",prop:"dictLabel"}},[a("el-input",{attrs:{placeholder:"请输入字典标签",clearable:"",size:"small"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.handleQuery(e)}},model:{value:t.queryParams.dictLabel,callback:function(e){t.$set(t.queryParams,"dictLabel",e)},expression:"queryParams.dictLabel"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"状态",prop:"status"}},[a("el-select",{attrs:{placeholder:"数据状态",clearable:"",size:"small"},model:{value:t.queryParams.status,callback:function(e){t.$set(t.queryParams,"status",e)},expression:"queryParams.status"}},t._l(t.statusOptions.values,(function(t){return a("el-option",{key:t.key,attrs:{label:t.value,value:t.key}})})),1)],1),t._v(" "),a("el-form-item",[a("el-button",{attrs:{type:"primary",icon:"el-icon-search",size:"mini"},on:{click:t.handleQuery}},[t._v("搜索")]),t._v(" "),a("el-button",{attrs:{icon:"el-icon-refresh",size:"mini"},on:{click:t.resetQuery}},[t._v("重置")])],1)],1),t._v(" "),a("el-row",{staticClass:"mb8",attrs:{gutter:10}},[a("el-col",{attrs:{span:1.5}},[a("el-button",{attrs:{type:"primary",icon:"el-icon-plus",size:"mini"},on:{click:t.handleAdd}},[t._v("新增")])],1),t._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{attrs:{type:"success",icon:"el-icon-edit",size:"mini",disabled:t.single},on:{click:t.handleUpdate}},[t._v("修改")])],1),t._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{attrs:{type:"danger",icon:"el-icon-delete",size:"mini",disabled:t.multiple},on:{click:t.handleDelete}},[t._v("删除")])],1)],1),t._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],attrs:{data:t.dataList},on:{"selection-change":t.handleSelectionChange}},[a("el-table-column",{attrs:{type:"selection",width:"55",align:"center"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典编码",align:"center",prop:"dict_code"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典标签",align:"center",prop:"dict_label"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典键值",align:"center",prop:"dict_value"}}),t._v(" "),a("el-table-column",{attrs:{label:"字典排序",align:"center",prop:"dict_sort"}}),t._v(" "),a("el-table-column",{attrs:{label:"状态",align:"center",prop:"status",formatter:t.statusFormat}}),t._v(" "),a("el-table-column",{attrs:{label:"备注",align:"center",prop:"remark","show-overflow-tooltip":!0}}),t._v(" "),a("el-table-column",{attrs:{label:"创建时间",align:"center",prop:"create_time",width:"180"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",[t._v(t._s(t.parseTime(e.row.create_time)))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作",align:"center","class-name":"small-padding fixed-width"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{size:"mini",type:"text",icon:"el-icon-edit"},on:{click:function(a){return t.handleUpdate(e.row)}}},[t._v("修改")]),t._v(" "),a("el-button",{attrs:{size:"mini",type:"text",icon:"el-icon-delete"},on:{click:function(a){return t.handleDelete(e.row)}}},[t._v("删除")])]}}])})],1),t._v(" "),a("pagination",{directives:[{name:"show",rawName:"v-show",value:t.total>0,expression:"total>0"}],attrs:{total:t.total,page:t.queryParams.pageNum,limit:t.queryParams.pageSize},on:{"update:page":function(e){return t.$set(t.queryParams,"pageNum",e)},"update:limit":function(e){return t.$set(t.queryParams,"pageSize",e)},pagination:t.getList}}),t._v(" "),a("el-dialog",{attrs:{title:t.title,visible:t.open,width:"500px","append-to-body":""},on:{"update:visible":function(e){t.open=e}}},[a("el-form",{ref:"form",attrs:{model:t.form,rules:t.rules,"label-width":"80px"}},[a("el-form-item",{attrs:{label:"字典类型"}},[a("el-input",{attrs:{disabled:!0},model:{value:t.form.dictType,callback:function(e){t.$set(t.form,"dictType",e)},expression:"form.dictType"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"数据标签",prop:"dictLabel"}},[a("el-input",{attrs:{placeholder:"请输入数据标签"},model:{value:t.form.dictLabel,callback:function(e){t.$set(t.form,"dictLabel",e)},expression:"form.dictLabel"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"数据键值",prop:"dictValue"}},[a("el-input",{attrs:{placeholder:"请输入数据键值"},model:{value:t.form.dictValue,callback:function(e){t.$set(t.form,"dictValue",e)},expression:"form.dictValue"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"显示排序",prop:"dictSort"}},[a("el-input-number",{attrs:{"controls-position":"right",min:0},model:{value:t.form.dictSort,callback:function(e){t.$set(t.form,"dictSort",e)},expression:"form.dictSort"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"系统默认"}},[a("el-switch",{attrs:{"active-text":"是","inactive-text":"否","active-value":"1","inactive-value":"0"},model:{value:t.form.isDefault,callback:function(e){t.$set(t.form,"isDefault",e)},expression:"form.isDefault"}})],1),t._v(" "),a("el-form-item",{attrs:{label:"状态",prop:"status"}},[a("el-radio-group",{model:{value:t.form.status,callback:function(e){t.$set(t.form,"status",e)},expression:"form.status"}},t._l(t.statusOptions.values,(function(e){return a("el-radio",{key:e.key,attrs:{label:e.key}},[t._v(t._s(e.value))])})),1)],1),t._v(" "),a("el-form-item",{attrs:{label:"备注",prop:"remark"}},[a("el-input",{attrs:{type:"textarea",placeholder:"请输入内容"},model:{value:t.form.remark,callback:function(e){t.$set(t.form,"remark",e)},expression:"form.remark"}})],1)],1),t._v(" "),a("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("确 定")]),t._v(" "),a("el-button",{on:{click:t.cancel}},[t._v("取 消")])],1)],1)],1)},l=[],r=(a("ac6a"),a("aa3a")),s={name:"Data",data:function(){return{loading:!0,ids:[],single:!0,multiple:!0,total:0,dataList:[],defaultDictType:"",title:"",open:!1,statusOptions:[],typeOptions:[],queryParams:{pageNum:1,pageSize:10,dictName:void 0,dictType:void 0,status:void 0},form:{},rules:{dictLabel:[{required:!0,message:"数据标签不能为空",trigger:"blur"}],dictValue:[{required:!0,message:"数据键值不能为空",trigger:"blur"}],dictSort:[{required:!0,message:"数据顺序不能为空",trigger:"blur"}]}}},created:function(){var t=this.$route.params&&this.$route.params.dictType;this.queryParams.dictType=t,this.getList()},methods:{getList:function(){var t=this;this.loading=!0,Object(r["f"])(this.queryParams).then((function(e){t.dataList=e.data.list,t.statusOptions=e.data.searchStatus,t.total=e.data.total,t.loading=!1}))},statusFormat:function(t,e){return this.selectDictLabel(this.statusOptions.values,t.status)},cancel:function(){this.open=!1,this.reset()},reset:function(){this.form={dictCode:void 0,dictLabel:void 0,dictValue:void 0,dictSort:0,isDefault:"0",status:"1",remark:void 0},this.resetForm("form")},handleQuery:function(){this.queryParams.pageNum=1,this.getList()},resetQuery:function(){this.resetForm("queryForm"),this.queryParams.dictType=this.defaultDictType,this.handleQuery()},handleAdd:function(){this.reset(),this.open=!0,this.title="添加字典数据",this.form.dictType=this.queryParams.dictType},handleSelectionChange:function(t){this.ids=t.map((function(t){return t.dict_code})),this.single=1!=t.length,this.multiple=!t.length},handleUpdate:function(t){var e=this;this.reset();var a=t.dict_code||this.ids;Object(r["d"])(a).then((function(t){e.form={dictType:t.data.dict_type,dictCode:t.data.dict_code,dictLabel:t.data.dict_label,dictValue:t.data.dict_value,dictSort:t.data.dict_sort,isDefault:""+t.data.is_default,status:""+t.data.status,remark:t.data.remark},e.open=!0,e.title="修改字典数据"}))},submitForm:function(){var t=this;this.$refs["form"].validate((function(e){e&&(void 0!=t.form.dictCode?Object(r["g"])(t.form).then((function(e){0===e.code?(t.msgSuccess("修改成功"),t.open=!1,t.getList()):t.msgError(e.msg)})):Object(r["a"])(t.form).then((function(e){0===e.code?(t.msgSuccess("新增成功"),t.open=!1,t.getList()):t.msgError(e.msg)})))}))},handleDelete:function(t){var e=this,a=t.dict_code||this.ids;this.$confirm('是否确认删除字典编码为"'+a+'"的数据项?',"警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return Object(r["b"])(a)})).then((function(){e.getList(),e.msgSuccess("删除成功")})).catch((function(){}))},handleExport:function(){var t=this,e=this.queryParams;this.$confirm("是否确认导出所有数据项?","警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return Object(r["c"])(e)})).then((function(e){t.download(e.msg)})).catch((function(){}))}}},n=s,o=a("2877"),c=Object(o["a"])(n,i,l,!1,null,null,null);e["default"]=c.exports}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-2d0d67a2.2faff61e.js
+++ b/dist/static/js/chunk-2d0d67a2.2faff61e.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d67a2"],{"735e":function(e,t,a){"use strict";a.r(t);var o=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"app-container"},[a("el-form",{ref:"queryForm",attrs:{model:e.queryParams,inline:!0,"label-width":"68px"}},[a("el-form-item",{attrs:{label:"任务名称",prop:"jobName"}},[a("el-input",{staticStyle:{width:"240px"},attrs:{placeholder:"请输入任务名称",clearable:"",size:"small"},nativeOn:{keyup:function(t){return!t.type.indexOf("key")&&e._k(t.keyCode,"enter",13,t.key,"Enter")?null:e.handleQuery(t)}},model:{value:e.queryParams.jobName,callback:function(t){e.$set(e.queryParams,"jobName",t)},expression:"queryParams.jobName"}})],1),e._v(" "),a("el-form-item",{attrs:{label:"任务组名",prop:"jobGroup"}},[a("el-select",{staticStyle:{width:"240px"},attrs:{placeholder:"请任务组名",clearable:"",size:"small"},model:{value:e.queryParams.jobGroup,callback:function(t){e.$set(e.queryParams,"jobGroup",t)},expression:"queryParams.jobGroup"}},e._l(e.jobGroupOptions,(function(e){return a("el-option",{key:e.dictValue,attrs:{label:e.dictLabel,value:e.dictValue}})})),1)],1),e._v(" "),a("el-form-item",{attrs:{label:"执行状态",prop:"status"}},[a("el-select",{staticStyle:{width:"240px"},attrs:{placeholder:"请选择执行状态",clearable:"",size:"small"},model:{value:e.queryParams.status,callback:function(t){e.$set(e.queryParams,"status",t)},expression:"queryParams.status"}},e._l(e.statusOptions,(function(e){return a("el-option",{key:e.dictValue,attrs:{label:e.dictLabel,value:e.dictValue}})})),1)],1),e._v(" "),a("el-form-item",{attrs:{label:"执行时间"}},[a("el-date-picker",{staticStyle:{width:"240px"},attrs:{size:"small","value-format":"yyyy-MM-dd",type:"daterange","range-separator":"-","start-placeholder":"开始日期","end-placeholder":"结束日期"},model:{value:e.dateRange,callback:function(t){e.dateRange=t},expression:"dateRange"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{type:"primary",icon:"el-icon-search",size:"mini"},on:{click:e.handleQuery}},[e._v("搜索")]),e._v(" "),a("el-button",{attrs:{icon:"el-icon-refresh",size:"mini"},on:{click:e.resetQuery}},[e._v("重置")])],1)],1),e._v(" "),a("el-row",{staticClass:"mb8",attrs:{gutter:10}},[a("el-col",{attrs:{span:1.5}},[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:job:remove"],expression:"['monitor:job:remove']"}],attrs:{type:"danger",icon:"el-icon-delete",size:"mini",disabled:e.multiple},on:{click:e.handleDelete}},[e._v("删除")])],1),e._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:job:remove"],expression:"['monitor:job:remove']"}],attrs:{type:"danger",icon:"el-icon-delete",size:"mini"},on:{click:e.handleClean}},[e._v("清空")])],1),e._v(" "),a("el-col",{attrs:{span:1.5}},[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:jobLog:export"],expression:"['monitor:jobLog:export']"}],attrs:{type:"warning",icon:"el-icon-download",size:"mini"},on:{click:e.handleExport}},[e._v("导出")])],1)],1),e._v(" "),a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],attrs:{data:e.jobLogList},on:{"selection-change":e.handleSelectionChange}},[a("el-table-column",{attrs:{type:"selection",width:"55",align:"center"}}),e._v(" "),a("el-table-column",{attrs:{label:"日志编号",width:"80",align:"center",prop:"jobLogId"}}),e._v(" "),a("el-table-column",{attrs:{label:"任务名称",align:"center",prop:"jobName","show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"任务组名",align:"center",prop:"jobGroup",formatter:e.jobGroupFormat,"show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"调用目标字符串",align:"center",prop:"invokeTarget","show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"日志信息",align:"center",prop:"jobMessage","show-overflow-tooltip":!0}}),e._v(" "),a("el-table-column",{attrs:{label:"执行状态",align:"center",prop:"status",formatter:e.statusFormat}}),e._v(" "),a("el-table-column",{attrs:{label:"执行时间",align:"center",prop:"createTime",width:"180"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("span",[e._v(e._s(e.parseTime(t.row.createTime)))])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"操作",align:"center","class-name":"small-padding fixed-width"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("el-button",{directives:[{name:"hasPermi",rawName:"v-hasPermi",value:["monitor:job:query"],expression:"['monitor:job:query']"}],attrs:{size:"mini",type:"text",icon:"el-icon-view"},on:{click:function(a){return e.handleView(t.row)}}},[e._v("详细")])]}}])})],1),e._v(" "),a("pagination",{directives:[{name:"show",rawName:"v-show",value:e.total>0,expression:"total>0"}],attrs:{total:e.total,page:e.queryParams.pageNum,limit:e.queryParams.pageSize},on:{"update:page":function(t){return e.$set(e.queryParams,"pageNum",t)},"update:limit":function(t){return e.$set(e.queryParams,"pageSize",t)},pagination:e.getList}}),e._v(" "),a("el-dialog",{attrs:{title:"调度日志详细",visible:e.open,width:"700px","append-to-body":""},on:{"update:visible":function(t){e.open=t}}},[a("el-form",{ref:"form",attrs:{model:e.form,"label-width":"100px",size:"mini"}},[a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{label:"日志序号："}},[e._v(e._s(e.form.jobLogId))]),e._v(" "),a("el-form-item",{attrs:{label:"任务名称："}},[e._v(e._s(e.form.jobName))])],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{label:"任务分组："}},[e._v(e._s(e.form.jobGroup))]),e._v(" "),a("el-form-item",{attrs:{label:"执行时间："}},[e._v(e._s(e.form.createTime))])],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"调用方法："}},[e._v(e._s(e.form.invokeTarget))])],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"日志信息："}},[e._v(e._s(e.form.jobMessage))])],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"执行状态："}},[0==e.form.status?a("div",[e._v("正常")]):1==e.form.status?a("div",[e._v("失败")]):e._e()])],1),e._v(" "),a("el-col",{attrs:{span:24}},[1==e.form.status?a("el-form-item",{attrs:{label:"异常信息："}},[e._v(e._s(e.form.exceptionInfo))]):e._e()],1)],1)],1),e._v(" "),a("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(t){e.open=!1}}},[e._v("关 闭")])],1)],1)],1)},r=[],n=a("ade3"),l=a("b775");function i(e){return Object(l["a"])({url:"/monitor/jobLog/list",method:"get",params:e})}function s(e){return Object(l["a"])({url:"/monitor/jobLog/"+e,method:"delete"})}function u(){return Object(l["a"])({url:"/monitor/jobLog/clean",method:"delete"})}function c(e){return Object(l["a"])({url:"/monitor/jobLog/export",method:"get",params:e})}var m={name:"JobLog",data:function(){return Object(n["a"])({loading:!0,ids:[],multiple:!0,total:0,jobLogList:[],open:!1,dateRange:[],form:{},statusOptions:[],jobGroupOptions:[],queryParams:{pageNum:1,pageSize:10,jobName:void 0,jobGroup:void 0,status:void 0}},"form",{})},created:function(){var e=this;this.getList(),this.getDicts("sys_job_status").then((function(t){e.statusOptions=t.data})),this.getDicts("sys_job_group").then((function(t){e.jobGroupOptions=t.data}))},methods:{getList:function(){var e=this;this.loading=!0,i(this.addDateRange(this.queryParams,this.dateRange)).then((function(t){e.jobLogList=t.rows,e.total=t.total,e.loading=!1}))},statusFormat:function(e,t){return this.selectDictLabel(this.statusOptions,e.status)},jobGroupFormat:function(e,t){return this.selectDictLabel(this.jobGroupOptions,e.jobGroup)},handleQuery:function(){this.queryParams.pageNum=1,this.getList()},resetQuery:function(){this.dateRange=[],this.resetForm("queryForm"),this.handleQuery()},handleSelectionChange:function(e){this.ids=e.map((function(e){return e.jobLogId})),this.multiple=!e.length},handleView:function(e){this.open=!0,this.form=e},handleDelete:function(e){var t=this,a=this.ids;this.$confirm('是否确认删除调度日志编号为"'+a+'"的数据项?',"警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return s(a)})).then((function(){t.getList(),t.msgSuccess("删除成功")})).catch((function(){}))},handleClean:function(){var e=this;this.$confirm("是否确认清空所有调度日志数据项?","警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return u()})).then((function(){e.getList(),e.msgSuccess("清空成功")})).catch((function(){}))},handleExport:function(){var e=this,t=this.queryParams;this.$confirm("是否确认导出所有调度日志数据项?","警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return c(t)})).then((function(t){e.download(t.msg)})).catch((function(){}))}}},p=m,d=a("2877"),b=Object(d["a"])(p,o,r,!1,null,null,null);t["default"]=b.exports}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-2d0e28b6.1306f738.js
+++ b/dist/static/js/chunk-2d0e28b6.1306f738.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e28b6"],{"7ec5":function(e,t,l){"use strict";l.r(t);var i=function(){var e=this,t=e.$createElement,l=e._self._c||t;return l("div",{staticClass:"app-container"},[l("el-row",{staticClass:"mb8",attrs:{gutter:10}},[l("el-col",{attrs:{span:1.5}},[l("el-button",{attrs:{type:"primary",icon:"el-icon-plus",size:"mini"},on:{click:e.handleAdd}},[e._v("新增")])],1),e._v(" "),l("el-col",{attrs:{span:1.5}},[l("el-button",{attrs:{type:"success",icon:"el-icon-edit",size:"mini",disabled:e.single},on:{click:e.handleUpdate}},[e._v("修改")])],1),e._v(" "),l("el-col",{attrs:{span:1.5}},[l("el-button",{attrs:{type:"danger",icon:"el-icon-delete",size:"mini",disabled:e.multiple},on:{click:e.handleDelete}},[e._v("删除")])],1)],1),e._v(" "),l("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],ref:"dragTable",attrs:{data:e.fieldsList,"row-key":"field_id"},on:{"selection-change":e.handleSelectionChange}},[l("el-table-column",{attrs:{align:"center",width:"40"},scopedSlots:e._u([{key:"default",fn:function(e){return[l("svg-icon",{staticClass:"drag-handler",attrs:{"icon-class":"drag"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{type:"selection",width:"45",align:"center"}}),e._v(" "),l("el-table-column",{attrs:{label:"字段编号",align:"center",width:"50",prop:"field_id"}}),e._v(" "),l("el-table-column",{attrs:{label:"字段名称",align:"center",prop:"field_name"}}),e._v(" "),l("el-table-column",{attrs:{label:"字段标题",align:"center",prop:"field_title"}}),e._v(" "),l("el-table-column",{attrs:{label:"字段类型",align:"center",prop:"field_type"}}),e._v(" "),l("el-table-column",{attrs:{label:"字段规则",align:"center",prop:"field_rules"}}),e._v(" "),l("el-table-column",{attrs:{label:"主键","min-width":"30"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-radio",{attrs:{label:t.row.field_id},model:{value:e.fieldPkId,callback:function(t){e.fieldPkId=t},expression:"fieldPkId"}},[e._v("是")])]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"排序字段","min-width":"30"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.model_sort,callback:function(l){e.$set(t.row,"model_sort",l)},expression:"scope.row.model_sort"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"列表显示","min-width":"30"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.model_list,callback:function(l){e.$set(t.row,"model_list",l)},expression:"scope.row.model_list"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"可编辑","min-width":"30"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.model_edit,callback:function(l){e.$set(t.row,"model_edit",l)},expression:"scope.row.model_edit"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"模型索引","min-width":"30"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.model_indexes,callback:function(l){e.$set(t.row,"model_indexes",l)},expression:"scope.row.model_indexes"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"列表查询","min-width":"30"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-checkbox",{attrs:{"true-label":"1"},model:{value:t.row.search_list,callback:function(l){e.$set(t.row,"search_list",l)},expression:"scope.row.search_list"}})]}}])}),e._v(" "),l("el-table-column",{attrs:{label:"操作",align:"center","class-name":"small-padding fixed-width"},scopedSlots:e._u([{key:"default",fn:function(t){return[l("el-button",{attrs:{size:"mini",type:"text",icon:"el-icon-edit"},on:{click:function(l){return e.handleUpdate(t.row)}}},[e._v("修改")]),e._v(" "),l("el-button",{attrs:{size:"mini",type:"text",icon:"el-icon-delete"},on:{click:function(l){return e.handleDelete(t.row)}}},[e._v("删除")])]}}])})],1),e._v(" "),l("el-form",{attrs:{"label-width":"100px"}},[l("el-form-item",{staticStyle:{"text-align":"center","margin-left":"-100px","margin-top":"10px"}},[l("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.submitFormList()}}},[e._v("提交")]),e._v(" "),l("el-button",{on:{click:function(t){return e.close()}}},[e._v("返回")])],1)],1),e._v(" "),l("el-dialog",{attrs:{title:e.title,visible:e.open,width:"600px","append-to-body":""},on:{"update:visible":function(t){e.open=t}}},[l("el-form",{ref:"form",attrs:{model:e.form,rules:e.rules,"label-width":"160px"}},[l("el-form-item",{attrs:{label:"字段名称",prop:"fieldName"}},[l("el-input",{attrs:{placeholder:"请输入字段名称"},model:{value:e.form.fieldName,callback:function(t){e.$set(e.form,"fieldName",t)},expression:"form.fieldName"}})],1),e._v(" "),l("el-form-item",{attrs:{label:"字段标题",prop:"fieldTitle"}},[l("el-input",{attrs:{placeholder:"请输入字段标题"},model:{value:e.form.fieldTitle,callback:function(t){e.$set(e.form,"fieldTitle",t)},expression:"form.fieldTitle"}})],1),e._v(" "),l("el-form-item",{attrs:{label:"字段类型",prop:"fieldType"}},[l("el-select",{on:{change:e.typeChange},model:{value:e.form.fieldType,callback:function(t){e.$set(e.form,"fieldType",t)},expression:"form.fieldType"}},e._l(e.fieldsType,(function(e){return l("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})),1)],1),e._v(" "),l("el-form-item",{directives:[{name:"show",rawName:"v-show",value:e.tagShow.inputData,expression:"tagShow.inputData"}],attrs:{prop:"fieldData"}},[l("span",{attrs:{slot:"label"},slot:"label"},[e._v("\n              字段数据\n              "),l("el-tooltip",{attrs:{content:"格式:'1:text1,2:text2,3:text3' 或 '数据表名|值字段名|标题字段名(|排序字段)(|条件)' 或 :字典编码",placement:"top-start"}},[l("i",{staticClass:"el-icon-question"})])],1),e._v(" "),l("el-input",{attrs:{placeholder:"请输入字段数据"},model:{value:e.form.fieldData,callback:function(t){e.$set(e.form,"fieldData",t)},expression:"form.fieldData"}})],1),e._v(" "),l("el-form-item",{directives:[{name:"show",rawName:"v-show",value:e.tagShow.inputLength,expression:"tagShow.inputLength"}],attrs:{label:"字段长度",prop:"fieldLength"}},[l("el-input",{attrs:{placeholder:"请输入字段长度"},model:{value:e.form.fieldLength,callback:function(t){e.$set(e.form,"fieldLength",t)},expression:"form.fieldLength"}})],1),e._v(" "),l("el-form-item",{directives:[{name:"show",rawName:"v-show",value:e.tagShow.inputDefault,expression:"tagShow.inputDefault"}],attrs:{label:"字段默认值",prop:"fieldDefault"}},[l("el-input",{attrs:{placeholder:"请输入字段默认值 地图类型时'lng,lat'"},model:{value:e.form.fieldDefault,callback:function(t){e.$set(e.form,"fieldDefault",t)},expression:"form.fieldDefault"}})],1),e._v(" "),l("el-form-item",{attrs:{label:"字段说明",prop:"fieldDesc"}},[l("el-input",{attrs:{placeholder:"请输入字段说明"},model:{value:e.form.fieldDesc,callback:function(t){e.$set(e.form,"fieldDesc",t)},expression:"form.fieldDesc"}})],1),e._v(" "),l("el-form-item",{directives:[{name:"show",rawName:"v-show",value:e.tagShow.inputRules,expression:"tagShow.inputRules"}],attrs:{label:"字段规则",prop:"fieldRules"}},[l("el-select",{attrs:{multiple:""},model:{value:e.form.fieldRules,callback:function(t){e.$set(e.form,"fieldRules",t)},expression:"form.fieldRules"}},e._l(e.fieldsRules,(function(e){return l("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})),1)],1),e._v(" "),l("el-form-item",{attrs:{label:"字段列表显示宽度",prop:"fieldWidth"}},[l("el-input",{attrs:{placeholder:"请输入字段列表显示宽度"},model:{value:e.form.fieldWidth,callback:function(t){e.$set(e.form,"fieldWidth",t)},expression:"form.fieldWidth"}})],1),e._v(" "),l("el-form-item",{attrs:{label:"字段列表对齐方式",prop:"fieldAlign"}},[l("el-input",{attrs:{placeholder:"请输入字段列表对齐方式"},model:{value:e.form.fieldAlign,callback:function(t){e.$set(e.form,"fieldAlign",t)},expression:"form.fieldAlign"}})],1)],1),e._v(" "),l("div",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[l("el-button",{attrs:{type:"primary"},on:{click:e.submitForm}},[e._v("确 定")]),e._v(" "),l("el-button",{on:{click:e.cancel}},[e._v("取 消")])],1)],1)],1)},a=[],o=(l("28a5"),l("6762"),l("2fdb"),l("b775"));function n(e){return Object(o["a"])({url:"/system/model/fields/add",method:"post",data:e})}function s(e){return Object(o["a"])({url:"/system/model/fields/list",method:"get",params:{modelId:e}})}function r(e,t,l){return Object(o["a"])({url:"/system/model/fields/setFieldsAttr",method:"post",data:{fieldsList:e,pkId:t,modelId:l}})}function d(e){return Object(o["a"])({url:"/system/model/fields/edit?id="+e,method:"get"})}function u(e){return Object(o["a"])({url:"/system/model/fields/edit",method:"post",data:e})}function c(e){return Object(o["a"])({url:"/system/model/fields/delete",method:"delete",data:{ids:e}})}var f=l("53fe"),m=l.n(f),p={name:"Post",data:function(){return{loading:!0,ids:[],fieldPkId:null,single:!0,multiple:!0,fieldsList:[],oldList:[],newList:[],title:"",open:!1,statusOptions:[],fieldsType:[{value:"text",label:"文本"},{value:"baidu_map",label:"百度地图坐标"},{value:"imagefile",label:"单图片"},{value:"images",label:"多图片"},{value:"file",label:"单文件"},{value:"files",label:"多文件"},{value:"selecttext",label:"选择文本"},{value:"currency",label:"货币"},{value:"large_number",label:"长整型"},{value:"number",label:"整数"},{value:"datetime",label:"日期时间"},{value:"date",label:"日期"},{value:"selectnumber",label:"选择数字"},{value:"richtext",label:"富文本"},{value:"bigtext",label:"文本域"},{value:"switch",label:"开关"},{value:"checkbox",label:"多选框"},{value:"DepartmentSelector",label:"部门选择器"}],fieldsRules:[{value:"lengthfixed",label:"lengthfixed"},{value:"required",label:"required"},{value:"unsigned",label:"unsigned"},{value:"unique",label:"unique"},{value:"readonly",label:"readonly"},{value:"hidden",label:"hidden"}],dataSelect:["selecttext","checkbox","selectnumber"],tagShow:{inputData:!1,inputLength:!1,inputDefault:!1,inputRules:!0},modelId:0,form:{},rules:{fieldName:[{required:!0,message:"字段名称不能为空",trigger:"blur"}],fieldTitle:[{required:!0,message:"字段标题不能为空",trigger:"blur"}],fieldType:[{required:!0,message:"字段类型不能为空",trigger:"change"}]}}},created:function(){var e=this.$route.query.modelId;e&&(this.modelId=e),this.getList()},methods:{getList:function(){var e=this;this.loading=!0,s(this.modelId).then((function(t){e.fieldsList=t.data.list?t.data.list:[],e.oldList=e.fieldsList.map((function(t){return"1"==t.model_pk&&(e.fieldPkId=t.field_id),t.field_id})),e.newList=e.oldList.slice(),e.loading=!1,e.$nextTick((function(){e.setSort()}))}))},typeChange:function(e){this.showOption(e)},showOption:function(e){this.dataSelect.includes(e)?(this.tagShow.inputData=!0,this.tagShow.inputLength=!1):"text"==e?(this.tagShow.inputData=!1,this.tagShow.inputLength=!0):(this.tagShow.inputData=!1,this.tagShow.inputLength=!1),this.tagShow.inputDefault="imagefile"!=e&&"images"!=e&&"file"!=e&&"files"!=e,this.tagShow.inputRules="switch"!=e},cancel:function(){this.open=!1,this.reset()},reset:function(){this.form={fieldId:void 0,modelId:this.modelId,fieldName:void 0,fieldTitle:void 0,fieldType:"",fieldData:void 0,fieldLength:void 0,fieldDefault:void 0,fieldDesc:void 0,fieldRules:[],fieldWidth:"",fieldAlign:""},this.resetForm("form")},handleQuery:function(){this.getList()},resetQuery:function(){this.resetForm("queryForm"),this.handleQuery()},handleSelectionChange:function(e){this.ids=e.map((function(e){return e.field_id})),this.single=1!=e.length,this.multiple=!e.length},handleAdd:function(){this.reset(),this.open=!0,this.title="添加字段"},handleUpdate:function(e){var t=this;this.reset();var l=e.field_id||this.ids;d(l).then((function(e){var l=e.data;l&&(t.form={fieldId:l.field_id,modelId:l.model_id,fieldName:l.field_name,fieldTitle:l.field_title,fieldType:l.field_type,fieldData:l.field_data,fieldLength:l.field_length,fieldDefault:l.field_default,fieldDesc:l.field_desc,fieldRules:""!=l.field_rules?l.field_rules.split(","):[],fieldWidth:l.field_width,fieldAlign:l.field_align},t.showOption(t.form.fieldType)),t.open=!0,t.title="修改字段"}))},submitForm:function(){var e=this;this.$refs["form"].validate((function(t){t&&(void 0!=e.form.fieldId?u(e.form).then((function(t){0===t.code?(e.msgSuccess("修改成功"),e.open=!1,e.getList()):e.msgError(t.msg)})):n(e.form).then((function(t){0===t.code?(e.msgSuccess("新增成功"),e.open=!1,e.getList()):e.msgError(t.msg)})))}))},submitFormList:function(){var e=this;r(this.fieldsList,this.fieldPkId,this.modelId).then((function(t){0===t.code?(e.msgSuccess("修改成功"),e.getList()):e.msgError(t.msg)}))},handleDelete:function(e){var t=this,l=e.field_id?[e.field_id]:this.ids;this.$confirm('是否确认删除字段编号为"'+l+'"的数据项?',"警告",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then((function(){return c(l)})).then((function(){t.getList(),t.msgSuccess("删除成功")})).catch((function(){}))},setSort:function(){var e=this,t=this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];this.sortable=m.a.create(t,{ghostClass:"sortable-ghost",setData:function(e){e.setData("Text","")},onEnd:function(t){var l=e.fieldsList.splice(t.oldIndex,1)[0];e.fieldsList.splice(t.newIndex,0,l);var i=e.newList.splice(t.oldIndex,1)[0];e.newList.splice(t.newIndex,0,i)}})},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/model/list",query:{t:Date.now()}})}}},h=p,b=l("2877"),v=Object(b["a"])(h,i,a,!1,null,null,null);t["default"]=v.exports}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-2f2393fa.52eaad38.js
+++ b/dist/static/js/chunk-2f2393fa.52eaad38.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7f2f7f9d"],{"47af":function(t,s){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM4MTU5MkY0OTFFQjExRUJBQkE3REQ0N0VCRUQzQzM1IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM4MTU5MkY1OTFFQjExRUJBQkE3REQ0N0VCRUQzQzM1Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzgxNTkyRjI5MUVCMTFFQkFCQTdERDQ3RUJFRDNDMzUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MzgxNTkyRjM5MUVCMTFFQkFCQTdERDQ3RUJFRDNDMzUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7L2yVbAAAGLklEQVR42tRba2wUVRS+XXaBCiIo9dEYYjDGgA8UbKqiGB9BjSCixvhuMFarxWcTK9X6tiIVAQUREeUpaqwJqBH9oQaFEBFNFH80CBqjWKEoFKEtpa3fYb8hk8nOzt07d9qdk3zZdnf27vnm3Hte905B98RJKgLpDxQCZwOlQBEwBDgeKAaOAxLADuAPYCfwD1+/AzYC+4FW24olLY41EDgBOB84F7gAGElifiI34rQM7/8CrAW+5et2YI8NJQssWLiQSt8PTKAlbYpYeg0wB/gB2NtbFhbLnQncC0wGhqpo5AjgWuAy4CNgAbAB6OhJwsNJ9BrgZNUzMgi4BbgIWA3MBzabWClXkbX5IVDVg2TdciJv9ifAVbIsoyIsA08F3gdGqd6XYcA7wONAyjZhCTP1wAx64nwRmebPAK/rOksdwhI73+UULlT5KXcAq4BTwxIWy84FJqn8lwvpyAabEu4DPAtcp+IjFzNe9zMhXAk8pOInt9ORJXMhfD1QQyvHUcTf3JmJXybCsvCnM8GPq4hzfREYE0RYpkFFLyUUUYQsyRsGZCN8OlAW4kekqtkCtFtQ+ACwFWgKMcatQIkf4SQXvGm1I3XsJVwS04B9IRRtpeM5BRjH+ti0wJEZe1QmwlLH3mg48FccuBHoZmiQcnG3wVh76XRmcawtdEBrDHW7EhjvJdwXuNkgbexmkS6ZzibX+13AW/T0uUxvubaaCcRB1/s/smDYYLiWy9igOEx4qGE2tYvL4Fefz0Xx+zRr1w5eO9/nc/mNm4C/DPQc7xjTIXwGc2aTbkRjwDULmcS0B1i2ktdmk98MOx4plrUFCZK+wnB9SKx+IFsq5yL9GGeEV6R5V6tBVpS+CzjJUNfLhauQPYaJt4kI0To6maDuyUx6bzfpf+mN6zV+q5LX9TXUdazcLFFyNHtTYXpONfy7LuDaRQxXK/i/ePKVGr9RzZs1KGSnZFyS/amUCicDOC13BkzNLnYpnLi4XGPscuBpjWWjI8OF8LGWUjmpnefRJyzyhJVM3lunpSQR4FVLZEWKRLkii/lriklHVchZ04dr1ibZQ4STlgk7jqyWlpZsqc3gpkmS8SRwpGXdIiHsrOkakp6dQ15dyBS1VtnfwTiUYCUMEw4dkVTuKWBKDt+Zwjp2SEQ6FScCnEtYkeKhU+ntcCSYue2KUJ+OBENJFCLjPqHhsd0haznj7Z9R6SR3vjmCgZvpdN6ghXVFbsxikp+u7Df9m5MRWHg38+aFLB9NZCm/+5LFPOGwhW0SbmMfaYWFsZZxTcssOdom4R2WBmtnbqxD9h7NjKuBr2+qgB2FXAhvY/GdCjmNX9Ao8aTSuQ14zVX0LwuolRto4ToVftN9m3jp79lCMZU9dFAzNNLFB1V6r8qRuZqlpdzIR0OGLDk8szbBQb4OMY2rXRbLJo8wg+rvSUNr+FmQvM0WUJuhruukY5JgCDDtCEofeoFGnC1nTB6YpbQs14jTK9nmMZHPZAynp/WTMmt4S0FeokF2nseyfqVlEOnRhh5bfMU3EuoSrkRhlcFA0h5aojLs4VAqWOLpOMQUr63w+XwMHZxJXP5csdvpED7ATsR2g8FGMH08z6P8VDqyXOrZfux9VXlmxDmcASMN9GuhUf5zExZZD7xnuD5GkXQpOxWyr1xvWM9Kj+x54GGOVUKFSw11+5QWTrdRPCfxzgK+CFGeNfNOFivz7qJyzbomOjrTTEsc3aUqvRWkvBYW2cy7aVxgq3TfOCxZJ0kZFjKtlOpro7cG9VYrcgRoq4q/tDCx2ZeNsEgjs5q/Y0x2PxOiTZm6DJnkAzqOzpgSnsmCo0uXsGK6OCuGZJfSWAf9+kh+0smUryFGZL9U6c093+or6CSeU9CvjgHZdayzs5460DlrKbFQjkLMYWzMR1ms0hv6QXvV2qdpW5nuTVPRtlFNvPFzwN26euVyXlrW9MvADcr/iENPirSmyth80J55JifiJfWcwMrm914g2sS8/WqGz65cvhzmqRZnM13KuYkquoc8HJEc/WO2e9abdj7CPNUicU6OLP3MmB31YzyvqPRjPC1hBiuw+GSa+0EtqY3HquAHtfwkrx/U8mvZ5OWjeP8LMAADdln6uCsMhAAAAABJRU5ErkJggg=="},"6bf3":function(t,s,i){},"83f1":function(t,s,i){"use strict";i.r(s);var c=function(){var t=this,s=t.$createElement,c=t._self._c||s;return c("div",{staticClass:"to-review"},[c("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),c("el-card",{staticClass:"box-card"},[c("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[c("el-steps",{attrs:{active:3,"align-center":"","finish-status":"success","process-status":"error"}},[c("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),c("el-step",{attrs:{title:"填写品牌信息"}}),t._v(" "),c("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),c("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),c("div",{staticClass:"main"},[c("div",{staticClass:"main-con"},[c("p",[c("img",{attrs:{src:i("47af"),alt:""}})]),t._v(" "),c("p",[t._v("非常抱歉，您的资料审核不通过！")]),t._v(" "),c("p",[t._v("不通过原因："+t._s(t.msg)+"！请您重新提交认证资料！")]),t._v(" "),c("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系")]),t._v(" "),c("p",{staticStyle:{"padding-top":"40px"}},[c("el-button",{attrs:{type:"primary"},on:{click:t.reSubmit}},[t._v("重新提交")])],1)])])])],1)},e=[],a={name:"ReviewFail",data:function(){return{msg:"具体原因，请联系售后"}},mounted:function(){this.$route.params.msg&&(this.msg=this.$route.params.msg)},methods:{reSubmit:function(){this.$router.push({path:"/process"})}}},A=a,n=(i("f037"),i("cba8")),l=Object(n["a"])(A,c,e,!1,null,"038cd2fa",null);s["default"]=l.exports},f037:function(t,s,i){"use strict";i("6bf3")}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-3a35df6c.81b90129.js
+++ b/dist/static/js/chunk-3a35df6c.81b90129.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-3bbb4d22"],{"0a5c":function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{class:t.className,style:{height:t.height,width:t.width}})},i=[],s=e("24ce"),r=e.n(s),l=e("feb2");e("6cbb");var o=3e3,c={mixins:[l["default"]],props:{className:{type:String,default:"chart"},width:{type:String,default:"100%"},height:{type:String,default:"300px"}},data:function(){return{chart:null}},mounted:function(){var t=this;this.$nextTick((function(){t.initChart()}))},beforeDestroy:function(){this.chart&&(this.chart.dispose(),this.chart=null)},methods:{initChart:function(){this.chart=r.a.init(this.$el,"macarons"),this.chart.setOption({tooltip:{trigger:"axis",axisPointer:{type:"shadow"}},radar:{radius:"66%",center:["50%","42%"],splitNumber:8,splitArea:{areaStyle:{color:"rgba(127,95,132,.3)",opacity:1,shadowBlur:45,shadowColor:"rgba(0,0,0,.5)",shadowOffsetX:0,shadowOffsetY:15}},indicator:[{name:"Sales",max:1e4},{name:"Administration",max:2e4},{name:"Information Techology",max:2e4},{name:"Customer Support",max:2e4},{name:"Development",max:2e4},{name:"Marketing",max:2e4}]},legend:{left:"center",bottom:"10",data:["Allocated Budget","Expected Spending","Actual Spending"]},series:[{type:"radar",symbolSize:0,areaStyle:{normal:{shadowBlur:13,shadowColor:"rgba(0,0,0,.2)",shadowOffsetX:0,shadowOffsetY:10,opacity:1}},data:[{value:[5e3,7e3,12e3,11e3,15e3,14e3],name:"Allocated Budget"},{value:[4e3,9e3,15e3,15e3,13e3,11e3],name:"Expected Spending"},{value:[5500,11e3,12e3,15e3,12e3,12e3],name:"Actual Spending"}],animationDuration:o}]})}}},d=c,h=e("cba8"),u=Object(h["a"])(d,n,i,!1,null,null,null);a["default"]=u.exports},"0b9b":function(t,a,e){},"1e4b":function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"dashboard-editor-container"},[e("div",{staticClass:"dashboard-promote"}),t._v(" "),e("panel-group",{attrs:{"panel-data":t.panelData},on:{handleSetLineChartData:t.handleSetLineChartData}}),t._v(" "),e("el-row",{staticStyle:{background:"#fff",padding:"16px 16px 0","margin-bottom":"32px"}},[e("line-chart",{attrs:{"chart-data":t.lineChartData}})],1)],1)},i=[],s=(e("1bc7"),e("7ded")),r=e("fbc4"),l=e("eab4"),o=(e("0a5c"),e("d153"),e("9488"),{newVisitis:{expectedData:[100,120,161,134,105,160,161],actualData:[120,82,91,154,162,140,145]}}),c={name:"Index",components:{PanelGroup:r["default"],LineChart:l["default"]},data:function(){return{panelData:{goods_total:0,order_total:0,total_price:0,refund_total:0},lineChartData:{moneyData:[],actualData:[],maxChannelData:0,maxMoneyData:0,months:[]}}},created:function(){this.GetStatistics()},methods:{GetStatistics:function(){var t=this;Object(s["b"])().then((function(a){var e=[],n=[],i=[];a.data&&a.data.line&&a.data.line.length>0&&a.data.line.forEach((function(t,a){e.unshift(t.price),i.unshift(t.date),n.unshift(t.count)}));for(var s=t.lineChartData.maxChannelData,r=1;r<n.length;r++)n[r]>s&&(s=n[r]);t.lineChartData.maxChannelData=s;var l=t.lineChartData.maxMoneyData;for(r=1;r<e.length;r++)e[r]>l&&(l=e[r]);t.lineChartData.maxMoneyData=l,t.lineChartData.moneyData=e,t.lineChartData.actualData=n,t.lineChartData.months=i,t.panelData.goods_total=a.data.goods_total,t.panelData.refund_total=a.data.rettotal,t.panelData.order_total=a.data.order_total.count,t.panelData.total_price=a.data.order_total.total_price/100}))},handleSetLineChartData:function(t){this.lineChartData=o[t]}}},d=c,h=(e("74f2"),e("cba8")),u=Object(h["a"])(d,n,i,!1,null,"277bbc74",null);a["default"]=u.exports},"74f2":function(t,a,e){"use strict";e("0b9b")},"89eb":function(t,a,e){"use strict";e("d8d2")},9488:function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{class:t.className,style:{height:t.height,width:t.width}})},i=[],s=e("24ce"),r=e.n(s),l=e("feb2");e("6cbb");var o=6e3,c={mixins:[l["default"]],props:{className:{type:String,default:"chart"},width:{type:String,default:"100%"},height:{type:String,default:"300px"}},data:function(){return{chart:null}},mounted:function(){var t=this;this.$nextTick((function(){t.initChart()}))},beforeDestroy:function(){this.chart&&(this.chart.dispose(),this.chart=null)},methods:{initChart:function(){this.chart=r.a.init(this.$el,"macarons"),this.chart.setOption({tooltip:{trigger:"axis",axisPointer:{type:"shadow"}},grid:{top:10,left:"2%",right:"2%",bottom:"3%",containLabel:!0},xAxis:[{type:"category",data:["Mon","Tue","Wed","Thu","Fri","Sat","Sun"],axisTick:{alignWithLabel:!0}}],yAxis:[{type:"value",axisTick:{show:!1}}],series:[{name:"pageA",type:"bar",stack:"vistors",barWidth:"60%",data:[79,52,200,334,390,330,220],animationDuration:o},{name:"pageB",type:"bar",stack:"vistors",barWidth:"60%",data:[80,52,200,334,390,330,220],animationDuration:o},{name:"pageC",type:"bar",stack:"vistors",barWidth:"60%",data:[30,52,200,334,390,330,220],animationDuration:o}]})}}},d=c,h=e("cba8"),u=Object(h["a"])(d,n,i,!1,null,null,null);a["default"]=u.exports},d153:function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{class:t.className,style:{height:t.height,width:t.width}})},i=[],s=e("24ce"),r=e.n(s),l=e("feb2");e("6cbb");var o={mixins:[l["default"]],props:{className:{type:String,default:"chart"},width:{type:String,default:"100%"},height:{type:String,default:"300px"}},data:function(){return{chart:null}},mounted:function(){var t=this;this.$nextTick((function(){t.initChart()}))},beforeDestroy:function(){this.chart&&(this.chart.dispose(),this.chart=null)},methods:{initChart:function(){this.chart=r.a.init(this.$el,"macarons"),this.chart.setOption({tooltip:{trigger:"item",formatter:"{a} <br/>{b} : {c} ({d}%)"},legend:{left:"center",bottom:"10",data:["Industries","Technology","Forex","Gold","Forecasts"]},series:[{name:"WEEKLY WRITE ARTICLES",type:"pie",roseType:"radius",radius:[15,95],center:["50%","38%"],data:[{value:320,name:"Industries"},{value:240,name:"Technology"},{value:149,name:"Forex"},{value:100,name:"Gold"},{value:59,name:"Forecasts"}],animationEasing:"cubicInOut",animationDuration:2600}]})}}},c=o,d=e("cba8"),h=Object(d["a"])(c,n,i,!1,null,null,null);a["default"]=h.exports},d8d2:function(t,a,e){},eab4:function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{class:t.className,style:{height:t.height,width:t.width}})},i=[],s=e("24ce"),r=e.n(s),l=e("feb2");e("6cbb");var o={mixins:[l["default"]],props:{className:{type:String,default:"chart"},width:{type:String,default:"100%"},height:{type:String,default:"350px"},autoResize:{type:Boolean,default:!0},chartData:{type:Object,required:!0}},data:function(){return{chart:null}},watch:{chartData:{deep:!0,handler:function(t){this.setOptions(t)}}},mounted:function(){var t=this;this.$nextTick((function(){t.initChart()}))},beforeDestroy:function(){this.chart&&(this.chart.dispose(),this.chart=null)},methods:{moneyMax:function(t){var a=2,e=!0,n=String(t).length;if(n<=a)return t;var i=Math.pow(10,a);return e?Math.ceil(t/i)*i:Math.floor(t/i)*i},numberMax:function(t,a){var e="";e=t>=a?t:a;var n=2,i=!0,s=String(e).length;if(s<=n)return e;var r=Math.pow(10,n);return i?Math.ceil(e/r)*r:Math.floor(e/r)*r},initChart:function(){this.chart=r.a.init(this.$el,"macarons"),this.chartData.months&&this.setOptions(this.chartData)},setOptions:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=(t.expectedData,t.actualData),e=t.moneyData,n=t.months;console.log(n),this.chart.setOption({xAxis:{data:n,boundaryGap:!1,axisTick:{show:!0}},grid:{left:10,right:10,bottom:20,top:30,containLabel:!0},tooltip:{trigger:"axis",axisPointer:{type:"cross"},padding:[5,10]},yAxis:[{type:"value",name:"数量",min:0,max:this.numberMax(this.chartData.maxAccountData,this.chartData.maxChannelData)<10?10:this.numberMax(this.chartData.maxAccountData,this.chartData.maxChannelData),interval:this.numberMax(this.chartData.maxAccountData,this.chartData.maxChannelData)<10?2:this.numberMax(this.chartData.maxAccountData,this.chartData.maxChannelData)/5,axisLabel:{formatter:"{value} "}},{type:"value",name:"收益",min:0,max:this.moneyMax(this.chartData.maxMoneyData),interval:this.moneyMax(this.chartData.maxMoneyData)/5,axisLabel:{formatter:"{value} 元"}}],legend:{data:["订单","收益"]},series:[{name:"订单",smooth:!0,type:"line",itemStyle:{normal:{color:"#3888fa",lineStyle:{color:"#3888fa",width:2},areaStyle:{color:"#f3f8ff"}}},data:a,animationDuration:2800,animationEasing:"quadraticOut"},{name:"收益",smooth:!0,type:"line",yAxisIndex:1,itemStyle:{normal:{color:"#40c9c6",lineStyle:{color:"#40c9c6",width:2},areaStyle:{color:"#f3f8ff"}}},data:e,animationDuration:2800,animationEasing:"quadraticOut"}]})}}},c=o,d=e("cba8"),h=Object(d["a"])(c,n,i,!1,null,null,null);a["default"]=h.exports},fbc4:function(t,a,e){"use strict";e.r(a);var n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("el-row",{staticClass:"panel-group",attrs:{gutter:40}},[e("el-col",{staticClass:"card-panel-col",attrs:{xs:12,sm:12,lg:6}},[e("div",{staticClass:"card-panel",on:{click:function(a){return t.handleSetLineChartData("newVisitis")}}},[e("div",{staticClass:"card-panel-icon-wrapper icon-people"},[e("svg-icon",{attrs:{"icon-class":"peoples","class-name":"card-panel-icon"}})],1),t._v(" "),e("div",{staticClass:"card-panel-description"},[e("div",{staticClass:"card-panel-text"},[t._v("\n          总商品\n        ")]),t._v(" "),e("count-to",{staticClass:"card-panel-num",attrs:{"start-val":0,"end-val":t.panelData.goods_total,duration:2600}})],1)])]),t._v(" "),e("el-col",{staticClass:"card-panel-col",attrs:{xs:12,sm:12,lg:6}},[e("div",{staticClass:"card-panel",on:{click:function(a){return t.handleSetLineChartData("messages")}}},[e("div",{staticClass:"card-panel-icon-wrapper icon-message"},[e("svg-icon",{attrs:{"icon-class":"message","class-name":"card-panel-icon"}})],1),t._v(" "),e("div",{staticClass:"card-panel-description"},[e("div",{staticClass:"card-panel-text"},[t._v("\n          总订单\n        ")]),t._v(" "),e("count-to",{staticClass:"card-panel-num",attrs:{"start-val":0,"end-val":t.panelData.order_total,duration:3e3}})],1)])]),t._v(" "),e("el-col",{staticClass:"card-panel-col",attrs:{xs:12,sm:12,lg:6}},[e("div",{staticClass:"card-panel",on:{click:function(a){return t.handleSetLineChartData("purchases")}}},[e("div",{staticClass:"card-panel-icon-wrapper icon-money"},[e("svg-icon",{attrs:{"icon-class":"money","class-name":"card-panel-icon"}})],1),t._v(" "),e("div",{staticClass:"card-panel-description"},[e("div",{staticClass:"card-panel-text"},[t._v("\n          总收入\n        ")]),t._v(" "),e("count-to",{staticClass:"card-panel-num",attrs:{"start-val":0,"end-val":t.panelData.total_price,decimals:2,duration:3200}})],1)])]),t._v(" "),e("el-col",{staticClass:"card-panel-col",attrs:{xs:12,sm:12,lg:6}},[e("div",{staticClass:"card-panel",on:{click:function(a){return t.handleSetLineChartData("shoppings")}}},[e("div",{staticClass:"card-panel-icon-wrapper icon-shopping"},[e("svg-icon",{attrs:{"icon-class":"shopping","class-name":"card-panel-icon"}})],1),t._v(" "),e("div",{staticClass:"xz-tip"},[t._v(t._s(t.panelData.refund_total<100?t.panelData.refund_total:"99+"))]),t._v(" "),e("div",{staticClass:"card-panel-description"},[e("div",{staticClass:"card-panel-text"},[t._v("\n          售后订单\n        ")]),t._v(" "),e("count-to",{staticClass:"card-panel-num",attrs:{"start-val":0,"end-val":t.panelData.refund_total,duration:3600}})],1)])])],1)},i=[],s=e("9e2e"),r=e.n(s),l={data:function(){return{}},props:{panelData:{type:Object,default:"chart"}},components:{CountTo:r.a},mounted:function(){},methods:{handleSetLineChartData:function(t){this.$emit("handleSetLineChartData",t)}}},o=l,c=(e("89eb"),e("cba8")),d=Object(c["a"])(o,n,i,!1,null,"2432b352",null);a["default"]=d.exports},feb2:function(t,a,e){"use strict";e.r(a);var n=e("ed08");a["default"]={data:function(){return{$_sidebarElm:null,$_resizeHandler:null}},mounted:function(){this.initListener()},activated:function(){this.$_resizeHandler||this.initListener(),this.resize()},beforeDestroy:function(){this.destroyListener()},deactivated:function(){this.destroyListener()},methods:{$_sidebarResizeHandler:function(t){"width"===t.propertyName&&this.$_resizeHandler()},initListener:function(){var t=this;this.$_resizeHandler=Object(n["d"])((function(){t.resize()}),100),window.addEventListener("resize",this.$_resizeHandler),this.$_sidebarElm=document.getElementsByClassName("sidebar-container")[0],this.$_sidebarElm&&this.$_sidebarElm.addEventListener("transitionend",this.$_sidebarResizeHandler)},destroyListener:function(){window.removeEventListener("resize",this.$_resizeHandler),this.$_resizeHandler=null,this.$_sidebarElm&&this.$_sidebarElm.removeEventListener("transitionend",this.$_sidebarResizeHandler)},resize:function(){var t=this.chart;t&&t.resize()}}}}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-443e47f8.e16760fa.js
+++ b/dist/static/js/chunk-443e47f8.e16760fa.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-443e47f8"],{"6b1f":function(t,e,a){"use strict";a.d(e,"f",(function(){return r})),a.d(e,"b",(function(){return n})),a.d(e,"d",(function(){return s})),a.d(e,"a",(function(){return o})),a.d(e,"h",(function(){return l})),a.d(e,"g",(function(){return d})),a.d(e,"c",(function(){return m})),a.d(e,"i",(function(){return h})),a.d(e,"e",(function(){return c}));var i=a("b775");function r(t){return Object(i["a"])({url:"/local/getOrganization",method:"get",params:t})}function n(t){return Object(i["a"])({url:"/local/organization",method:"post",data:t})}function s(t){return Object(i["a"])({url:"/local/shopbrand",method:"get",params:t})}function o(t){return Object(i["a"])({url:"/local/brands",method:"post",data:t})}function l(t){return Object(i["a"])({url:"/local/upbrands",method:"post",data:t})}function d(t){return Object(i["a"])({url:"/local/getShopInfo",method:"get",params:t})}function m(t){return Object(i["a"])({url:"/local/addShopInfo",method:"post",data:t})}function h(t){return Object(i["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function c(t){return Object(i["a"])({url:"/local/cate",method:"get",params:t})}},"79ef":function(t,e,a){"use strict";a("f608")},b176:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"fill-brand-inf"},[a("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),a("el-card",{staticClass:"box-card"},[a("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[a("el-steps",{attrs:{active:1,"align-center":"","finish-status":"success"}},[a("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),a("el-step",{attrs:{title:"填写品牌信息"}}),t._v(" "),a("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),a("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),a("div",{staticClass:"main-con"},[a("el-form",{ref:"brandForm",attrs:{model:t.brandForm,rules:t.brandRules,"label-width":"180px"}},[a("el-form-item",{attrs:{label:"经营品牌类型："}},[a("el-radio-group",{on:{change:t.chooseBrandType},model:{value:t.brandForm.brand_type,callback:function(e){t.$set(t.brandForm,"brand_type",e)},expression:"brandForm.brand_type"}},[a("el-radio",{attrs:{label:1}},[t._v("自有品牌")]),t._v(" "),a("el-radio",{attrs:{label:2}},[t._v("品牌厂商授权")]),t._v(" "),a("el-radio",{attrs:{label:3}},[t._v("无品牌")])],1)],1),t._v(" "),a("div",{directives:[{name:"show",rawName:"v-show",value:3!==t.brandForm.brand_type,expression:"brandForm.brand_type !== 3"}],staticClass:"spe-brand-text"},[t._v("\n            品牌一\n          ")]),t._v(" "),a("el-form-item",{directives:[{name:"show",rawName:"v-show",value:3!==t.brandForm.brand_type,expression:"brandForm.brand_type !== 3"}],attrs:{label:"品牌中文名：",prop:"brand_cn"}},[a("el-input",{staticStyle:{width:"400px"},attrs:{placeholder:""},model:{value:t.brandForm.brand_cn,callback:function(e){t.$set(t.brandForm,"brand_cn",e)},expression:"brandForm.brand_cn"}})],1),t._v(" "),a("el-form-item",{directives:[{name:"show",rawName:"v-show",value:3!==t.brandForm.brand_type,expression:"brandForm.brand_type !== 3"}],attrs:{label:"品牌英文名：",prop:"brand_en"}},[a("el-input",{staticStyle:{width:"400px"},attrs:{placeholder:""},model:{value:t.brandForm.brand_en,callback:function(e){t.$set(t.brandForm,"brand_en",e)},expression:"brandForm.brand_en"}})],1),t._v(" "),3!==t.brandForm.brand_type?a("el-form-item",{ref:"logoImg",attrs:{label:"品牌LOGO：",prop:"brand_logo"}},[a("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[a("div",{staticStyle:{"padding-right":"6px"}},[a("el-upload",{staticClass:"uploadData",attrs:{action:"#","list-type":"picture-card","http-request":t.uploadLogoImgs,limit:2,"on-exceed":t.showTip,"before-upload":t.beforeUpLogoImg,"on-preview":t.handlePictureCardPreview,"on-remove":t.handleRemove,"file-list":t.brandImgFileList}},[a("i",{staticClass:"el-icon-plus"})]),t._v(" "),a("el-dialog",{attrs:{visible:t.dialogVisible},on:{"update:visible":function(e){t.dialogVisible=e}}},[a("img",{attrs:{width:"100%",src:t.dialogImageUrl,alt:""}})])],1),t._v(" "),a("div",[a("span",{staticClass:"tips-text"},[a("i",{staticClass:"el-icon-warning h-warning"})])]),t._v(" "),a("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px"}},[a("span",{staticClass:"tips-text"},[t._v("必须与商标图文一致。文件大小在500KB以内，支持png,jpg格式，最多可上传2张")])])])]):t._e(),t._v(" "),a("el-form-item",{directives:[{name:"show",rawName:"v-show",value:3!==t.brandForm.brand_type,expression:"brandForm.brand_type !== 3"}],attrs:{label:"品牌商标注册号：",prop:"brand_number"}},[a("el-input",{staticStyle:{width:"400px"},attrs:{placeholder:""},model:{value:t.brandForm.brand_number,callback:function(e){t.$set(t.brandForm,"brand_number",e)},expression:"brandForm.brand_number"}})],1),t._v(" "),a("el-form-item",{directives:[{name:"show",rawName:"v-show",value:3!==t.brandForm.brand_type,expression:"brandForm.brand_type !== 3"}],attrs:{label:"品牌类型：",prop:"brand_range"}},[a("el-radio-group",{model:{value:t.brandForm.brand_range,callback:function(e){t.$set(t.brandForm,"brand_range",e)},expression:"brandForm.brand_range"}},[a("el-radio",{attrs:{label:1}},[t._v("国内品牌")]),t._v(" "),a("el-radio",{attrs:{label:2}},[t._v("国外品牌")])],1)],1),t._v(" "),2===t.brandForm.brand_type?a("el-form-item",{attrs:{label:"品牌方授权书：",prop:"brand_auth"}},[a("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[a("div",{staticStyle:{"padding-right":"6px"}},[a("el-upload",{staticClass:"uploadData",attrs:{action:"#","list-type":"picture-card","http-request":t.uploadFactoryImgs,"before-upload":t.beforeUpImg,"on-preview":t.handlePictureCardPreview2,"on-remove":t.handleRemove2,"file-list":t.factoryImgFileList}},[a("i",{staticClass:"el-icon-plus"})]),t._v(" "),a("el-dialog",{attrs:{visible:t.dialogVisible2},on:{"update:visible":function(e){t.dialogVisible2=e}}},[a("img",{attrs:{width:"100%",src:t.dialogImageUrl2,alt:""}})])],1),t._v(" "),a("div",[a("span",{staticClass:"tips-text"},[a("i",{staticClass:"el-icon-warning h-warning"})])]),t._v(" "),a("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px"}},[a("span",{staticClass:"tips-text"},[t._v("品牌方给予企业的授权书。文件大小在2MB以内，支持png,jpg格式")])])])]):t._e(),t._v(" "),2===t.brandForm.brand_type?a("el-form-item",{attrs:{label:"授权有效期至：",prop:"brand_auth_time"}},[a("el-date-picker",{staticStyle:{width:"300px"},attrs:{type:"date",placeholder:"选择日期"},on:{change:t.validityConcrete},model:{value:t.validityConcreteTime,callback:function(e){t.validityConcreteTime=e},expression:"validityConcreteTime"}}),t._v(" "),a("el-checkbox",{staticStyle:{"padding-left":"15px"},on:{change:t.validityLongTerm},model:{value:t.validityLongTermVal,callback:function(e){t.validityLongTermVal=e},expression:"validityLongTermVal"}},[t._v("长期\n            ")])],1):t._e(),t._v(" "),3!==t.brandForm.brand_type?a("el-form-item",{attrs:{label:"品牌经营授权：",prop:"brand_business_auth"}},[a("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[a("div",{staticStyle:{"padding-right":"6px"}},[a("el-upload",{staticClass:"uploadData",attrs:{action:"#","http-request":t.uploadShopImgs,"list-type":"picture-card",limit:2,"on-exceed":t.showTip,"before-upload":t.beforeUpImg,"on-preview":t.handlePictureCardPreview3,"on-remove":t.handleRemove3,"file-list":t.shopImgFileList}},[a("i",{staticClass:"el-icon-plus"})]),t._v(" "),a("el-dialog",{attrs:{visible:t.dialogVisible3},on:{"update:visible":function(e){t.dialogVisible3=e}}},[a("img",{attrs:{width:"100%",src:t.dialogImageUrl3,alt:""}})])],1),t._v(" "),a("div",[a("span",{staticClass:"tips-text"},[a("i",{staticClass:"el-icon-warning h-warning"})])]),t._v(" "),a("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px"}},[a("span",{staticClass:"tips-text"},[t._v("授权在云仓平台经营此品牌。文件大小在2MB以内，支持png,jpg格式，最多可上传2张")])])])]):t._e(),t._v(" "),a("el-form-item",{directives:[{name:"show",rawName:"v-show",value:3!==t.brandForm.brand_type,expression:"brandForm.brand_type !== 3"}],attrs:{label:""}},[a("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[a("a",{staticClass:"download-Template-btn",attrs:{href:t.downTemplatehttp}},[a("i",{staticClass:"el-icon-download"}),t._v("下载模板")]),t._v(" "),a("div",[a("span",{staticClass:"tips-text"},[a("i",{staticClass:"el-icon-warning h-warning"})])]),t._v(" "),a("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px"}},[a("span",{staticClass:"tips-text"},[t._v("请您点击下载授权书模板，打印并签字盖章，拍照上传。\n              如暂时无法上传该授权，可选择【无品牌】，稍后在店铺信息里面完善品牌信息")])])])]),t._v(" "),a("el-form-item",{directives:[{name:"show",rawName:"v-show",value:3!==t.brandForm.brand_type,expression:"brandForm.brand_type !== 3"}]},[a("el-button",{staticStyle:{"margin-right":"40px"},attrs:{type:"primary"},on:{click:t.back}},[t._v("上一步")]),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.next("brandForm")}}},[t._v("下一步")])],1)],1),t._v(" "),a("div",{directives:[{name:"show",rawName:"v-show",value:!t.hasBrand,expression:"!hasBrand"}],staticClass:"no-brand"},[a("p",[t._v("您当前选择的是无品牌")]),t._v(" "),a("p",[t._v("这不会影响您入驻的审核")]),t._v(" "),a("p",[t._v("入驻成功后，您可以在店铺信息里，添加您的品牌")]),t._v(" "),a("div",{staticClass:"no-brand-btn"},[a("el-button",{staticStyle:{"margin-right":"40px"},attrs:{type:"primary"},on:{click:t.back}},[t._v("上一步")]),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:t.noBrandNext}},[t._v("下一步")])],1)])],1)])],1)},r=[],n=(a("28a5"),a("6b1f")),s={name:"FillBrandInf",data:function(){var t=this,e=function(e,a,i){2===t.brandForm.brand_type&&null===t.validityConcreteTime&&!1===t.validityLongTermVal?i(new Error("授权有效期具体时间和长期必须填写其中一个")):i()},a=function(e,a,i){t.brandImgFileList.length>0?i():0===t.brandImgFileList.length&&i(new Error("品牌logo图片至少上传一张"))},i=function(e,a,i){t.shopImgFileList.length>0?i():0===t.shopImgFileList.length&&i(new Error("品牌logo图片至少上传一张"))};return{shopTemplatehttp:"http://img3.jxhh.com/shop/brand.doc",factoryTemplatehttp:"http://img3.jxhh.com/shop/factory.doc",hasBrand:!0,dialogImageUrl:"",dialogVisible:!1,dialogImageUrl2:"",dialogVisible2:!1,dialogImageUrl3:"",dialogVisible3:!1,validityConcreteTime:null,validityLongTermVal:!1,downTemplatehttp:"",brandImgFileList:[],factoryImgFileList:[],shopImgFileList:[],brandForm:{id:0,brand_type:1,brand_cn:"",brand_en:"",brand_logo:"",brand_number:"",brand_range:"",brand_auth_time:"",brand_auth:"",brand_business_auth:""},brandRules:{brand_cn:[{required:!0,message:"品牌中文名称不能为空",trigger:"blur"}],brand_logo:[{required:!0,message:"品牌logo图片至少上传一张",validator:a}],brand_range:[{required:!0,message:"品牌类型需要选择其一",trigger:"blur"}],brand_auth:[{required:!0,message:"品牌授权至少上传一张图片"}],brand_auth_time:[{validator:e,required:!0,trigger:"change"}],brand_business_auth:[{required:!0,message:"品牌经营授权至少上传一张图片",validator:i}]}}},watch:{factoryImgFileList:{handler:function(t,e){var a=this;2===this.brandForm.brand_type&&(this.$refs.brandForm.validateField("brand_auth"),0!==t.length&&this.$nextTick((function(){a.$refs.brandForm.clearValidate("brand_auth")})))},deep:!0}},created:function(){this.getBrands()},mounted:function(){this.downTemplatehttp=this.factoryTemplatehttp},methods:{beforeUpImg:function(t){var e=t.size/1024/1024>2;return"image/png"!==t.type&&"image/jpg"!==t.type&&"image/jpeg"!=t.type?(this.$message({message:"上传图片格式只支持jpg/png格式",type:"warning"}),!1):e?(this.$message({message:"上传图片大小不能超过2M",type:"warning"}),!1):void 0},beforeUpLogoImg:function(t){var e=t.size/1024>500;return"image/png"!==t.type&&"image/jpg"!==t.type&&"image/jpeg"!=t.type?(this.$message({message:"上传图片格式只支持jpg/png格式",type:"warning"}),!1):e?(this.$message({message:"上传图片大小不能超过500 kb",type:"warning"}),!1):void 0},uploadLogoImgs:function(t){var e=this;this.getBase64(t.file).then((function(t){var a=t.split(",");e.Base64img=a[1];var i={img_data:e.Base64img};Object(n["i"])(i).then((function(t){t&&1===t.code&&(e.brandImgFileList.push({url:t.data.image_url}),e.$message({type:"success",message:"上传成功"}),e.$refs.brandForm.clearValidate("brand_logo"))}))}))},uploadShopImgs:function(t){var e=this;this.getBase64(t.file).then((function(t){var a=t.split(",");e.Base64img=a[1];var i={img_data:e.Base64img};Object(n["i"])(i).then((function(t){t&&1===t.code&&(e.shopImgFileList.push({url:t.data.image_url}),e.$message({type:"success",message:"上传成功"}),e.$refs.brandForm.clearValidate("brand_business_auth"))}))}))},uploadFactoryImgs:function(t){var e=this;this.getBase64(t.file).then((function(t){var a=t.split(",");e.Base64img=a[1];var i={img_data:e.Base64img};Object(n["i"])(i).then((function(t){t&&1===t.code&&(e.factoryImgFileList.push({url:t.data.image_url}),e.$message({type:"success",message:"上传成功"}))}))}))},getBase64:function(t){return new Promise((function(e,a){var i=new FileReader,r="";i.readAsDataURL(t),i.onload=function(){r=i.result},i.onerror=function(t){a(t)},i.onloadend=function(){e(r)}}))},chooseBrandType:function(){this.downTemplatehttp="",1===this.brandForm.brand_type?(this.hasBrand=!0,this.downTemplatehttp=this.shopTemplatehttp):2===this.brandForm.brand_type?(this.hasBrand=!0,this.downTemplatehttp=this.factoryTemplatehttp,this.factoryImgFileList=[],this.brandForm.brand_auth="",this.brand_auth_time="",this.validityConcreteTime=null,this.validityLongTermVal=!1):3===this.brandForm.brand_type&&(this.hasBrand=!1)},clearImg:function(){this.brandImgFileList=[],this.factoryImgFileList=[],this.shopImgFileList=[],this.brandForm.brand_logo="",this.brandForm.brand_auth="",this.brandForm.brand_business_auth="",this.brand_auth_time="",this.validityConcreteTime=null,this.validityLongTermVal=!1},handlePictureCardPreview:function(t){this.dialogImageUrl=t.url,this.dialogVisible=!0},handleRemove:function(t,e){for(var a=0;a<this.brandImgFileList.length;a++)t.uid===this.brandImgFileList[a].uid&&this.brandImgFileList.splice(a,1)},handlePictureCardPreview2:function(t){this.dialogImageUrl2=t.url,this.dialogVisible2=!0},handleRemove2:function(t){for(var e=0;e<this.factoryImgFileList.length;e++)t.uid===this.factoryImgFileList[e].uid&&this.factoryImgFileList.splice(e,1)},handlePictureCardPreview3:function(t){this.dialogImageUrl3=t.url,this.dialogVisible3=!0},handleRemove3:function(t){for(var e=0;e<this.shopImgFileList.length;e++)t.uid===this.shopImgFileList[e].uid&&this.shopImgFileList.splice(e,1)},validityConcrete:function(){this.validityConcreteTime&&(this.validityLongTermVal=!1)},validityLongTerm:function(){this.validityLongTermVal&&(this.validityConcreteTime=null)},getBrands:function(){var t=this;Object(n["d"])().then((function(e){if(1===e.code&&e.data){t.brandForm=e.data[0];var a={},i=[];if(t.brandForm.brand_logo.indexOf(",")>0){i=t.brandForm.brand_logo.split(",");for(var r=0;r<i.length;r++)a={},a.url=i[r],t.brandImgFileList.push(a)}else a.url=t.brandForm.brand_logo,t.brandImgFileList=[],t.brandImgFileList.push(a);var n={},s=[];if(t.brandForm.brand_auth.indexOf(",")>0){s=t.brandForm.brand_auth.split(",");for(var o=0;o<s.length;o++)n={},n.url=s[o],t.factoryImgFileList.push(n)}else n.url=t.brandForm.brand_auth,t.factoryImgFileList=[],t.factoryImgFileList.push(n);var l={},d=[];if(t.brandForm.brand_business_auth.indexOf(",")>0){d=t.brandForm.brand_business_auth.split(",");for(var m=0;m<d.length;m++)l={},l.url=d[m],t.shopImgFileList.push(l)}else l.url=t.brandForm.brand_business_auth,t.shopImgFileList=[],t.shopImgFileList.push(l);0===t.brandForm.brand_auth_time?t.validityLongTermVal=!0:t.validityConcreteTime=t.toStandTime(t.brandForm.brand_auth_time)}}))},toStandTime:function(t){var e=new Date(1e3*t),a=e.getFullYear()+"-",i=(e.getMonth()+1<10?"0"+(e.getMonth()+1):e.getMonth()+1)+"-",r=(e.getDate()<10?"0"+e.getDate():e.getDate())+" ",n=(e.getHours()<10?"0"+e.getHours():e.getHours())+":",s=(e.getMinutes()<10?"0"+e.getMinutes():e.getMinutes())+":",o=e.getSeconds()<10?"0"+e.getSeconds():e.getSeconds();return a+i+r+n+s+o},showTip:function(t,e){this.$message({message:"最多上传2张图片",type:"warning"})},back:function(){this.$router.push("/fillMainInf")},next:function(t){var e=this;if(this.validityLongTermVal?this.brandForm.brand_auth_time=this.validityLongTermVal-0-1:!1===this.validityLongTermVal&&this.validityConcreteTime?this.brandForm.brand_auth_time=new Date(this.validityConcreteTime).getTime()/1e3:this.brandForm.brand_auth_time="",this.brandImgFileList.length>0){for(var a=0;a<this.brandImgFileList.length;a++)0===a?this.brandForm.brand_logo=this.brandImgFileList[a].url:this.brandForm.brand_logo+=","+this.brandImgFileList[a].url;this.brandForm.brand_register_cert=this.brandImgFileList[0].url}if(this.factoryImgFileList.length>0)for(var i=0;i<this.factoryImgFileList.length;i++)0===i?this.brandForm.brand_auth=this.factoryImgFileList[i].url:this.brandForm.brand_auth+=","+this.factoryImgFileList[i].url;if(this.shopImgFileList.length>0)for(var r=0;r<this.shopImgFileList.length;r++)0===r?this.brandForm.brand_business_auth=this.shopImgFileList[r].url:this.brandForm.brand_business_auth+=","+this.shopImgFileList[r].url;this.$refs[t].validate((function(t){if(t){var a={},i=[];i.push(e.brandForm),0===e.brandForm.id?(a.brands=i,Object(n["a"])(a).then((function(t){e.$router.push("/fillShopInf")}))):Object(n["h"])(i).then((function(t){1===t.code?e.$router.push("/fillShopInf"):0===t.code&&(t.msg?e.$message({message:t.msg,type:"error"}):e.$message({message:"数据出错啦！",type:"error"}))}))}}))},noBrandNext:function(){this.$router.push("/fillShopInf")}}},o=s,l=(a("79ef"),a("2877")),d=Object(l["a"])(o,i,r,!1,null,"bf858674",null);e["default"]=d.exports},f608:function(t,e,a){}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-5f18f729.91b8ccb6.js
+++ b/dist/static/js/chunk-5f18f729.91b8ccb6.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5f18f729"],{"85ee":function(v,_,t){v.exports=t.p+"static/img/logo_white_sm.9191b2e1.png"},a026:function(v,_,t){"use strict";t("d8f2")},a291:function(v,_,t){"use strict";t.r(_);var n=function(){var v=this,_=v.$createElement,t=v._self._c||_;return t("div",{staticClass:"entry"},[v._m(0),v._v(" "),t("el-card",{staticClass:"box-card"},[t("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[t("el-steps",{attrs:{active:0,"align-center":"","finish-status":"success"}},[t("el-step",{attrs:{title:"填写主体信息"}}),v._v(" "),t("el-step",{attrs:{title:"填写品牌信息"}}),v._v(" "),t("el-step",{attrs:{title:"填写店铺信息"}}),v._v(" "),t("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),v._v(" "),t("div",{staticClass:"entry-main"},[t("div",{staticClass:"main-text"},[t("h2",[v._v("胜天半子供应链商家入驻协议书")]),v._v(" "),t("p",[v._v("\n            甲方：北京胜天半子科技有限公司（以下简称“甲方或者平台”）"),t("br")]),v._v(" "),t("p",[v._v("乙方：（以下简称“乙方”）")]),v._v(" "),t("p",[v._v("\n            甲乙双方本着互惠互利的双赢策略，根据甲方商城入驻条件，乙方申请入驻甲方商城，并完全接受甲方的规范，本着自愿、平等、公正原则，甲乙双方在协商一致的基础上达成如下协议：\n          ")]),v._v(" "),t("p",[v._v("\n            乙方可在平台上进行商铺发布及管理、推广商品、达成交易意向。\n          ")]),v._v(" "),t("h4",[v._v("一、入驻商家基本条件")]),v._v(" "),t("p",[v._v("\n            1、有良好的合作意愿，能提供优质的商品，保证合作的顺利进行，并保证提供良好的售后服务；\n          ")]),v._v(" "),t("p",[v._v("\n            2、 乙方申请成为平台入驻商家，应该满足以下条件：\n            (1) 乙方已依照中华人民共和国法律注册并领取合法有效的营业执照及其他经营许可；\n            (2) 乙方申请经营的商品或服务合法，资质齐全；\n            (3)乙方同意本协议及平台相关规则并同意缴纳平台履约保证金1万-5万具体见附件\n            "),t("a",{staticClass:"download-Template-btn",attrs:{target:"_blank",href:v.downTemplatehttp}},[v._v("《平台类目费率收取标准》")]),v._v("\n            。 (4) 乙方须保证所提交予乙方的所有材料真实、准确、合法、有效。如相关材料有变更或更新时应及时通知甲方，若导致乙方不符合本协议所规定入驻条件的，甲方有权单方全部或部分限制乙方经营，直至终止本协议。\n          ")]),v._v(" "),t("p",[v._v("\n            3、乙方应在签订本协议时向甲方提供（经甲方认可的）包括但不限于以下证明材料复印件：\n            (1)营业执照(包括个体户营业执照)、税务登记证；\n            (2)拥有注册商标或者拥有正规的品牌授权书。\n            (3)商品质检报告、报关单、检验检疫证书、产品来源地证明等。\n          ")]),v._v(" "),t("p",[v._v("\n            4、乙方支持并同意所入驻商品满足甲方一件代发的条件。\n          ")]),v._v(" "),t("p",[v._v("\n            5、平台相关费用及货款结算周期:\n            (1)平台服务费：按照乙方确定的平台供货价根据商品不同类目收取1%-10%平台服务费，具体类目收费标准见附件《平台类目费率收取标准》。\n            (2) 货款结算手续费：按照实际结算货款收取0.1%。\n            (3) 货款结算周期：自乙方发货后15天。\n            (4)如出现因快递物流等因素而造成的商品问题，则以快递物流赔偿协议界定责任人。\n          ")]),v._v(" "),t("h4",[v._v("二、平台入驻开通流程")]),v._v(" "),t("p",[v._v("1、乙方注册甲方平台账号；")]),v._v(" "),t("p",[v._v("2、乙方阅读并在线签署平台入驻协议；")]),v._v(" "),t("p",[v._v("3、乙方填写上传公司相关资质和产品资质并经甲方审核确认")]),v._v(" "),t("p",[v._v("4、甲方审核通过后，乙方即可上传商品信息及确定价格体系；")]),v._v(" "),t("p",[v._v("5、甲方审核通过即上线运营；")]),v._v(" "),t("h4",[v._v("三、乙方的声明和保证")]),v._v(" "),t("p",[v._v("1、乙方须在接到订单之后的48小时内及时发货。乙方应自行解决因商品质量及运输等问题引起的客户投诉及索赔事件，并承担由此产生的经济损失和涉及的其他一切法律后果。")]),v._v(" "),t("p",[v._v("2、为方便乙方线上产品的销售，乙方需自行向甲方提供品牌线上销售产品的相关图片、文字描述、必要的商品技术说明、产品培训等信息资料，该资料乙方应当保证真实、准确、有效，且根据甲方需求准备其他的相应电子或者纸质资料。")]),v._v(" "),t("p",[v._v("3、乙方所供商品须为具备市场价格优势的来源于正规渠道的原装正品，同时具备相应资质、质检、原产地等合法证明材料。若在销售中出现商品质量、伪劣、次货等问题损害消费者权益，乙方承诺假一赔十，因产品质量问题产生的一切法律责任由乙方自行承担。")]),v._v(" "),t("p",[v._v("4、乙方在接到甲方或甲方客户提出的售后服务申请后,乙方应在4小时内予以回应，并在24小时内解决。")]),v._v(" "),t("p",[v._v("5、所有商品如无质量问题，可7天无理由退换货，商品如存在质量问题，可以协商退换货或者退款处理，并由乙方承担相关物流费用。")]),v._v(" "),t("p",[v._v("6、保证向甲方提供真实、合法、准确、有效的注册资料，并保证其诸如电子邮件地址、联系电话、联系地址、邮政编码等内容的有效性及安全性，保证甲方及其他用户可以通过上述联系方式与自己进行联系。同时，乙方也有义务在相关资料实际变更时及时更新有关注册资料。")]),v._v(" "),t("p",[v._v("7、所有商品保证合法渠道原厂正品，保障商品质量、承诺售后服务，必须提供销售发票。")]),v._v(" "),t("p",[v._v("8、乙方确保给甲方供货价为全球最低价，零售价不得高于京东或天猫在线销售价。")]),v._v(" "),t("h4",[v._v("四、双方权利义务")]),v._v(" "),t("h5",[v._v("1、甲方权利义务： ")]),v._v(" "),t("p",[v._v("(1)甲方根据本协议向乙方提供电子商务平台及相应技术支持服务，尽力维护平台的正常稳定运行，并努力提升和改进技术，对平台功能及服务进行更新、升级，不断提升平台性能和合作效率。")]),v._v(" "),t("p",[v._v("(2)在本协议有效期限内，甲方有权根据国家相关法律法规、政策及平台运营情况，对公示于平台的规则、流程、收费标准、乙方入驻条件等进行更新、调整。")]),v._v(" "),t("p",[v._v("(3)甲方方按照合同约定及时结算货款并主动续约合同有效期。")]),v._v(" "),t("p",[v._v("(4)如乙方在48小时内未发货，甲方有权利从乙方保证金或账户余额中扣除该订单金额10%的违约金。")]),v._v(" "),t("h5",[v._v("2、乙方权利义务： ")]),v._v(" "),t("p",[v._v("(1)乙方妥善保管商铺管理员账号，如因乙方保管、设置或使用不当造成的经济损失，由乙方自行承担责任。")]),v._v(" "),t("p",[v._v("(2)乙方在使用过程中如发现任何非法盗用乙方账号出现安全漏洞等情况，应立即通知甲方。")]),v._v(" "),t("p",[v._v("(3)乙方负责所售商品的快递物流、清关、发货、售后等服务，如在售后服务中跟客户出现沟通问题，乙方可以咨询甲方，甲方根据实际情况给予技术上的帮助与协调。")]),v._v(" "),t("p",[v._v("(4)乙方保证其所经营销售的产品均为合法渠道的正品正货，并提供销售发票。")]),v._v(" "),t("p",[v._v("(5)乙方保证在平台发布的商品信息真实、准确，符合平台规则及国家相关法律法规的规定，与实际出售的商品一致，不含任何夸大或虚假内容，并对商品信息承担独立的完全的法律责任。")]),v._v(" "),t("p",[v._v("(6)乙方保证对在平台经营的商品或服务拥有合法销售权，商品质量合格，符合国家相关质量标准，不侵犯任何第三方的合法权利，并对其商品质量及商品合法性独立承担全部法律责任。 ")]),v._v(" "),t("p",[v._v("(7)在协议有效期内，乙方不得向与甲方构成商业竞争关系的企业、商业机构或者组织提供有关甲方相关信息或者资料，否则对甲方造成损失的，由乙方负责赔偿。")]),v._v(" "),t("h4",[v._v("五、协议期限")]),v._v(" "),t("p",[v._v("本协议有效期为一年，自在线签订之日起生效。有效期满后，双方可视合作情况在线续签。 ")]),v._v(" "),t("h4",[v._v("六,平台结算及发票")]),v._v(" "),t("p",[v._v("1、关于结算")]),v._v(" "),t("p",[v._v("甲方自发货日起15天后将该订单金额结算到乙方平台余额账户中，乙方可向平台申请货款结算提现。")]),v._v(" "),t("p",[v._v("2、关于发票")]),v._v(" "),t("p",[v._v("乙方在申请提现前需给甲方开具增值税发票，甲方方可给予打款，打款周期为收到发票后3-5个工作日。")]),v._v(" "),t("h4",[v._v("七、银行账户信息")]),v._v(" "),t("p",[v._v("甲乙双方结算以乙方提交的对公账户为准，该对公账户需与乙方所提交的公司资质信息一致。")]),v._v(" "),t("h4",[v._v("八、协议变更、终止及违约责任 ")]),v._v(" "),t("p",[v._v("1、甲乙双方应本着诚实信用的原则履行本协议。任何一方在履约过程中采用欺诈、胁迫或者暴力的手段，另一方均可以解除本协议并要求对方赔偿由此造成的损失。")]),v._v(" "),t("p",[v._v("2、在协议执行期间，如果双方或一方认为需要终止，应提前一个月通知对方，双方在财务结算完毕、各自责任明确履行之后，方可终止协议。某方擅自终止本协议，给对方造成损失的，应赔偿对方损失。")]),v._v(" "),t("p",[v._v("3、经双方协商达成一致，可以对本协议有关条款进行变更，但应当以书面形式确认。")]),v._v(" "),t("p",[v._v("4、一方变更通讯地址或其它联系方式，应自变更之日起十日内，将变更后的地址、联系方式通知另一方，否则变更方应对此造成的一切后果承担责任；  ")]),v._v(" "),t("p",[v._v("5、如因客观情况发生重大变化，致使本协议无继续法履行的，经甲乙双方协商同意，可以变更或者终止协议的履行。")]),v._v(" "),t("h4",[v._v("九、保密条款")]),v._v(" "),t("p",[v._v("1、甲、乙双方所提供给对方的一切资料、技术和对项目的策划设计要严格保密，并只能在合作双方公司的业务范围内使用；")]),v._v(" "),t("p",[v._v("2、甲、乙双方均应对在合作过程中所知悉的对方的商业和技术秘密承担保密义务。保密条款不受本协议期限的限制。 ")]),v._v(" "),t("h4",[v._v("十 、其他约定")]),v._v(" "),t("p",[v._v("1、若发生争议，双方本着友好协商原则进行解决。如协商未果，任何一方均可依照法律规定向甲方所在地的人民法院提起诉讼。")]),v._v(" "),t("p",[v._v("2、本合同未尽事宜双方协议而定，可另行签订补充协议，与本协议同具法律效力。   ")]),v._v(" "),t("p",[v._v("3、以上条款请协议各方务必仔细阅读后在线签署，协议各方均不得以不了解协议条款或其他任何理由拒绝履行本协议。")]),v._v(" "),t("p",[v._v("4、本合同为在线线上签署，具备同等法律效力。")])])]),v._v(" "),t("div",{staticClass:"confirm-btn"},[t("p",[t("el-checkbox",{model:{value:v.isComfirm,callback:function(_){v.isComfirm=_},expression:"isComfirm"}},[v._v("我已仔细阅读并同意签署入驻协议")])],1),v._v(" "),t("p",[v._v("\n          入驻协议约定了双方的权利和义务，及其它的法律责任，请您认真阅读!\n        ")]),v._v(" "),t("p",[t("el-button",{staticStyle:{padding:"8px 30px"},attrs:{type:"primary",disabled:!v.isComfirm},on:{click:v.nextStep}},[v._v("下一步")])],1)])])],1)},e=[function(){var v=this,_=v.$createElement,n=v._self._c||_;return n("div",{staticClass:"logo-bg"},[n("img",{attrs:{src:t("85ee"),alt:""}})])}],p={name:"IndexOne",data:function(){return{isComfirm:!1,downTemplatehttp:"http://img3.jxhh.com/shop/cate_price.pdf"}},mounted:function(){},methods:{nextStep:function(){this.isComfirm&&this.$router.push("/fillMainInf")}}},s=p,i=(t("a026"),t("2877")),a=Object(i["a"])(s,n,e,!1,null,"9edd0c7a",null);_["default"]=a.exports},d8f2:function(v,_,t){}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-6c237b40.c1d15112.js
+++ b/dist/static/js/chunk-6c237b40.c1d15112.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6c237b40"],{"26fc":function(t,s,i){t.exports=i.p+"static/img/404_cloud.0f4bc32b.png"},2754:function(t,s,i){"use strict";i.r(s);var a=function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"wscn-http404-container"},[i("div",{staticClass:"wscn-http404"},[t._m(0),t._v(" "),i("div",{staticClass:"bullshit"},[i("div",{staticClass:"bullshit__oops"},[t._v("\n        404错误!\n      ")]),t._v(" "),i("div",{staticClass:"bullshit__headline"},[t._v("\n        "+t._s(t.message)+"\n      ")]),t._v(" "),i("div",{staticClass:"bullshit__info"},[t._v("\n        对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。\n      ")]),t._v(" "),i("router-link",{staticClass:"bullshit__return-home",attrs:{to:"/"}},[t._v("\n        返回首页\n      ")])],1)])])},c=[function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"pic-404"},[a("img",{staticClass:"pic-404__parent",attrs:{src:i("a36b"),alt:"404"}}),t._v(" "),a("img",{staticClass:"pic-404__child left",attrs:{src:i("26fc"),alt:"404"}}),t._v(" "),a("img",{staticClass:"pic-404__child mid",attrs:{src:i("26fc"),alt:"404"}}),t._v(" "),a("img",{staticClass:"pic-404__child right",attrs:{src:i("26fc"),alt:"404"}})])}],n={name:"Page404",computed:{message:function(){return"找不到网页！"}}},l=n,e=(i("61b6"),i("2877")),_=Object(e["a"])(l,a,c,!1,null,"279ea4b2",null);s["default"]=_.exports},"61b6":function(t,s,i){"use strict";i("bf69")},a36b:function(t,s,i){t.exports=i.p+"static/img/404.a57b6f31.png"},bf69:function(t,s,i){}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-727a03af.fe0f68ca.js
+++ b/dist/static/js/chunk-727a03af.fe0f68ca.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-727a03af"],{"92fc":function(t,n,e){t.exports=e.p+"static/img/4.3f411af6.png"},a570:function(t,n,e){"use strict";e.r(n);var i=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"entryDetails"},[e("div",{staticClass:"logo-bg"},[t.settitle&&t.settitle.topLogo?e("img",{attrs:{src:t.settitle.topLogo,alt:""}}):t._e()]),t._v(" "),t._m(0),t._v(" "),e("div",{staticClass:"confirm-btn"},[e("p",[e("el-button",{staticStyle:{padding:"8px 30px"},attrs:{type:"primary",round:""},on:{click:t.nextStep}},[t._v("\n        立即入驻  "),e("i",{staticClass:"el-icon-right"})])],1)])])},a=[function(){var t=this,n=t.$createElement,i=t._self._c||n;return i("div",{staticClass:"main-con"},[i("img",{attrs:{src:e("92fc"),alt:""}})])}],s=e("5302"),c={name:"Index",data:function(){return{channel_id:0,settitle:{bottomCopyright:"",businessHours:1,companyAddress:"",contactTel:"",custServiceQrcode:"",hotlineTel1:"",hotlineTel2:"",onlineTimeEnd:"18:00",onlineTimeStart:"09:00",recordNum:"",topLogo:""}}},created:function(){},mounted:function(){},methods:{getIndexInfo:function(){var t=this,n=window.location.host,e={domain:n};Object(s["e"])(e).then((function(n){1==n.code&&(t.channel_id=n.data.channel_id,t.getWebSite())}))},getWebSite:function(){var t=this,n={channel_ids:this.channel_id};Object(s["f"])(n).then((function(n){1==n.code&&n.data.universal_lst&&"null"!=n.data.universal_lst&&(t.settitle=n.data.universal_lst)}))},nextStep:function(){this.$router.push("/fillMainInf")}}},o=c,l=(e("b296"),e("2877")),r=Object(l["a"])(o,i,a,!1,null,"0802b7d9",null);n["default"]=r.exports},b296:function(t,n,e){"use strict";e("ca32")},ca32:function(t,n,e){}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-792fc926.c82f674a.js
+++ b/dist/static/js/chunk-792fc926.c82f674a.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-792fc926"],{a07f:function(t,e,i){},e4dd:function(t,e,i){"use strict";i.r(e);var A=function(){var t=this,e=t.$createElement,A=t._self._c||e;return A("div",{staticClass:"to-review"},[A("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),A("el-card",{staticClass:"box-card"},[A("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[A("el-steps",{attrs:{active:3,"align-center":"","finish-status":"success"}},[A("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),A("el-step",{attrs:{title:"填写品牌信息"}}),t._v(" "),A("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),A("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),A("div",{staticClass:"main"},[A("div",{staticClass:"fuck"},[A("p",[A("img",{attrs:{src:i("e9f2"),alt:""}})]),t._v(" "),A("p",[t._v("资料已提交，工作人员审核中。。。")]),t._v(" "),A("p",[t._v("您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。")]),t._v(" "),A("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系！")])])])])],1)},c=[],l={name:"ReviewSuccess",data:function(){return{}}},a=l,s=(i("fc37"),i("2877")),n=Object(s["a"])(a,A,c,!1,null,"61915260",null);e["default"]=n.exports},e9f2:function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBRDQ3NzE4OTFFQjExRUJBN0JEQjU3QzUxQ0Q3QkQzIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBRDQ3NzE5OTFFQjExRUJBN0JEQjU3QzUxQ0Q3QkQzIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkFENDc3MTY5MUVCMTFFQkE3QkRCNTdDNTFDRDdCRDMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkFENDc3MTc5MUVCMTFFQkE3QkRCNTdDNTFDRDdCRDMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4rxvAYAAAE5UlEQVR42tybe2wUVRTGL0tRIA2KFChS/kABaQRaEggEhSYIgiKgtShYJBKqBAhKRINA9Z8uAlEeTWxV5BGFNghIwUYqEkhBjBFNCNhYHoqChmoiqKFNaGwJ38meqePd2e487p2d4Ut+SXc6c3e+nTtzzzn3Tof843cLjeoDBoIsMIg/pzOkRnAN/A7OgN/AT6BB1wmlaWiTjOWDB8AIkOnweDL/HTgO9oLzKk+ug6IrfDuYB54EeaCjovNrBbVgJ/gQ/Ou1wYgCo6+AOlAGxis0K7ith8AH4HuwFHRKleGnwWnwFhgg9Os+8DY4xT3JN8P9wH7uZoOE/8oGe/j+7qPb8FTwDZgmUq8n+Fwm6TL8IvjUza+qUdTbPgcLVBuOglIRXJWDlaoMR+02lmLReRZ7NbwkJGYNlfCt58rwRLBBhE+lPHY7MpzJw05YRefey4nh7eCuEBvOAFvtGn4WTBDh1xRQkMxwFw7fbhVtlGNv2fDLifp+SNUXLE5kOJ0zn6DrOlgNLtjcfzn33DjDc8GdATdbA3LBCvAM58t2HmCFVoYLA26WcuFHwVn+nOvg2DjD94ORATVKJZ4xYL1p2zvgPQfFhgdFrLbWZjhfQfVDhygTGgW+Nm37CCxy2E4ap5NtJvMCaJau4iPgL9O23RwnuNE4w3BmALvzq/JwImJFvAIPbY4GPehS54BuATJbBLZI294Eczy22wNkk+H+ATJLT9NKadt8HktV6F7q0vcE2OxEfhqrUn8y3DsAZudYmKV61T7F35NJhjun2OxiTkdlVYCuir8rnQx3T6HZ13n4kUWx8lgN33dHREHAsZMDl18cHkf3ZtRiO8UEr2n6gVvI7BUPDXwGZoEqDv9qbB53QFjXkml43KWxRzVGON1ya/Yx0+cGDu6jSY47x5mOlco05+NNEeFu8nm7ZFa+Lyn8a7L4H013Pg7+sfgf/VizNT8zGsjwzy4OrE7y/x380KmTtj8H6i32pwR9kw8PyYsRB5UDIWUsLyTZ5ySb3sOfN1uMtYZKuByjPdVM46vQKP5bd2FHNHa/z/Hp6nb2+xvM4MCiKsE+uZzc69ZVcMa4h0+4bISC+lKbPeJaO2mgH6Kc+ooxBh/10BDN5Xzicjw3Fr/4oS/NBQCa0W/10Fg+/2g9HRzTVfg3BdsiYnPbbYZp3cS3HhulutExB+kmRVNZPl7deiF1w0oFDQ/me2W4jWR8qfBPFcYfZsPbwJ8KGqd08yvBNaQEWqYhE0qkyxwXxBmmoWmdoi+hQOKQ4EqhpAyuYviltaDZyjBpg1C3zvE2EVtaVCRtf0n4V0O7BN41b5ANN/MJqRStojMvm1joc3Hhf8sVrRaXUu33C/Cwwi+mDOqGiM0U+DXRXm0MRckMk6ig9oPDcdVOVOaX/hAJyrqJoiN6Wj8lwqsZHMfbNkyqFfHV/zBokRFGOjVsBPYlITJLD8fy9nawE/C/AVaFwGyxnedExEFjSwJsdqHdi+IkpaPMZprQ+AKGC/0KJsvBhSrDxtg2ymp8S4Gq+FwOOjko4vJXnQ5miljJ1W9RmlfAObjj3uZl1uFjMEzEJq9/9MEoLWahZVU5XGFxJa/TLBR708q9ITz+HfFYObGqVBwGz4OhnM15epVH1YtazTz+EYF+UUvHm2l0X6/hvwP3Kt5NAQYA/pvkv1BL/nsAAAAASUVORK5CYII="},fc37:function(t,e,i){"use strict";i("a07f")}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-7c2f4fe6.ea46273c.js
+++ b/dist/static/js/chunk-7c2f4fe6.ea46273c.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7c2f4fe6"],{"6b1f":function(t,o,e){"use strict";e.d(o,"f",(function(){return r})),e.d(o,"b",(function(){return a})),e.d(o,"d",(function(){return c})),e.d(o,"a",(function(){return u})),e.d(o,"h",(function(){return i})),e.d(o,"g",(function(){return s})),e.d(o,"c",(function(){return l})),e.d(o,"i",(function(){return d})),e.d(o,"e",(function(){return h}));var n=e("b775");function r(t){return Object(n["a"])({url:"/local/getOrganization",method:"get",params:t})}function a(t){return Object(n["a"])({url:"/local/organization",method:"post",data:t})}function c(t){return Object(n["a"])({url:"/local/shopbrand",method:"get",params:t})}function u(t){return Object(n["a"])({url:"/local/brands",method:"post",data:t})}function i(t){return Object(n["a"])({url:"/local/upbrands",method:"post",data:t})}function s(t){return Object(n["a"])({url:"/local/getShopInfo",method:"get",params:t})}function l(t){return Object(n["a"])({url:"/local/addShopInfo",method:"post",data:t})}function d(t){return Object(n["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function h(t){return Object(n["a"])({url:"/local/cate",method:"get",params:t})}},"74bc":function(t,o,e){"use strict";e.r(o);var n=function(){var t=this,o=t.$createElement,e=t._self._c||o;return e("div")},r=[],a=e("5c96"),c=e("6b1f"),u=(e("b775"),{name:"Platformlogin",data:function(){return{ssourl:""}},created:function(){this.getssourl()},methods:{getssourl:function(){var t=this,o=window.location.host,e={domain:o};this.$store.dispatch("getssourl",e).then((function(o){1==o.code&&(t.ssourl=o.data.sso_url,t.gotosso())})).catch((function(){}))},gotosso:function(){var t=this,o=this.$route.query.ticket;this.$store.dispatch("Login",{ticket:o}).then((function(o){if(""!=o.token)Object(c["g"])().then((function(o){if(1===o.code)switch(o.data.state){case 0:switch(o.data.status){case 0:t.$router.push({path:"/process"});break;case 1:t.$router.push({path:"/fillBrandInf"});break;case 2:t.$router.push({path:"/fillShopInf"});break}break;case 1:t.$router.push({path:"/home/index"});break;case 2:t.$router.push({path:"/reviewing"});break;case 3:var e=o.data.Apply.content;t.$router.push({name:"reviewFail",params:{msg:e}});break}else o&&o.msg?a["Notification"].error({title:"提示：",message:o.msg}):a["Notification"].error({title:"提示：",message:"刷新浏览器后，再次登录，若仍不行，请联系我们！"})}));else{t.$store.dispatch("Statistic"),t.$store.dispatch("FedLogOut");var e=window.location.host,n=document.location.protocol,r=t;setTimeout((function(){window.location.href=n+"//"+r.ssourl+"/logout?redirect="+n+"//"+e+"/login"}),1e3)}t.loading=!1})).catch((function(){t.$store.dispatch("FedLogOut");var o=window.location.host,e=document.location.protocol;setTimeout((function(){window.location.href=e+"//"+that.ssourl+"/logout?redirect="+e+"//"+o+"/login"}),1e3),t.loading=!1}))}}}),i=u,s=e("2877"),l=Object(s["a"])(i,n,r,!1,null,null,null);o["default"]=l.exports}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-7f914c91.0c8b074a.js
+++ b/dist/static/js/chunk-7f914c91.0c8b074a.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-79f6792a"],{3746:function(e,i,t){"use strict";t.r(i);var a=function(){var e=this,i=e.$createElement,t=e._self._c||i;return t("div",{staticClass:"fill-store-inf"},[t("div",{staticClass:"logo-bg"},[e._e()]),e._v(" "),t("el-card",{staticClass:"box-card"},[t("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[t("el-steps",{attrs:{active:0,"align-center":"","finish-status":"success"}},[t("el-step",{attrs:{title:"填写主体信息"}}),e._v(" "),t("el-step",{attrs:{title:"填写品牌信息"}}),e._v(" "),t("el-step",{attrs:{title:"填写店铺信息"}}),e._v(" "),t("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),e._v(" "),t("div",{staticClass:"main-con"},[t("el-form",{ref:"mainForm",attrs:{model:e.mainForm,rules:e.mainRules,"label-width":"180px"}},[t("el-form-item",{attrs:{label:"主体类型："}},[t("el-radio-group",{model:{value:e.mainForm.organization_type,callback:function(i){e.$set(e.mainForm,"organization_type",i)},expression:"mainForm.organization_type"}},[t("el-radio",{attrs:{label:1}},[e._v("企业/公司")]),e._v(" "),t("el-radio",{attrs:{label:2}},[e._v("个体工商户")])],1)],1),e._v(" "),t("el-form-item",{attrs:{label:"执照类型：",prop:"license_type"}},[t("el-select",{staticStyle:{width:"400px"},attrs:{placeholder:"请选择..."},model:{value:e.mainForm.license_type,callback:function(i){e.$set(e.mainForm,"license_type",i)},expression:"mainForm.license_type"}},e._l(e.zzOptions,(function(e){return t("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})),1)],1),e._v(" "),t("el-form-item",{attrs:{label:"营业执照电子版：",prop:"license"}},[t("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[t("div",{staticStyle:{"padding-right":"6px"}},[t("el-upload",{staticClass:"uploadData",attrs:{action:"#","list-type":"picture-card","http-request":e.uploadLicenseImages,limit:2,"on-exceed":e.showTip,"before-upload":e.beforeUpImg,"on-preview":e.handlePictureCardPreview,"on-remove":e.handleRemove,"file-list":e.licenseImgFileList}},[t("i",{staticClass:"el-icon-plus"})]),e._v(" "),t("el-dialog",{attrs:{visible:e.dialogVisible},on:{"update:visible":function(i){e.dialogVisible=i}}},[t("img",{attrs:{width:"100%",src:e.dialogImageUrl,alt:""}})])],1),e._v(" "),t("div",[t("span",{staticClass:"tips-text"},[t("i",{staticClass:"el-icon-warning h-warning"})])]),e._v(" "),t("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px"}},[t("span",{staticClass:"tips-text"},[e._v("图片大小在2MB以内，支持png,jpg格式，最多可上传2张")])])])]),e._v(" "),t("el-form-item",{attrs:{label:"企业名称：",prop:"organization_name","inline-message":"true"}},[t("el-input",{staticStyle:{width:"400px"},model:{value:e.mainForm.organization_name,callback:function(i){e.$set(e.mainForm,"organization_name",i)},expression:"mainForm.organization_name"}}),e._v(" "),t("span",{staticClass:"tips-text"},[t("i",{staticClass:"el-icon-warning h-warning"}),e._v("请按照营业执照上登记的完整名称填写")])],1),e._v(" "),t("el-form-item",{attrs:{label:"营业执照详细地址：",prop:"organization_address"}},[t("el-input",{staticStyle:{width:"400px"},model:{value:e.mainForm.organization_address,callback:function(i){e.$set(e.mainForm,"organization_address",i)},expression:"mainForm.organization_address"}}),e._v(" "),t("span",{staticClass:"tips-text"},[t("i",{staticClass:"el-icon-warning h-warning"}),e._v("请按照营业执照上的详细地址填写")])],1),e._v(" "),t("el-form-item",{attrs:{gutter:20,label:"营业期限：",prop:"license_expires_time"}},[t("el-date-picker",{staticStyle:{width:"300px"},attrs:{type:"date",placeholder:"选择日期",disabled:e.isConcretePeriod},on:{change:e.periodConcrete},model:{value:e.periodConcreteTime,callback:function(i){e.periodConcreteTime=i},expression:"periodConcreteTime"}}),e._v(" "),t("el-checkbox",{staticStyle:{"padding-left":"15px"},attrs:{disabled:e.isPeriodDisabled},on:{change:e.periodLongTerm},model:{value:e.periodLongTermVal,callback:function(i){e.periodLongTermVal=i},expression:"periodLongTermVal"}},[e._v("长期\n            ")]),e._v(" "),t("span",{staticClass:"tips-text"},[t("i",{staticClass:"el-icon-warning h-warning"}),e._v("具体时间和长期，二者必填一个")])],1),e._v(" "),t("el-form-item",{attrs:{label:"法定代表人证件类型：",prop:"idcard_type"}},[t("el-select",{staticStyle:{width:"400px"},attrs:{placeholder:"请选择..."},model:{value:e.mainForm.idcard_type,callback:function(i){e.$set(e.mainForm,"idcard_type",i)},expression:"mainForm.idcard_type"}},e._l(e.idcardTypeOptions,(function(e){return t("el-option",{key:e.value,attrs:{label:e.label,value:e.value}})})),1)],1),e._v(" "),t("el-form-item",{attrs:{label:"法定代表人姓名：",prop:"real_name"}},[t("el-input",{staticStyle:{width:"400px"},model:{value:e.mainForm.real_name,callback:function(i){e.$set(e.mainForm,"real_name",i)},expression:"mainForm.real_name"}}),e._v(" "),t("span",{staticClass:"tips-text"},[t("i",{staticClass:"el-icon-warning h-warning"}),e._v("请按照营业执照上登记的法人填写")])],1),e._v(" "),t("el-form-item",{attrs:{label:"法定代表人证件号：",prop:"idcard_number"}},[t("el-input",{staticStyle:{width:"400px"},model:{value:e.mainForm.idcard_number,callback:function(i){e.$set(e.mainForm,"idcard_number",i)},expression:"mainForm.idcard_number"}})],1),e._v(" "),t("el-form-item",{attrs:{label:"有效期至：",prop:"idcard_expires_time"}},[t("el-date-picker",{staticStyle:{width:"300px"},attrs:{type:"date",placeholder:"选择日期"},on:{change:e.validityConcrete},model:{value:e.validityConcreteTime,callback:function(i){e.validityConcreteTime=i},expression:"validityConcreteTime"}}),e._v(" "),t("el-checkbox",{staticStyle:{"padding-left":"15px"},on:{change:e.validityLongTerm},model:{value:e.validityLongTermVal,callback:function(i){e.validityLongTermVal=i},expression:"validityLongTermVal"}},[e._v("长期\n            ")])],1),e._v(" "),t("el-form-item",{attrs:{label:"法人证件电子版：",prop:"idcard_front"}},[t("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[t("div",{staticStyle:{"padding-right":"6px"}},[t("el-upload",{staticClass:"uploadData",attrs:{"list-type":"picture-card",action:"#",limit:2,"on-exceed":e.showTip,"before-upload":e.beforeUpImg,"http-request":e.uploadIdcardImages,"on-preview":e.handlePictureCardPreview2,"on-remove":e.handleRemove2,"file-list":e.idcardImgFileList}},[t("i",{staticClass:"el-icon-plus"})]),e._v(" "),t("el-dialog",{attrs:{visible:e.dialogVisible2},on:{"update:visible":function(i){e.dialogVisible2=i}}},[t("img",{attrs:{width:"100%",src:e.dialogImageUrl2,alt:""}})])],1),e._v(" "),t("div",[t("span",{staticClass:"tips-text"},[t("i",{staticClass:"el-icon-warning h-warning"})])]),e._v(" "),t("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px"}},[t("span",{staticClass:"tips-text"},[e._v("请按顺序分别上传正面（照片面）和反面（国徽面）电子版图片,文件大小在 2MB以内，支持png,jpg格式，最多可上传2张")])])])]),e._v(" "),t("div",{staticClass:"confirm-btn"},[t("p",[t("el-button",{staticStyle:{padding:"8px 30px"},attrs:{type:"primary"},on:{click:function(i){return e.next("mainForm")}}},[e._v("下一步")])],1)])],1)],1)])],1)},r=[],n=(t("fc02"),t("6b1f")),l={name:"FillMainInf",data:function(){var e=this,i=function(i,t,a){e.licenseImgFileList.length>0?a():0===e.licenseImgFileList.length&&a(new Error("营业执照图片至少上传一张"))},t=function(i,t,a){e.idcardImgFileList.length>0?a():0===e.idcardImgFileList.length&&a(new Error("法人证件照图片至少上传一张"))},a=function(e,i,t){var a=/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;a.test(i)?t():t(new Error("法人证件号格式有误"))},r=function(i,t,a){null===e.periodConcreteTime&&!1===e.periodLongTermVal?a(new Error("营业期限具体时间和长期必须填写其中一个")):a()},n=function(i,t,a){null===e.validityConcreteTime&&!1===e.validityLongTermVal?a(new Error("有效期具体时间和长期必须填写其中一个")):a()};return{licenseImgFileList:[],idcardImgFileList:[],dialogImageUrl:"",dialogVisible:!1,dialogImageUrl2:"",dialogVisible2:!1,zzOptions:[{label:"多证合一营业执照（统一社会信用代码）",value:1},{label:"多证合一营业执照（非统一社会信用代码）",value:2}],idcardTypeOptions:[{label:"大陆身份证",value:1},{label:"护照",value:2},{label:"港奥台居民通行证",value:3},{label:"台湾居民通行证",value:4}],periodConcreteTime:null,periodLongTermVal:!1,validityConcreteTime:null,validityLongTermVal:!1,isConcretePeriod:!1,isPeriodDisabled:!1,isValidity:!0,mainForm:{organization_type:2,license_type:"",license:"",organization_name:"",organization_address:"",license_expires_time:"",idcard_type:"",real_name:"",idcard_number:"",idcard_expires_time:"",idcard_front:"",idcardback:"jiazhuangwshifanmian"},hasLicense:!1,mainRules:{license_type:[{required:!0,message:"营业执照类型不能为空",trigger:"change"}],license:[{required:!0,message:"请上传营业执照电子版",validator:i}],organization_name:[{required:!0,message:"企业名称不能为空",trigger:"blur"}],organization_address:[{required:!0,message:"营业执照地址不能为空",trigger:"blur"}],idcard_type:[{required:!0,message:"证件类型不能为空",trigger:"change"}],real_name:[{required:!0,message:"法人姓名不能为空",trigger:"blur"}],idcard_number:[{required:!0,message:"法人证件号不能为空",trigger:"blur"},{required:!0,message:"法人证件号码格式有误",validator:a,trigger:"blur"}],idcard_front:[{required:!0,message:"请上传法人证件电子版图片",validator:t}],license_expires_time:[{validator:r,required:!0,trigger:"change"}],idcard_expires_time:[{validator:n,required:!0,trigger:"change"}]}}},created:function(){this.getMain()},mounted:function(){},methods:{periodConcrete:function(){this.periodConcreteTime&&(this.periodLongTermVal=!1)},periodLongTerm:function(){this.periodLongTermVal&&(this.periodConcreteTime=null)},validityConcrete:function(){this.validityConcreteTime&&(this.validityLongTermVal=!1)},validityLongTerm:function(){this.validityLongTermVal&&(this.validityConcreteTime=null)},beforeUpImg:function(e){var i=e.size/1024/1024>2;return"image/png"!==e.type&&"image/jpg"!==e.type&&"image/jpeg"!=e.type?(this.$message({message:"上传图片格式只支持png/png格式",type:"warning"}),!1):i?(this.$message({message:"上传图片大小不能超过2M",type:"warning"}),!1):void 0},uploadLicenseImages:function(e){var i=this;this.getBase64(e.file).then((function(e){var t=e.split(",");i.Base64img=t[1];var a={img_data:i.Base64img};Object(n["i"])(a).then((function(e){e&&1===e.code&&(i.licenseImgFileList.push({url:e.data.image_url}),i.$message({type:"success",message:"上传成功"}),i.$refs.mainForm.clearValidate("license"))}))}))},handlePictureCardPreview:function(e){this.dialogImageUrl=e.url,this.dialogVisible=!0},handleRemove:function(e,i){for(var t=0;t<this.licenseImgFileList.length;t++)e.uid===this.licenseImgFileList[t].uid&&this.licenseImgFileList.splice(t,1)},uploadIdcardImages:function(e){var i=this;this.getBase64(e.file).then((function(e){var t=e.split(",");i.Base64img=t[1];var a={img_data:i.Base64img};Object(n["i"])(a).then((function(e){e&&1===e.code&&(i.idcardImgFileList.push({url:e.data.image_url}),i.$message({type:"success",message:"上传成功"}),i.$refs.mainForm.clearValidate("idcard_front"))}))}))},handlePictureCardPreview2:function(e){this.dialogImageUrl2=e.url,this.dialogVisible2=!0},handleRemove2:function(e,i){for(var t=0;t<this.idcardImgFileList.length;t++)e.uid===this.idcardImgFileList[t].uid&&this.idcardImgFileList.splice(t,1)},getMain:function(){var e=this;Object(n["f"])().then((function(i){if(1===i.code){e.resetForm("mainForm"),e.mainForm=i.data,e.mainForm.idcardback="jzwsfm";var t={},a=[];if(e.mainForm.license.indexOf(",")>0){a=e.mainForm.license.split(",");for(var r=0;r<a.length;r++)t={},t.url=a[r],e.licenseImgFileList.push(t)}else t.url=e.mainForm.license,e.licenseImgFileList=[],e.licenseImgFileList.push(t);var n={},l=[];if(e.mainForm.idcard_front.indexOf(",")>0){l=e.mainForm.idcard_front.split(",");for(var s=0;s<l.length;s++)n={},n.url=l[s],e.idcardImgFileList.push(n)}else n.url=e.mainForm.idcard_front,e.idcardImgFileList=[],e.idcardImgFileList.push(n);0===e.mainForm.idcard_expires_time?e.validityLongTermVal=!0:e.validityConcreteTime=e.toStandTime(e.mainForm.idcard_expires_time),0===e.mainForm.license_expires_time?e.periodLongTermVal=!0:e.periodConcreteTime=e.toStandTime(e.mainForm.license_expires_time)}}))},resetForm:function(e){this.$refs[e].resetFields()},getBase64:function(e){return new Promise((function(i,t){var a=new FileReader,r="";a.readAsDataURL(e),a.onload=function(){r=a.result},a.onerror=function(e){t(e)},a.onloadend=function(){i(r)}}))},toStandTime:function(e){var i=new Date(1e3*e),t=i.getFullYear()+"-",a=(i.getMonth()+1<10?"0"+(i.getMonth()+1):i.getMonth()+1)+"-",r=(i.getDate()<10?"0"+i.getDate():i.getDate())+" ",n=(i.getHours()<10?"0"+i.getHours():i.getHours())+":",l=(i.getMinutes()<10?"0"+i.getMinutes():i.getMinutes())+":",s=i.getSeconds()<10?"0"+i.getSeconds():i.getSeconds();return t+a+r+n+l+s},showTip:function(e,i){this.$message({message:"最多上传2张图片",type:"warning"})},back:function(){this.$router.push("/agreement")},next:function(e){var i=this;if(this.periodLongTermVal?this.mainForm.license_expires_time=this.periodLongTermVal-0-1:!1===this.periodLongTermVal&&this.periodConcreteTime?this.mainForm.license_expires_time=new Date(this.periodConcreteTime).getTime()/1e3:this.mainForm.license_expires_time="",this.validityLongTermVal?this.mainForm.idcard_expires_time=this.validityLongTermVal-0-1:!1===this.validityLongTermVal&&this.validityConcreteTime?this.mainForm.idcard_expires_time=new Date(this.validityConcreteTime).getTime()/1e3:this.mainForm.idcard_expires_time="",this.licenseImgFileList.length>0)for(var t=0;t<this.licenseImgFileList.length;t++)0===t?this.mainForm.license=this.licenseImgFileList[t].url:this.mainForm.license+=","+this.licenseImgFileList[t].url;if(this.idcardImgFileList.length>0)for(var a=0;a<this.idcardImgFileList.length;a++)0===a?this.mainForm.idcard_front=this.idcardImgFileList[a].url:this.mainForm.idcard_front+=","+this.idcardImgFileList[a].url;this.$refs[e].validate((function(e){e&&Object(n["b"])(i.mainForm).then((function(e){i.$router.push("/fillBrandInf")}))}))}}},s=l,o=(t("8a35"),t("cba8")),d=Object(o["a"])(s,a,r,!1,null,"15d9ee66",null);i["default"]=d.exports},"5f1c3":function(e,i,t){},"6b1f":function(e,i,t){"use strict";t.d(i,"f",(function(){return r})),t.d(i,"b",(function(){return n})),t.d(i,"d",(function(){return l})),t.d(i,"a",(function(){return s})),t.d(i,"h",(function(){return o})),t.d(i,"g",(function(){return d})),t.d(i,"c",(function(){return c})),t.d(i,"i",(function(){return m})),t.d(i,"e",(function(){return g}));var a=t("b775");function r(e){return Object(a["a"])({url:"/local/getOrganization",method:"get",params:e})}function n(e){return Object(a["a"])({url:"/local/organization",method:"post",data:e})}function l(e){return Object(a["a"])({url:"/local/shopbrand",method:"get",params:e})}function s(e){return Object(a["a"])({url:"/local/brands",method:"post",data:e})}function o(e){return Object(a["a"])({url:"/local/upbrands",method:"post",data:e})}function d(e){return Object(a["a"])({url:"/local/getShopInfo",method:"get",params:e})}function c(e){return Object(a["a"])({url:"/local/addShopInfo",method:"post",data:e})}function m(e){return Object(a["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:e})}function g(e){return Object(a["a"])({url:"/local/cate",method:"get",params:e})}},"8a35":function(e,i,t){"use strict";t("5f1c3")}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-a2b82bd2.5f4d6a89.js
+++ b/dist/static/js/chunk-a2b82bd2.5f4d6a89.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-8e230f56"],{1954:function(e,t,s){},"6b1f":function(e,t,s){"use strict";s.d(t,"f",(function(){return o})),s.d(t,"b",(function(){return r})),s.d(t,"d",(function(){return a})),s.d(t,"a",(function(){return l})),s.d(t,"h",(function(){return n})),s.d(t,"g",(function(){return g})),s.d(t,"c",(function(){return u})),s.d(t,"i",(function(){return c})),s.d(t,"e",(function(){return m}));var i=s("b775");function o(e){return Object(i["a"])({url:"/local/getOrganization",method:"get",params:e})}function r(e){return Object(i["a"])({url:"/local/organization",method:"post",data:e})}function a(e){return Object(i["a"])({url:"/local/shopbrand",method:"get",params:e})}function l(e){return Object(i["a"])({url:"/local/brands",method:"post",data:e})}function n(e){return Object(i["a"])({url:"/local/upbrands",method:"post",data:e})}function g(e){return Object(i["a"])({url:"/local/getShopInfo",method:"get",params:e})}function u(e){return Object(i["a"])({url:"/local/addShopInfo",method:"post",data:e})}function c(e){return Object(i["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:e})}function m(e){return Object(i["a"])({url:"/local/cate",method:"get",params:e})}},ba53:function(e,t,s){"use strict";s.r(t);var i=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",{staticClass:"fill-store-inf"},[s("div",{staticClass:"logo-bg"},[e._e()]),e._v(" "),s("el-card",{staticClass:"box-card"},[s("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[s("el-steps",{attrs:{active:2,"align-center":"","finish-status":"success"}},[s("el-step",{attrs:{title:"填写主体信息"}}),e._v(" "),s("el-step",{attrs:{title:"填写品牌信息"}}),e._v(" "),s("el-step",{attrs:{title:"填写店铺信息"}}),e._v(" "),s("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),e._v(" "),s("div",{staticClass:"main-con"},[s("el-form",{ref:"storeForm",attrs:{model:e.storeForm,rules:e.shopRules,"label-width":"180px"}},[s("el-form-item",{attrs:{label:"电商平台经验：",prop:"is_business_experience"}},[s("el-radio-group",{model:{value:e.storeForm.is_business_experience,callback:function(t){e.$set(e.storeForm,"is_business_experience",t)},expression:"storeForm.is_business_experience"}},[s("el-radio",{attrs:{label:1}},[e._v("有")]),e._v(" "),s("el-radio",{attrs:{label:0}},[e._v("无")])],1)],1),e._v(" "),s("el-form-item",{attrs:{label:"店铺名称：",prop:"store_name","inline-message":"true"}},[s("el-input",{staticStyle:{width:"400px"},attrs:{placeholder:"请输入店铺名称"},model:{value:e.storeForm.store_name,callback:function(t){e.$set(e.storeForm,"store_name",t)},expression:"storeForm.store_name"}})],1),e._v(" "),s("el-form-item",{attrs:{label:"经营类目：",prop:"scope"}},[s("el-select",{staticStyle:{width:"400px"},attrs:{multiple:"",placeholder:"请选择..."},model:{value:e.storeForm.scope,callback:function(t){e.$set(e.storeForm,"scope",t)},expression:"storeForm.scope"}},e._l(e.scopeOptions,(function(e){return s("el-option",{key:e.id,attrs:{label:e.title,value:e.id}})})),1)],1),e._v(" "),s("el-form-item",{attrs:{label:"店铺LOGO：",prop:"shop_logo"}},[s("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[s("div",{staticStyle:{"padding-right":"6px"}},[s("el-upload",{staticClass:"uploadData",attrs:{action:"#","list-type":"picture-card",limit:1,"on-exceed":e.showTip1,"before-upload":e.beforeUpLogoImg,"http-request":e.uploadLogoImgs,"on-preview":e.handlePictureCardPreview,"on-remove":e.handleRemove,"file-list":e.logoImgFileList}},[s("i",{staticClass:"el-icon-plus"})]),e._v(" "),s("el-dialog",{attrs:{visible:e.dialogVisible},on:{"update:visible":function(t){e.dialogVisible=t}}},[s("img",{attrs:{width:"100%",src:e.dialogImageUrl,alt:""}})])],1),e._v(" "),s("div",[s("span",{staticClass:"tips-text"},[s("i",{staticClass:"el-icon-warning h-warning"})])]),e._v(" "),s("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px"}},[s("span",{staticClass:"tips-text"},[e._v("请上传店铺LOGO，文件大小在500KB以内，支持png,jpg格式，最多可上传1张")])])])]),e._v(" "),s("el-form-item",{attrs:{label:"运营负责人：",prop:"emergency_name","inline-message":"true"}},[s("el-input",{staticStyle:{width:"400px"},attrs:{placeholder:"请输入运营负责人姓名"},model:{value:e.storeForm.emergency_name,callback:function(t){e.$set(e.storeForm,"emergency_name",t)},expression:"storeForm.emergency_name"}})],1),e._v(" "),s("el-form-item",{attrs:{label:"联系电话：",prop:"emergency_tel"}},[s("el-input",{staticStyle:{width:"400px"},attrs:{placeholder:"请输入联系电话"},model:{value:e.storeForm.emergency_tel,callback:function(t){e.$set(e.storeForm,"emergency_tel",t)},expression:"storeForm.emergency_tel"}})],1),e._v(" "),s("el-form-item",[s("p",{staticStyle:{width:"580px","line-height":"24px","font-size":"14px",margin:"0"}},[e._v("需要提交特殊产品资质的类目请将资质上传在此处，包括全国工业生产许可证、3C、医疗品械\n              生产许可证、化妆品生产企业许可证等，根据具体类目资质要求提交")])]),e._v(" "),s("el-form-item",{attrs:{label:"其他资质：",prop:"business_auth"}},[s("div",{staticStyle:{width:"100%",height:"100%",display:"flex","flex-direction":"row","justify-content":"normal"}},[s("div",{staticStyle:{"padding-right":"6px"}},[s("el-upload",{staticClass:"uploadData",attrs:{action:"#","list-type":"picture-card",limit:20,"on-exceed":e.showTip20,"before-upload":e.beforeUpBusImg,"http-request":e.uploadBusinessImgs,"on-preview":e.handlePictureCardPreview2,"on-remove":e.handleRemove2,"file-list":e.businessImgFileList}},[s("i",{staticClass:"el-icon-plus"})]),e._v(" "),s("el-dialog",{attrs:{visible:e.dialogVisible2},on:{"update:visible":function(t){e.dialogVisible2=t}}},[s("img",{attrs:{width:"100%",src:e.dialogImageUrl2,alt:""}})])],1),e._v(" "),s("div",[s("span",{staticClass:"tips-text"},[s("i",{staticClass:"el-icon-warning h-warning"})])]),e._v(" "),s("div",{staticStyle:{width:"380px","line-height":"24px","padding-top":"6px",color:"#333"}},[s("span",{staticClass:"tips-text"},[e._v("请上其他资质，单个文件大小在2MB以内，支持jpg,png格式，最多可上传20张")])])])]),e._v(" "),s("el-form-item",{staticStyle:{margin:"40px 0 0"}},[s("el-button",{staticStyle:{"margin-right":"40px"},attrs:{type:"primary"},on:{click:e.back}},[e._v("上一步")]),e._v(" "),s("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.next("storeForm")}}},[e._v("提交审核")])],1)],1)],1)])],1)},o=[],r=(s("fc02"),s("6b1f")),a={name:"FillShopInf",data:function(){var e=this,t=function(t,s,i){e.logoImgFileList.length>0?i():0===e.logoImgFileList.length&&i(new Error("店铺logo图片至少上传一张"))},s=function(t,s,i){e.businessImgFileList.length>0?i():0===e.businessImgFileList.length&&i(new Error("其他资质图片至少上传一张"))},i=function(e,t,s){var i=/^1[3456789]\d{9}$/;i.test(t)?s():s(new Error("手机号码格式有误"))};return{dialogImageUrl:"",dialogVisible:!1,dialogImageUrl2:"",dialogVisible2:!1,logoImgFileList:[],businessImgFileList:[],scopeOptions:[],storeForm:{is_business_experience:0,store_name:"",scope:[],shop_logo:"",business_auth:"",emergency_name:""},shopRules:{store_name:[{required:!0,message:"店铺名称不能为空",trigger:"blur"}],scope:[{required:!0,message:"经营类目至少选择一种",trigger:"change"}],shop_logo:[{required:!0,message:"店铺Logo至少上传一张图片",validator:t}],emergency_name:[{required:!0,message:"运营负责人不能为空",trigger:"blur"}],emergency_tel:[{required:!0,message:"联系人手机号码不能为空",trigger:"blur"},{required:!0,validator:i,trigger:"blur"}],business_auth:[{required:!0,message:"其他资质至少上传一张图片",validator:s}]}}},created:function(){var e=this;Object(r["e"])().then((function(t){1===t.code&&(e.scopeOptions=t.data)})),this.getShop()},mounted:function(){},methods:{showTip1:function(e,t){this.$message({message:"最多上传1张图片",type:"warning"})},showTip20:function(e,t){this.$message({message:"最多上传20张图片",type:"warning"})},beforeUpLogoImg:function(e){var t=e.size/1024>500;return"image/png"!==e.type&&"image/jpg"!==e.type&&"image/jpeg"!=e.type?(this.$message({message:"上传图片格式只支持png/png格式",type:"warning"}),!1):t?(this.$message({message:"上传图片大小不能超过500kb",type:"warning"}),!1):void 0},beforeUpBusImg:function(e){var t=e.size/1024/1024>2;return"image/png"!==e.type&&"image/jpg"!==e.type&&"image/jpeg"!=e.type?(this.$message({message:"上传图片格式只支持png/png格式",type:"warning"}),!1):t?(this.$message({message:"上传图片大小不能超过2M",type:"warning"}),!1):void 0},getShop:function(){var e=this;Object(r["g"])().then((function(t){if(t&&1===t.code&&t.data){if(e.storeForm.scope=[],""===t.data.scope)e.storeForm.scope=[];else{for(var s=t.data.scope.split(","),i=[],o=0;o<s.length;o++)i.push(parseInt(s[o]));e.storeForm=t.data,e.storeForm.scope=i}var r={},a=[];if(e.storeForm.shop_logo.indexOf(",")>0){a=e.storeForm.shop_logo.split(",");for(var l=0;l<a.length;l++)r={},r.url=a[l],e.logoImgFileList.push(r)}else e.storeForm.shop_logo?(r.url=e.storeForm.shop_logo,e.logoImgFileList=[],e.logoImgFileList.push(r)):e.logoImgFileList=[];var n={},g=[];if(e.storeForm.business_auth.indexOf(",")>0){g=e.storeForm.business_auth.split(",");for(var u=0;u<g.length;u++)n={},n.url=g[u],e.businessImgFileList.push(n)}else e.storeForm.business_auth?(n.url=e.storeForm.business_auth,e.businessImgFileList=[],e.businessImgFileList.push(n)):e.businessImgFileList=[]}else 0===t.code&&t.msg?e.$message({message:t.msg,type:"error"}):e.$message({message:"数据有误！",type:"error"})}))},uploadLogoImgs:function(e){var t=this;this.getBase64(e.file).then((function(e){var s=e.split(",");t.Base64img=s[1];var i={img_data:t.Base64img};Object(r["i"])(i).then((function(e){if(e&&1===e.code)t.logoImgFileList.push({url:e.data.image_url}),t.$message({type:"success",message:"上传成功"}),t.$refs.storeForm.clearValidate("shop_logo");else{var s="";s=e.message||"上传失败",t.$message({type:"success",message:s})}}))}))},uploadBusinessImgs:function(e){var t=this;this.getBase64(e.file).then((function(e){var s=e.split(",");t.Base64img=s[1];var i={img_data:t.Base64img};Object(r["i"])(i).then((function(e){e&&1===e.code&&(t.businessImgFileList.push({url:e.data.image_url}),t.$message({type:"success",message:"上传成功"}),t.$refs.storeForm.clearValidate("business_auth"))}))}))},handlePictureCardPreview:function(e){this.dialogImageUrl=e.url,this.dialogVisible=!0},handleRemove:function(e,t){for(var s=0;s<this.logoImgFileList.length;s++)e.uid===this.logoImgFileList[s].uid&&this.logoImgFileList.splice(s,1)},handlePictureCardPreview2:function(e){this.dialogImageUrl2=e.url,this.dialogVisible2=!0},handleRemove2:function(e,t){for(var s=0;s<this.businessImgFileList.length;s++)e.uid===this.businessImgFileList[s].uid&&this.businessImgFileList.splice(s,1)},getBase64:function(e){return new Promise((function(t,s){var i=new FileReader,o="";i.readAsDataURL(e),i.onload=function(){o=i.result},i.onerror=function(e){s(e)},i.onloadend=function(){t(o)}}))},back:function(){this.$router.push("/fillBrandInf")},next:function(e){for(var t=this,s="",i=0;i<this.storeForm.scope.length;i++)s+=this.storeForm.scope[i]+",";if(this.storeForm.scope=s.substring(0,s.length-1),this.logoImgFileList.length>0)for(var o=0;o<this.logoImgFileList.length;o++)0===o?this.storeForm.shop_logo=this.logoImgFileList[o].url:this.storeForm.shop_logo+=","+this.logoImgFileList[o].url;if(this.businessImgFileList.length>0)for(var a=0;a<this.businessImgFileList.length;a++)0===a?this.storeForm.business_auth=this.businessImgFileList[a].url:this.storeForm.business_auth+=","+this.businessImgFileList[a].url;this.$refs[e].validate((function(e){if(e)Object(r["c"])(t.storeForm).then((function(e){if(1===e.code)t.$router.push("/reviewing");else if(0===e.code&&e.msg){if(""===t.storeForm.scope)t.storeForm.scope=[];else{for(var s=t.storeForm.scope.split(","),i=[],o=0;o<s.length;o++)i.push(parseInt(s[o]));t.storeForm.scope=i}e.msg?t.$message({message:e.msg,type:"error"}):t.$message({message:"数据开小差了，请稍后重试",type:"error"})}}));else if(""===t.storeForm.scope)t.storeForm.scope=[];else{for(var s=t.storeForm.scope.split(","),i=[],o=0;o<s.length;o++)i.push(parseInt(s[o]));t.storeForm.scope=i}}))}}},l=a,n=(s("d93b"),s("cba8")),g=Object(n["a"])(l,i,o,!1,null,"217dbf05",null);t["default"]=g.exports},d93b:function(e,t,s){"use strict";s("1954")}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-ac7c2c64.ba823fae.js
+++ b/dist/static/js/chunk-ac7c2c64.ba823fae.js
--- a/dist/static/js/chunk-elementUI.e19103bf.js
+++ b/dist/static/js/chunk-elementUI.e19103bf.js
--- a/dist/static/js/chunk-f18f73fa.72dc7274.js
+++ b/dist/static/js/chunk-f18f73fa.72dc7274.js
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-f18f73fa"],{"5a97":function(t,e,n){"use strict";n.d(e,"d",(function(){return r})),n.d(e,"g",(function(){return s})),n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return c})),n.d(e,"f",(function(){return u})),n.d(e,"e",(function(){return i})),n.d(e,"a",(function(){return l}));var a=n("b775");function r(t){return Object(a["a"])({url:"/system/goodsNew/list",method:"get",params:t})}function s(t){return Object(a["a"])({url:"/system/goodsNew/shelvesStatus",method:"post",data:t})}function o(t){return Object(a["a"])({url:"/system/goodsNew/goodsStatus",method:"post",data:t})}function c(t){return Object(a["a"])({url:"/system/goodsNew/info",method:"get",params:t})}function u(t){return Object(a["a"])({url:"/system/goodsNew/businessList",method:"get",params:t})}function i(t){return Object(a["a"])({url:"/system/goodsNew/collect",method:"post",data:t})}function l(t){return Object(a["a"])({url:"/system/goodsNew/cancelOnsale",method:"post",data:t})}},"6b1f":function(t,e,n){"use strict";n.d(e,"f",(function(){return r})),n.d(e,"b",(function(){return s})),n.d(e,"d",(function(){return o})),n.d(e,"a",(function(){return c})),n.d(e,"h",(function(){return u})),n.d(e,"g",(function(){return i})),n.d(e,"c",(function(){return l})),n.d(e,"i",(function(){return d})),n.d(e,"e",(function(){return m}));var a=n("b775");function r(t){return Object(a["a"])({url:"/local/getOrganization",method:"get",params:t})}function s(t){return Object(a["a"])({url:"/local/organization",method:"post",data:t})}function o(t){return Object(a["a"])({url:"/local/shopbrand",method:"get",params:t})}function c(t){return Object(a["a"])({url:"/local/brands",method:"post",data:t})}function u(t){return Object(a["a"])({url:"/local/upbrands",method:"post",data:t})}function i(t){return Object(a["a"])({url:"/local/getShopInfo",method:"get",params:t})}function l(t){return Object(a["a"])({url:"/local/addShopInfo",method:"post",data:t})}function d(t){return Object(a["a"])({url:"/system/goodsNew/uploadImage",method:"post",data:t})}function m(t){return Object(a["a"])({url:"/local/cate",method:"get",params:t})}},"9c36":function(t,e,n){},e3b2:function(t,e,n){"use strict";n.r(e);var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"app-container"},[n("el-card",{staticClass:"box-card"},[n("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[t._v("商品导入")]),t._v(" "),n("h3",{staticClass:"cton_h3"},[t._v("剩余次数："+t._s(t.collect_num)+" / 1000次")]),t._v(" "),n("div",{staticClass:"cton_text"},[n("p",[t._v("功能介绍：")]),t._v(" "),n("p",[t._v("\n      商品导入是为了商家快速、方便地将其它平台上已有的商品，一键导入到您的云仓平台，不再用手动输入编写商品信息\n    ")]),t._v(" "),n("p",[t._v("使用方法：")]),t._v(" "),n("p",[t._v("\n      复制其它电商平台的商品链接，粘贴至商品链接输入框内，为该商品选择对应的商品分类，选择完成后点击立即获取按钮即可\n    ")]),t._v(" "),n("p",[t._v("示例：")]),t._v(" "),n("p",[t._v("京东商品链接如：https://item.jd.com/10684560542.html")]),t._v(" "),n("p",[t._v("温馨提示：")]),t._v(" "),n("p",[t._v("商品在获取过程中，请不要进行其它操作")]),t._v(" "),n("p",[t._v("\n      商品抓取后，默认放入到下架商品中，请手动修改商品相关信息，再提交申请上架\n    ")]),t._v(" "),n("p",[t._v("请确保不要将多个平台的商品链接混合输入")]),t._v(" "),n("p",[t._v("每个用户默认拥有1000次商品导入的机会，请慎重使用")])]),t._v(" "),n("el-form",{ref:"form",attrs:{model:t.form,"label-width":"180px"}},[n("el-form-item",{attrs:{label:"商品链接："}},[n("el-input",{staticStyle:{width:"700px"},attrs:{type:"textarea",autosize:{minRows:4,maxRows:8},placeholder:"请输入其它平台商品的链接，单次最多允许输入10条链接，以英文逗号隔开"},model:{value:t.form.desc,callback:function(e){t.$set(t.form,"desc",e)},expression:"form.desc"}})],1),t._v(" "),n("el-form-item",{attrs:{label:"商品分类："}},[t.el_valuestatus?n("el-cascader",{ref:"cascaderDom",staticStyle:{width:"350px"},attrs:{props:t.props,options:t.options,placeholder:"请选择"},on:{change:t.elvalueclick},model:{value:t.el_value,callback:function(e){t.el_value=e},expression:"el_value"}}):t._e()],1),t._v(" "),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:t.onSubmit}},[t._v("立即导入")])],1)],1)],1)],1)},r=[],s=(n("6b54"),n("c5f6"),n("28a5"),n("5c96"),n("6b1f")),o=n("5a97"),c=(n("ed08"),{name:"freight",data:function(){return{collect_num:0,form:{desc:""},el_valuestatus:!0,el_value:[],options:[],props:{checkStrictly:!1,expandTrigger:"click",emitPath:!0,value:"id",label:"label"}}},components:{},created:function(){this.getData(),this.info()},watch:{},methods:{info:function(){var t=this;Object(s["g"])().then((function(e){1==e.code&&(t.collect_num=e.data.collect_num)}))},onSubmit:function(){var t=this;if(this.collect_num<=0)this.$message({type:"warning",message:"您好，您的导入次数已用完，请您联系我们的工作人员操作充值"});else{var e;if(!this.form.desc)return this.$message.error("请填写需要导入的商品链接！"),!1;if(e=this.form.desc.split(","),!(e.length>0&&e.length<=10))return e.length>10?(this.$message({message:"您单次输入的链接数量超过10条！",type:"warning"}),!1):(this.$message.error("请填写需要导入的商品链接！"),!1);if(Number(e.length)>Number(this.collect_num))this.$message({type:"warning",message:"您好，准备导入的商品条数过多，当前剩余次数不足，请重新输入"});else{if(3!=this.el_value.length)return this.$message.error("请选择商品分类！"),!1;var n={category_id:this.el_value[2],third_url:e};Object(o["e"])(n).then((function(n){var a=0,r=Number(e.length),s="";1===n.code?(1===r?1===Number(n.data)?t.$message({type:"success",message:"您好，商品已导入成功，请在仓库中进行编辑后申请上架"}):t.$message({type:"error",message:"您好，商品导入失败，请您重新导入"}):r>1&&(a=Number(n.data),s="您好，一共导入"+r+"条商品，"+a+"条导入成功，请在仓库中进行编辑后申请上架",t.$message({type:"warning",message:s})),t.el_value=[],t.$refs.cascaderDom.$refs.panel.activePath=[],t.form.desc=""):(s=n.message?n.message:"导入失败",t.$message({type:"error",message:s})),t.info()}))}}},add:function(t,e){var n,a,r,s;try{n=t.toString().split(".")[1].length,a=e.toString().split(".")[1].length}catch(o){n=0,a=0}return r=Math.pow(10,Math.max(n,a)),s=(t*r+e*r)/r,s=s.toFixed(2),s},minus:function(t,e){return this.add(t,-e)},elvalueclick:function(){},getData:function(){var t=this;Object(o["f"])().then((function(e){1==e.code&&(t.options=e.data)}))}}}),u=c,i=(n("fe8e"),n("2877")),l=Object(i["a"])(u,a,r,!1,null,"9269e492",null);e["default"]=l.exports},fe8e:function(t,e,n){"use strict";n("9c36")}}]);
\ No newline at end of file
--- a/dist/static/js/chunk-libs.191b10c7.js
+++ b/dist/static/js/chunk-libs.191b10c7.js
--- a/public/index.html
+++ b/public/index.html
@@ -228,8 +228,9 @@
          }
        }
      };
-      xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
+      //xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
-      // xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
+      // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
+      xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试
      xhttp.send();
    }
  </script>

--- a/src/api/module/settlementbill.js
+++ b/src/api/module/settlementbill.js
+import request from '@/utils/request'
+// 结算列表
+export function listVerifyrecord(data) {
+  return request({
+    url: '/local/asset/getSellerBalanceLogList',
+    method: 'post',
+    data: data
+  })
+}
+// 结算详情
+// export function getVerifyrecord (id) {
+//   return request({
+//     url: '/system/order/getOrderSellerListInfo?id='+id,
+//     method: 'get'
+//   })
+// }
+export function getVerifyrecord(query) {
+  return request({
+    url: '/system/order/getOrderSellerListInfo',
+    method: 'get',
+    params: query
+  })
+}
--- a/src/api/module/verifyrecord.js
+++ b/src/api/module/verifyrecord.js
 import request from '@/utils/request'
-// 查询verifyrecord列表
+// 结算列表
-export function listVerifyrecord(query) {
+export function listVerifyrecord(data) {
    return request({
-        url: '/system/verifyrecord/list',
+      url: '/local/asset/getSellerBalanceLogList',
-        method: 'get',
+      method: 'post',
-        params: query
+      data: data
    })
 }
-// 查询verifyrecord详细
+// 详情
 export function getVerifyrecord (id) {
    return request({
-        url: '/system/verifyrecord/getDetail?id='+id,
+        url: '/system/order/getOrderSellerListInfo?id='+id,
        method: 'get'
    })
 }

--- a/src/api/webSite.js
+++ b/src/api/webSite.js
@@ -3,28 +3,29 @@ import request from '@/utils/request'
 // 获取渠道id
 export function indexInfo(params) {
  return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
+    url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
    method: 'get',
    params
  })
 }
 // 获取所有域名
 export function getdomain(params) {
  return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
+    url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
    method: 'get',
    params
  })
 }
 // 获取官网设置接口
 export function webSite(params) {
  return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
+    url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
    method: 'get',
    params
  })
@@ -33,8 +34,9 @@ export function webSite(params) {
 // 云仓所有列表——Banner和域名/产品和服务/供应商入驻
 export function getallCloudList(params) {
  return request({
-    url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
+    // url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
-    // url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
+    url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
    method: 'get',
    params
  })
@@ -42,9 +44,19 @@ export function getallCloudList(params) {
 //获取sso域名
 export function getssoUrl(data) {
  return request({
-    url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
+    // url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
-    // url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
+    url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
+    // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
    method: 'get',
    params: data
  })
 }
+// 获取logo
+export function backDetailsView(params) {
+  return request({
+    url: '/local/oem/backDetails',
+    method: 'get',
+    params
+  })
+}
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -3,11 +3,11 @@
    <transition name="sidebarLogoFade">
      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
        <img v-if="false" :src="logo" class="sidebar-logo">
-<!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+       <img v-if="logo" :src="logo" class="sidebar-logo">
        <h1 v-else class="sidebar-title">{{ title }} </h1>
      </router-link>
      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-<!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+       <img v-if="logo" :src="logo" class="sidebar-logo">
        <img v-if="false" :src="logo" class="sidebar-logo">
        <h1 class="sidebar-title">{{ title }} </h1>
      </router-link>
@@ -18,6 +18,7 @@
 <script>
 // import logoImg from '@/assets/logo/logo.png';
 import logoImg from '@/assets/logo/logo_white.png';
+import { backDetailsView } from '@/api/webSite'
 export default {
  name: 'SidebarLogo',
@@ -32,6 +33,22 @@ export default {
      title: '云仓',
      logo: logoImg
    }
+  },
+  mounted() {
+    this.getBackDetailsView()
+  },
+  methods: {
+    getBackDetailsView() {
+      let params = {
+        type: 'SHOP',
+      }
+      backDetailsView(params).then(res => {
+        if (res.code == 1) {
+          this.title = res.data[0]['SHOP'].shop_name
+          this.logo = res.data[0]['SHOP'].shop_logo
+        }
+      })
+    }
  }
 }
 </script>

--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -42,7 +42,7 @@ const user = {
      return new Promise((resolve, reject) => {
        getssoUrl(data).then(response => {
          const date = response.data
-          debugger
+          //debugger
          if (response.code == 1) {
            commit('SET_SSOURL', date.access_token)
          }

--- a/src/views/dashboard/LineChart.vue
+++ b/src/views/dashboard/LineChart.vue
@@ -57,33 +57,31 @@ export default {
    this.chart = null
  },
  methods: {
-    moneyMax(num){
+    moneyMax(num) {
      let prec = 2
      let ceil = true
      const len = String(num).length;
-        if (len <= prec) { return num };
+      if (len <= prec) {
+        return num
+      }
      const mult = Math.pow(10, prec);
-        return ceil ?
+      return ceil ? Math.ceil(num / mult) * mult : Math.floor(num / mult) * mult;
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
    },
    numberMax(num1,num2){
      let num = ''
-      if(num1>=num2){
+      if (num1 >= num2) {
        num = num1
-      }else{
+      } else {
        num = num2
      }
      let prec = 2
      let ceil = true
      const len = String(num).length;
-        if (len <= prec) { return num };
+      if (len <= prec) {
+        return num
+      }
      const mult = Math.pow(10, prec);
-        return ceil ?
+      return ceil ? Math.ceil(num / mult) * mult : Math.floor(num / mult) * mult;
-          Math.ceil(num / mult) * mult :
-          Math.floor(num / mult) * mult;
    },
    initChart() {
      this.chart = echarts.init(this.$el, 'macarons')
@@ -92,7 +90,6 @@ export default {
      }
    },
    setOptions({ expectedData, actualData, moneyData, months} = {}) {
-      console.log(months)
      this.chart.setOption({
        xAxis: {
          data: months,
@@ -131,7 +128,7 @@ export default {
          	name: '收益',
          	min: 0,
          	max: this.moneyMax(this.chartData.maxMoneyData),
-          	interval: (this.moneyMax(this.chartData.maxMoneyData)/5),
+          	interval: (this.moneyMax(this.chartData.maxMoneyData) / 5),
          	axisLabel: {
          		formatter: '{value} 元'
          	}

--- a/src/views/entry/newyuncang.vue
+++ b/src/views/entry/newyuncang.vue
@@ -31,8 +31,9 @@
        <swiper :options="swiperOption" v-if="bannerList && bannerList.length > 0">
          <swiper-slide v-for="(item,index) in bannerList" :key="index">
-            <a :href=" '//' + item.redirect_url" target="_blank"><img style="width: 100%;height: 562px;" :src="item.image_url"
+            <a :href="aLinkRes(item.redirect_url) " :target="returnBlank(item.redirect_url)">
-                                                                      alt=""></a>
+              <img style="width: 100%;height: 562px;" :src="item.image_url" alt="">
+            </a>
          </swiper-slide>
        </swiper>
      </section>
@@ -493,14 +494,25 @@
            }
            // banner图
            if (res.data.cloud_banner_lst && res.data.cloud_banner_lst.banners_json && res.data.cloud_banner_lst.banners_json.length > 0) {
+// <<<<<<< HEAD
-              let bannerarr = []
+//
+//               let bannerarr = []
+//               res.data.cloud_banner_lst.banners_json.forEach(element => {
+//                 if(element.image_url){
+//                   bannerarr.push(element)
+//                 }
+//               });
+//               this.bannerList = bannerarr
+// =======
+              // this.bannerList = res.data.cloud_banner_lst.banners_json;
+              let bannerArr = []
              res.data.cloud_banner_lst.banners_json.forEach(element => {
-                if(element.image_url){
+                if(element.image_url) {
-                  bannerarr.push(element)
+                  bannerArr.push(element);
                }
              });
-              this.bannerList = bannerarr
+              this.bannerList = bannerArr
+// >>>>>>> dev_hxz
            }
            // logo 图
            if (res.data.cloud_supplier_lst && res.data.cloud_supplier_lst.detail_json) {
@@ -512,6 +524,26 @@
          }
        })
      },
+      /** banner 图是否能跳转链接 处理 */
+      aLinkRes(link) {
+        let resLink = ''
+        if ( link ) {
+          resLink = link
+        }else {
+          resLink = 'javascript:void(0);'
+        }
+        return resLink
+      },
+      returnBlank(val) {
+        let res = ''
+        if ( val ) {
+          res = '_blank'
+        }else {
+          res = ''
+        }
+        return res
+      },
      // 监听浏览器滚动
      handleScroll() {
        let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop

--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -55,7 +55,7 @@
    <panel-group @handleSetLineChartData="handleSetLineChartData" :panel-data="panelData"/>
    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
+      <line-chart :chart-data="lineChartData"/>
    </el-row>
    <!-- <el-row :gutter="32"> -->
@@ -81,14 +81,14 @@
 </template>
 <script>
-import { getStatistics } from "@/api/login";
+  import {getStatistics} from "@/api/login";
-import PanelGroup from './dashboard/PanelGroup'
+  import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
+  import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
+  import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
+  import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
+  import BarChart from './dashboard/BarChart'
-const lineChartData = {
+  const lineChartData = {
    newVisitis: {
      expectedData: [100, 120, 161, 134, 105, 160, 161],
      actualData: [120, 82, 91, 154, 162, 140, 145]
@@ -108,9 +108,9 @@ const lineChartData = {
    //   // expectedData: [130, 140, 141, 142, 145, 150, 160], //期望
    //   actualData: [120, 82, 91, 154, 162, 140, 130]  //实际
    // }
-}
+  }
-export default {
+  export default {
    name: 'Index',
    components: {
      PanelGroup,
@@ -121,21 +121,21 @@ export default {
    },
    data() {
      return {
-      panelData:{
+        panelData: {
-        goods_total:0, //商品总数
+          goods_total: 0, //商品总数
-        order_total:0,//订单总数
+          order_total: 0,//订单总数
-        total_price:0,//金额总数
+          total_price: 0,//金额总数
-        refund_total:0,//售后总数
+          refund_total: 0,//售后总数
        },
        lineChartData: {
-        moneyData:[], //金额折线
+          moneyData: [], //金额折线
-        actualData:[], //订单折线
+          actualData: [], //订单折线
          // countData:[],
-        maxChannelData:0, //左边订单数量最大值
+          maxChannelData: 0, //左边订单数量最大值
-        maxMoneyData:0,  //金额最大值
+          maxMoneyData: 0,  //金额最大值
-        months:[]   //下面日志
+          months: []   //下面日志
        }
      }
    },
@@ -143,45 +143,47 @@ export default {
      this.GetStatistics();
    },
    methods: {
-    //首页统计
+      /** 首页所有数据
-    GetStatistics(){
+       * order_total（总订单数量，总金额）
+       * */
+      GetStatistics() {
        getStatistics().then(response => {
          let money = []
          let count = []
          let actual = []
-        if(response.data && response.data.line && response.data.line.length > 0) {
+          if (response.data && response.data.line && response.data.line.length > 0) {
-          response.data.line.forEach(function(item, index) {
+            response.data.line.forEach(function (item, index) {
-            money.unshift(item.price)
+              money.unshift(item.price/100) // 后台返回单位是 分，所以需要除以100
              actual.unshift(item.date)
              count.unshift(item.count)
            })
          }
          //最大订单数
-        var maxOrderNum=this.lineChartData.maxChannelData;
+          var maxOrderNum = this.lineChartData.maxChannelData;
-        for(var n=1;n<count.length;n++){
+          for (var n = 1; n < count.length; n++) {
-          if(count[n]>maxOrderNum){
+            if (count[n] > maxOrderNum) {
-            maxOrderNum=count[n];
+              maxOrderNum = count[n];
            }
          }
          this.lineChartData.maxChannelData = maxOrderNum
-        //最大金额
+          //最大金额,后台返回单位是 分，所以需要除以100
-        var maxMoney=this.lineChartData.maxMoneyData;
+          var maxMoney = this.lineChartData.maxMoneyData/100;
-        for(var n=1;n<money.length;n++){
+          for (var n = 1; n < money.length; n++) {
-          if(money[n]>maxMoney){
+            if (money[n] > maxMoney) {
-            maxMoney=money[n];
+              maxMoney = money[n];
            }
          }
          this.lineChartData.maxMoneyData = maxMoney
          this.lineChartData.moneyData = money
          this.lineChartData.actualData = count
-         this.lineChartData.months= actual
+          this.lineChartData.months = actual
-        this.panelData.goods_total= response.data.goods_total
+          this.panelData.goods_total = response.data.goods_total
-        this.panelData.refund_total= response.data.rettotal
+          this.panelData.refund_total = response.data.rettotal
-        this.panelData.order_total= response.data.order_total.count
+          this.panelData.order_total = response.data.order_total.count
-        this.panelData.total_price= response.data.order_total.total_price / 100
+          this.panelData.total_price = response.data.order_total.total_price / 100
        });
      },
      handleSetLineChartData(type) {
@@ -189,41 +191,49 @@ export default {
        this.lineChartData = lineChartData[type]
      }
    }
-}
+  }
 </script>
 <style lang="scss" scoped type="text/stylus">
-.dashboard-promote .el-row{
+  .dashboard-promote .el-row {
    margin-bottom: 20px;
    font-size: 14px;
-}
+  }
-.dashboard-promote .el-row .jz{
+  .dashboard-promote .el-row .jz {
    height: 500px;
-}
+  }
-.dashboard-promote .el-row .kj{
+  .dashboard-promote .el-row .kj {
    height: 300px;
-}
+  }
-.dashboard-promote .el-row .xx{
+  .dashboard-promote .el-row .xx {
    height: 200px;
-}
+  }
-.git-res{
+  .git-res {
    margin-top: 20px;
-}
+  }
-.git-res .el-link{
+  .git-res .el-link {
    margin-right: 30px;
-}
+  }
-ul,li{ padding:0;margin:0;list-style:none}
+  ul, li {
+    padding: 0;
+    margin: 0;
+    list-style: none
+  }
-.product li{
+  .product li {
    margin-bottom: 20px;
    float: left;
    width: 150px;
-}
+  }
-.dashboard-editor-container {
+  .dashboard-editor-container {
    padding: 32px;
    background-color: rgb(240, 242, 245);
    position: relative;
@@ -233,11 +243,11 @@ ul,li{ padding:0;margin:0;list-style:none}
      padding: 16px 16px 0;
      margin-bottom: 32px;
    }
-}
+  }
-@media (max-width:1024px) {
+  @media (max-width: 1024px) {
    .chart-wrapper {
      padding: 8px;
    }
-}
+  }
 </style>
--- a/src/views/system/asset/settlementbill/index.vue
+++ b/src/views/system/asset/settlementbill/index.vue
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small">
+          <el-form-item label="总订单号" prop="order_sn">
+            <el-input style="width:220px;" v-model="queryParams.order_sn" placeholder="请输入总订单号"/>
+          </el-form-item>
+          <el-form-item label="结算时间" prop="cashTime">
+            <el-date-picker
+              v-model="queryParams.cashTime"
+              type="daterange"
+              align="left"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="withdrawlogList" :height="tableHeight">
+        <el-table-column label="序号" align="center" width="55">
+          <template slot-scope="scope">
+            <span>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总订单号" align="center" prop="links_des"></el-table-column>
+        <el-table-column label="账单结算时间" align="center" prop="add_time">
+          <template slot-scope="scope">
+            {{ speTiemFormatter(scope.row.add_time) }}<br/>
+          </template>
+        </el-table-column>
+        <el-table-column label="结算金额" :formatter="formatFee" align="center" prop="change_money"></el-table-column>
+        <el-table-column label="交易单号" align="center" prop="balance_sn"></el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="viewDetails(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <div class="footer_pagination">
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[20, 40, 60, 80, 100]"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+      </div>
+    </el-card>
+    <!-- 详情 -->
+    <el-dialog title="账单详情" width="80%" :close-on-click-modal="false" :destroy-on-close="true"
+               :visible.sync="detailDialog" center :before-close="cancel">
+      <div class="settle-con">
+        <div class="settle-details-header">
+          <div style="float:left;">
+            <span>订单状态：</span>
+            <span>{{ orderStatusFormatter(orderStatus) }}</span>
+            <span style="margin: 0 0 0 30px;">总订单号：</span>
+            <span>{{ orderSn }}</span>
+          </div>
+          <div style="float:right;">
+            <span>结算状态：</span>
+            <span>{{ settlementStatus }}</span>
+          </div>
+        </div>
+        <!-- 商品订单 table -->
+        <el-table class="title_table " align="center" :data="orderGoodsDetail" :span-method="arraySpanMethod">
+          <el-table-column label="商品主图/商品名称" align="center">
+            <template slot-scope="scope">
+              <div class="img-title-table">
+                <img v-if="scope.row.thumb" style="width:60px;height:60px;" :src="scope.row.thumb"/>
+                <div class="ml10">{{ scope.row.title }}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品ID" align="center" prop="goods_id"></el-table-column>
+          <el-table-column label="规格/数量/金额" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.goods_option_title }}<br/>
+              {{ scope.row.goods_price / 100 }} 元<br/>
+              x {{ scope.row.total }}<br/>
+            </template>
+          </el-table-column>
+          <el-table-column label="下单/发货/完成时间" align="center" width="" >
+            <template slot-scope="scope">
+              {{ speTiemFormatter(scope.row.created_time) }}<br/>
+              {{ speTiemFormatter(scope.row.send_time) }}<br/>
+              {{ speTiemFormatter(scope.row.updated_time) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="运费" align="center" width="" prop="dispatch_price" >
+            <template slot-scope="scope">
+              {{ scope.row.dispatch_price / 100 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="收货人" align="center" width="" >
+            <template>
+              {{ realName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="联系电话" align="center" width="" prop="">
+            <template>
+              {{ mobile }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import {
+    listVerifyrecord,
+    getVerifyrecord
+  } from '@/api/module/settlementbill'
+  import {dateFormat} from '@/utils'
+  export default {
+    name: "Settlementbill",
+    data() {
+      return {
+        fullHeight: 0,
+        tableHeight: 0,
+        // 查询参数
+        queryParams: { // 查询参数
+          cashTime: [],
+          order_sn: ''
+        },
+        total: 0,
+        currentPage: 1,
+        pageSize: 20,
+        withdrawlogList: [],
+        // 账单详情
+        detailDialog: false,
+        orderStatus: '',
+        orderSn: '',
+        settlementStatus: '',
+        orderGoodsDetail: [],
+        realName: '',
+        mobile: '',
+      }
+    }, // data end
+    created() {
+      /** 查询 提现记录 列表 */
+      this.getList();
+      this.$nextTick(() => {
+        this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
+      })
+    },
+    watch: {
+      fullHeight(val) {
+        let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
+        this.tableHeight = val - formHeight - 100;
+      }
+    },
+    methods: {
+      /** 查询 提现记录 列表 */
+      getList() {
+        let params = {
+          page: this.currentPage,
+          limit: this.pageSize,
+        }
+        if (this.queryParams.order_sn != '') {
+          params['order_sn'] = this.queryParams.order_sn;
+        }
+        if (this.queryParams.cashTime && this.queryParams.cashTime.length == 2) {
+          params['start_time'] = new Date(this.queryParams.cashTime[0]).getTime() / 1000;
+          params['end_time'] = new Date(this.queryParams.cashTime[1]).getTime() / 1000;
+        }
+        listVerifyrecord(params).then(res => {
+          if (res.code == 1) {
+            this.withdrawlogList = res.data.list;
+            this.total = res.data.count;
+          } else {
+            this.$message({type: 'error',message: res.message ? res.message : '数据请求失败'});
+          }
+        });
+      },
+      /** 详情 跳转 */
+      viewDetails(row) {
+        const indexId = row.order_id ? row.order_id : 0;
+        getVerifyrecord({order_id: indexId}).then(res=> {
+          if(res.code == 1 && res.data) {
+            this.detailDialog = true;
+            if (res.data.order) {
+              this.orderStatus = res.data.order.status;
+              this.orderSn = res.data.order.order_sn;
+              this.settlementStatus = res.data.order.settlement_status == 1 ? '已结算' : '未结算';
+              this.realName = res.data.order.real_name;
+              this.mobile = res.data.order.mobile;
+            }
+            if (res.data.order_goods_detail) {
+              this.orderGoodsDetail = res.data.order_goods_detail;
+              // dispatch_price
+              if(this.orderGoodsDetail && this.orderGoodsDetail.length > 0) {
+                for(let i = 0; i < this.orderGoodsDetail.length; i++) {
+                  this.orderGoodsDetail[i]['dispatch_price'] = res.data.order.dispatch_price
+                }
+              }
+              console.log(222,this.orderGoodsDetail);
+            }
+          }else {
+            this.$message({type: 'error',message: res.message ? res.message : '数据请求失败'});
+          }
+        });
+      },
+      /** 重置 搜索条件 */
+      resetQuery() {
+        this.queryParams = {
+          cashTime: [],
+          order_sn: ''
+        }
+        this.currentPage = 1
+        this.pageSize = 20
+        this.getList();
+      },
+      handleSizeChange(val) {
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        this.getList()
+      },
+      /** 格式化价格 返回原数据是 分，除以100 */
+      formatFee(row, s, value, i) {
+        let nm = 0,
+          money = value
+        if (money > 0) {
+          nm = money / 100
+        }
+        return nm
+      },
+      /** 格式化时间 */
+      formatTime(row) {
+        var Time = row.add_time
+        var newtime = ""
+        if (Time > 0) {
+          newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
+        }
+        return newtime
+      },
+      /** 时间格式化 */
+      speTiemFormatter(time) {
+        if (time) {
+          return dateFormat(time *1000, 'Y-m-d H:i:s')
+        }else {
+          return '--'
+        }
+      },
+      /** 订单状态 */
+      orderStatusFormatter(status) {
+        if(status === -1) {
+          return '订单取消'
+        }else if (status === 0) {
+          return '待付款'
+        }else if (status === 1) {
+          return '待发货'
+        }else if (status === 2) {
+          return '待收货'
+        }else if (status === 3) {
+          return '已完成'
+        }else if (status === 4) {
+          return '已结算'
+        }else {
+          return '' // 保险，返回空
+        }
+      },
+      // 取消按钮
+      cancel() {
+        this.detailDialog = false;
+      },
+      // 表单重置
+      reset() {
+        // this.form = {
+        //   id: null,
+        //   reflect_sn: null,
+        //   reflect_money: null,
+        //   status: 0,
+        //   des: null,
+        //   seller_bank_id: null,
+        //   add_time: null,
+        //   fee: null,
+        //   seller_id: null,
+        //   after_reflect_money: null
+        // };
+        // this.resetForm("form");
+      },
+      /** 表格合并 列单元格 */
+      arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex > 3 ) { // 用于设置要合并开始的列号
+          if (rowIndex === 0) { // 用于设置合并开始的行号
+            return {
+              rowspan: 100,　　　　　// 合并的行数
+              colspan: 1 // 合并的列数，设为０则直接不显示
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            }
+          }
+        }
+      },
+    } //methods结束
+  }
+</script>
+<style scoped>
+  .form-params .el-form-item {
+    margin: 10px 0 10px 10px;
+  }
+  /* 分页 */
+  .footer_pagination {
+    text-align: center;
+    margin-top: 15px;
+  }
+  /* 详情 */
+  .settle-details-header {
+    margin: 0 5px 10px;
+    overflow: hidden;
+  }
+  .img-title-table {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .ml10 {
+    margin-left: 10px;
+  }
+</style>
--- a/src/views/system/goods/add/index.vue
+++ b/src/views/system/goods/add/index.vue
@@ -175,7 +175,7 @@
              goods_name: res.data.goods_name,      // 商品标题
              category_id: res.data.category_id,
              producing_area: res.data.producing_area,   // 产地
-              deliver_area: Number(res.data.deliver_area),     // 发货地
+              deliver_area: res.data.deliver_area,     // 发货地
              unit: res.data.unit,             // 单位
              goods_brand: res.data.goods_brand,      // 品牌
              web_url: res.data.web_url,          // 外部链接
@@ -184,7 +184,7 @@
            }
            this.goodsinfodata.categoryStr = res.data.category_first_name + '/' + res.data.category_first_name + '/' + res.data.category_three_name;
            // 发货地 需要 处理
-            this.goodsinfodata.deliver_area = this.goodsinfodata.deliver_area === 0 ? '' : this.goodsinfodata.deliver_area;
+            // this.goodsinfodata.deliver_area = this.goodsinfodata.deliver_area === 0 ? '' : this.goodsinfodata.deliver_area;
            let arr = [];
            arr[0] = res.data.category_first_id;
@@ -521,6 +521,14 @@
          }
        }
+        // 发货地数据处理
+        for(let ai = 0; ai < areaOptions.length; ai++) {
+          if ( Number(spxxData.deliver_area) === Number(areaOptions[ai].id) ) {
+            spxxData.deliver_area = areaOptions[ai].name;
+            break;
+          }
+        }
        // console.log(500,spxxData);
        if( spxxData.imgs.length > 5 ) {
          this.$message({ type: 'warning',message: '商品信息中，商品图片最大数量为5张，请检查' });

--- a/src/views/system/order/components/orderDetail.vue
+++ b/src/views/system/order/components/orderDetail.vue
@@ -716,14 +716,16 @@ export default {
        return
      }
-      this.dialogCheck = true
      let params = {
        goods_order_sn: row.goods_order_sn,
        sku_id: row.goods_option_id
      }
      expressInfoNew(params).then(res => {
        if (res.code == 1 && res.data) {
+          this.dialogCheck = true
          this.activities = res.data.order_track ? res.data.order_track : [];
+        }else {
+          this.$message({type:'error',message: res.message ? res.message : '获取数据失败' });
        }
      })
    },

--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -17,8 +17,7 @@
          <el-tooltip v-if="channel_id == 0" class="item" effect="dark" content="查看2021年10月8日23:00之前的订单" placement="bottom-end">
            <el-button size="small" @click="gotoOldShop">查看老订单</el-button>
          </el-tooltip>
-          <el-button size="mini" type="primary" icon="el-icon-download" @click="handleExportUnSendOrder">导出订单</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-position" @click="handleExportDeliveryOrder">批量发货</el-button>
-          <el-button size="mini" icon="el-icon-position" @click="handleExportDeliveryOrder">批量发货</el-button>
        </div>
        <div v-show="activeName == 'fourth' " style="position: absolute; top: -2px; right: 0;">
          <el-tooltip v-if="channel_id == 0" class="item" effect="dark" content="查看2021年10月8日23:00之前的订单" placement="bottom-end">
@@ -33,35 +32,110 @@
        </div>
      </div>
      <div class="form-box">
-        <el-form class="form-params" ref="form" :model="form" label-width="85px">
+<!--<<<<<<< HEAD-->
-          <el-row type="flex" class="row-bg" justify="space-around">
+<!--        <el-form class="form-params" ref="form" :model="form" label-width="85px">-->
-            <el-col :span="6">
+<!--          <el-row type="flex" class="row-bg" justify="space-around">-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="总订单号：">-->
+<!--                <el-input size="mini" v-model="form.order_sn" placeholder="请输入总订单号"/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="商品名称：">-->
+<!--                <el-input size="mini" v-model="form.goods_name" placeholder="请输入商品名称"/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="收货人：">-->
+<!--                <el-input size="mini" v-model="form.real_name" placeholder="请输入收货人"/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--          <el-row type="flex" class="row-bg" justify="space-around">-->
+<!--            <el-col :span="6">-->
+<!--              <el-form-item label="联系电话：">-->
+<!--                <el-input size="mini" v-model="form.Tel" placeholder="请输入联系电话"/>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6" v-show="activeName == 'first' || activeName == 'fourth' ">-->
+<!--              <el-form-item label="下单时间：">-->
+<!--                <el-date-picker-->
+<!--                  size="mini"-->
+<!--                  v-model="form.dateTime"-->
+<!--                  type="daterange"-->
+<!--                  align="left"-->
+<!--                  unaLink-panels-->
+<!--                  range-separator="至"-->
+<!--                  start-placeholder="开始日期"-->
+<!--                  end-placeholder="结束日期"-->
+<!--                ></el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6" v-show="activeName == 'second' ">-->
+<!--              <el-form-item label="发货时间：">-->
+<!--                <el-date-picker-->
+<!--                  size="mini"-->
+<!--                  v-model="form.sendTime"-->
+<!--                  type="daterange"-->
+<!--                  align="left"-->
+<!--                  unaLink-panels-->
+<!--                  range-separator="至"-->
+<!--                  start-placeholder="开始日期"-->
+<!--                  end-placeholder="结束日期"-->
+<!--                ></el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6" v-show="activeName == 'third' ">-->
+<!--              <el-form-item label="完成时间：">-->
+<!--                <el-date-picker-->
+<!--                  size="mini"-->
+<!--                  v-model="form.finishTime"-->
+<!--                  type="daterange"-->
+<!--                  align="left"-->
+<!--                  unaLink-panels-->
+<!--                  range-separator="至"-->
+<!--                  start-placeholder="开始日期"-->
+<!--                  end-placeholder="结束日期"-->
+<!--                ></el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="6">-->
+<!--              <el-button size="mini" type="primary" icon="el-icon-search" style="margin-left: 20px;"-->
+<!--                         @click="search">搜索-->
+<!--              </el-button>-->
+<!--              <el-button size="mini" icon="el-icon-refresh" @click="resetBtn(true)">重置</el-button>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--=======-->
+        <el-form class="form-params" ref="form" :model="form" label-width="120px" :inline="true" size="small">
          <el-form-item label="总订单号：">
-                <el-input size="mini" v-model="form.order_sn" placeholder="请输入总订单号"/>
+            <el-input style="width:220px;" v-model="form.order_sn" placeholder="请输入总订单号"/>
          </el-form-item>
-            </el-col>
-            <el-col :span="6">
          <el-form-item label="商品名称：">
-                <el-input size="mini" v-model="form.goods_name" placeholder="请输入商品名称"/>
+            <el-input v-model="form.goods_name" placeholder="请输入商品名称"/>
          </el-form-item>
-            </el-col>
-            <el-col :span="6">
          <el-form-item label="收货人：">
-                <el-input size="mini" v-model="form.real_name" placeholder="请输入收货人"/>
+            <el-input v-model="form.real_name" placeholder="请输入收货人"/>
          </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row type="flex" class="row-bg" justify="space-around">
-            <el-col :span="6">
          <el-form-item label="联系电话：">
-                <el-input size="mini" v-model="form.Tel" placeholder="请输入联系电话"/>
+            <el-input v-model="form.Tel" placeholder="请输入联系电话"/>
+          </el-form-item>
+          <el-form-item label="结算状态:" prop="settlement_status" v-show="activeName == 'fourth' ">
+            <el-select v-model="form.settlement_status" placeholder="请选择结算状态" style="width:150px;">
+              <el-option label="全部" value="-1"></el-option>
+              <el-option label="已结算" value="1"></el-option>
+              <el-option label="未结算" value="0"></el-option>
+            </el-select>
          </el-form-item>
-            </el-col>
-            <el-col :span="6" v-show="activeName == 'first' || activeName == 'fourth' ">
+          <el-form-item label="下单时间：" v-show="activeName == 'first' || activeName == 'fourth' ">
-              <el-form-item label="下单时间：">
            <el-date-picker
-                  size="mini"
+              style="width:280px;"
              v-model="form.dateTime"
              type="daterange"
              align="left"
@@ -71,11 +145,9 @@
              end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
-            </el-col>
-            <el-col :span="6" v-show="activeName == 'second' ">
+          <el-form-item label="发货时间："  v-show="activeName == 'second' ">
-              <el-form-item label="发货时间：">
            <el-date-picker
-                  size="mini"
              v-model="form.sendTime"
              type="daterange"
              align="left"
@@ -85,11 +157,9 @@
              end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
-            </el-col>
-            <el-col :span="6" v-show="activeName == 'third' ">
+          <el-form-item label="完成时间：" v-show="activeName == 'third' ">
-              <el-form-item label="完成时间：">
            <el-date-picker
-                  size="mini"
              v-model="form.finishTime"
              type="daterange"
              align="left"
@@ -99,30 +169,31 @@
              end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
-            </el-col>
-            <el-col :span="6">
+          <el-form-item>
-              <el-button size="mini" type="primary" icon="el-icon-search" style="margin-left: 20px;"
+            <el-button size="mini" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-                         @click="search">搜索
-              </el-button>
            <el-button size="mini" icon="el-icon-refresh" @click="resetBtn(true)">重置</el-button>
-            </el-col>
+          </el-form-item>
-          </el-row>
+<!--&gt;>>>>>> dev_hxz-->
        </el-form>
      </div>
      <!-- 表头 -->
      <div class="table-header-spe">
        <el-table class="title_table hxz-el-table" align="center">
-          <el-table-column align="center" width="55" v-if="activeName == 'fourth' ">
+<!--          <el-table-column align="center" width="55" v-if="activeName == 'fourth' ">-->
-            <template slot="header" slot-scope="scope">
+<!--            <template slot="header" slot-scope="scope">-->
-              <el-checkbox v-model="allTablesChecked" ></el-checkbox>
+<!--              <el-checkbox v-model="allTablesChecked" ></el-checkbox>-->
-            </template>
+<!--            </template>-->
-          </el-table-column>
+<!--          </el-table-column>-->
-          <el-table-column label="订单号" align="center" width="220" ></el-table-column>
+<!--          <el-table-column label="订单号" align="center" width="220" ></el-table-column>-->
          <el-table-column label="商品名称" align="center"></el-table-column>
          <el-table-column label="规格/数量/金额" align="center" ></el-table-column>
          <el-table-column label="下单/发货/完成时间" align="center" width="180" ></el-table-column>
+          <el-table-column label="运费" align="center" width="100" ></el-table-column>
          <el-table-column label="收货人" align="center" width="180" ></el-table-column>
          <el-table-column label="联系电话" align="center" width="180"></el-table-column>
+          <el-table-column label="物流信息" align="center" width="120"></el-table-column>
          <el-table-column label="操作" align="center" width="120"></el-table-column>
        </el-table>
      </div>
@@ -130,7 +201,16 @@
      <div class="table-all-con box-card">
        <el-card v-for="(item, index) in tableDataList" :key="index" class="card1 text item">
          <div slot="header" class="el-card-header-spe">
-            <div><span>订单状态：</span><span>{{ orderStatusFormatter(item.order.status) }}</span><span style="margin: 0 0 0 30px;">总订单号：</span><span>{{ item.order.order_sn }}</span></div>
+            <div  style="float:left;">
+              <span>订单状态：</span>
+              <span>{{ orderStatusFormatter(item.order.status) }}</span>
+              <span style="margin: 0 0 0 30px;">总订单号：</span>
+              <span>{{ item.order.order_sn }}</span>
+            </div>
+            <div style="float:right;">
+              <span>结算状态：</span>
+              <span>{{ settlementFormat(item.order.settlement_status) }}</span>
+            </div>
          </div>
          <div class="item-table">
            <el-table
@@ -138,8 +218,8 @@
              :show-header="false"
              :span-method="arraySpanMethod"
              :data="item.order_goods">
-              <el-table-column type="selection" width="55" align="center" v-if="activeName == 'fourth' "></el-table-column>
+<!--              <el-table-column type="selection" width="55" align="center" v-if="activeName == 'fourth' "></el-table-column>-->
-              <el-table-column prop="goods_order_sn" label="订单号" width="220" align="center"></el-table-column>
+<!--              <el-table-column prop="goods_order_sn" label="订单号" width="220" align="center"></el-table-column>-->
              <el-table-column prop="title" label="商品名称" align="center">
                <template slot-scope="scope">
                  <div class="img-title-table">
@@ -157,9 +237,14 @@
              </el-table-column>
              <el-table-column prop="created_time" label="下单时间" width="180" align="center">
                <template slot-scope="scope">
-                  {{ speTiemFormatter(scope.row.created_time) }}<br/>
+                  <span>{{ timeFormatter(scope.row.created_time) }}</span><br/>
-                  {{ speTiemFormatter(scope.row.send_time) }}<br/>
+                  <span :class="{ 'red-text' : sendTimeFormatter(scope.row.send_time) == '未发货' }">{{ sendTimeFormatter(scope.row.send_time) }}</span><br/>
-                  {{ speTiemFormatter(scope.row.updated_time) }}
+                  <span :class="{ 'red-text' : updatedTimeFormatter(scope.row.updated_time) == '未完成' }">{{ updatedTimeFormatter(scope.row.updated_time) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="dispatch_price" width="100" label="运费" align="center">
+                <template slot-scope="scope">
+                  {{ item.order.dispatch_price / 100 }}
                </template>
              </el-table-column>
              <el-table-column prop="phone" width="180" label="收货人" align="center">
@@ -172,6 +257,11 @@
                  {{ item.order.mobile }}
                </template>
              </el-table-column>
+              <el-table-column prop="物流信息" label="物流信息" width="120" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="handleExpressInfo(scope.row)">查看物流</el-button>
+                </template>
+              </el-table-column>
              <el-table-column label="操作" width="120" align="center" fixed="right">
                <template slot-scope="scope">
                  <el-button type="text" @click="handleInfo(scope.row)">详情</el-button>
@@ -222,6 +312,10 @@
        </el-step>
      </el-steps>
      <div class="delivery-data-con">
+        <div>
+          <el-button size="mini" type="primary" icon="el-icon-download" @click="handleExportUnSendOrder">导出订单</el-button>
+        </div>
+        <div>
          <el-upload
            action=""
            class="upload-demo"
@@ -235,6 +329,7 @@
            <el-button size="small" type="primary">上传批量发货Excel表单</el-button>
          </el-upload>
        </div>
+      </div>
      <div class="delivery-tips-con">
        <p style="text-align: center">常见问题</p>
        <p>1、批量发货规则</p>
@@ -250,12 +345,30 @@
        <el-button type="primary" @click="subDelivery">确 定</el-button>
      </span>
    </el-dialog>
+    <!-- 查看物流 -->
+    <el-dialog  title="物流信息" width="50%" class="cutclass" :close-on-click-modal="false" :destroy-on-close="true" :visible.sync="dialogExpress" append-to-body>
+      <div class="logistics">
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in activities"
+            :key="index"
+            :icon="activity.icon"
+            :type="activity.type"
+            color="#0bbd87"
+            :size="activity.size"
+            :timestamp="activity.msg_time">
+            {{activity.content}}
+          </el-timeline-item>
+        </el-timeline>
+        <div v-if="activities.length == 0">暂无物流信息</div>
+      </div>
+    </el-dialog>
  </div>
 </template>
 <script>
  import { indexInfo } from '@/api/webSite'
-  import {listOrder, exportOrder, orderInfo, deliveryOrder, expressList, getOrderTabData , exportUnSendOrderGoodsData,deliveryOrderExport} from '@/api/module/order'
+  import {listOrder, exportOrder, orderInfo, expressInfoNew, deliveryOrder, expressList, getOrderTabData , exportUnSendOrderGoodsData,deliveryOrderExport} from '@/api/module/order'
  import {dateFormat} from '@/utils'
  import OrderDetail from './components/orderDetail.vue'
  import XLSX from "xlsx"
@@ -282,6 +395,7 @@
          goods_name: '',
          real_name: '',
          Tel: '',
+          settlement_status: '',
          dateTime: [],
          finishTime: [],
          sendTime: [],
@@ -300,7 +414,10 @@
        tableHeight: null,
        allTablesChecked: false,
        // 订单导出 入参
-        exportParams: {}
+        exportParams: {},
+        // 查看物流窗口
+        dialogExpress: false,
+        activities: [],
      }
    },
    watch: {
@@ -347,9 +464,9 @@
      checkSelectable( row,index) {
      },
-      // 表格合并 列单元格
+      /** 表格合并 列单元格 */
      arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex > 3) { // 用于设置要合并开始的列号
+        if (columnIndex > 2 && columnIndex != 6) { // 用于设置要合并开始的列号
          if (rowIndex === 0) { // 用于设置合并开始的行号
            return {
              rowspan: 100,　　　　　// 合并的行数
@@ -366,13 +483,32 @@
      formatter(time) {
        return dateFormat(time *1000, 'Y-m-d H:i:s')
      },
-      speTiemFormatter(time) {
+      /** 一般时间 格式化 */
-        if (time) {
+      timeFormatter(time) {
+        if(time) {
          return dateFormat(time *1000, 'Y-m-d H:i:s')
-        }else {
+        } else {
          return '--'
        }
      },
+      /** 发货时间 格式化 */
+      sendTimeFormatter(time) {
+        if(time) {
+          return dateFormat(time *1000, 'Y-m-d H:i:s')
+        } else {
+          return '未发货'
+        }
+      },
+      /** 发货时间 格式化 */
+      updatedTimeFormatter(time) {
+        if(time) {
+          return dateFormat(time *1000, 'Y-m-d H:i:s')
+        } else {
+          return '未完成'
+        }
+      },
      /** 订单状态 */
      orderStatusFormatter(status) {
        if(status === -1) {
@@ -391,6 +527,18 @@
          return '' // 保险，返回空
        }
      },
+      /** 结算状态 */
+      settlementFormat(status) {
+        let res = '';
+        if(status == 0) {
+          res = '未结算'
+        }else if (status == 1) {
+          res = '已结算'
+        } else {
+          res = ''
+        }
+        return res
+      },
      // 重置
      resetBtn(iscall) {
        this.form = {
@@ -401,6 +549,7 @@
          dateTime: [],
          finishTime: [],
          sendTime: [],
+          settlement_status: ''
        }
        this.currentPage = 1
        this.pageSize = 20
@@ -483,6 +632,10 @@
          params['mobile'] = this.form.Tel
        }
+        if (this.form.settlement_status == '0' || this.form.settlement_status == '1') {
+          params['settlement_status'] = this.form.settlement_status
+        }
        if( this.form.dateTime && this.form.dateTime.length == 2) {
          params['created_start_time'] = new Date(this.form.dateTime[0]).getTime() / 1000;
          params['created_end_time'] = new Date(this.form.dateTime[1]).getTime() / 1000;
@@ -663,6 +816,27 @@
          this.$message({type: 'error', message: '部分订单未填写物流公司或物流单号，请完善后再上传'});
        }
      },
+      /** 查看物流信息 */
+      handleExpressInfo(row) {
+        // 如果 商品订单没有发货，则不用请求了
+        if(row.goods_status == 0) {
+          this.$message({type:'warning',message:'您还未发货，暂无物流信息'});
+          return
+        }
+        let params = {
+          goods_order_sn: row.goods_order_sn,
+          sku_id: row.goods_option_id
+        }
+        expressInfoNew(params).then(res => {
+          if (res.code == 1 && res.data) {
+            this.dialogExpress = true
+            this.activities = res.data.order_track ? res.data.order_track : [];
+          }else {
+            this.$message({type:'error',message: res.message ? res.message : '获取数据失败' });
+          }
+        })
+      },
      // 订单详情
      handleInfo(row) {
        let order_id = row.order_id
@@ -757,13 +931,17 @@
  }
  .form-box {
-    background-color: #F7F8FA;
    /*margin-bottom: 20px;*/
-    padding-top: 20px;
+    /*padding-top: 10px;*/
  }
  .form-params {
+    background-color: #F7F8FA;
+  }
+  /deep/.form-params .el-form-item {
+    margin: 5px 0 5px 0;
  }
  .img-title-table {
    display: flex;
@@ -780,6 +958,10 @@
    width: 80%;
    margin: 10px auto;
    font-weight: bold;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    flex-direction: row;
  }
  .delivery-tips-con {
@@ -788,10 +970,10 @@
    font-weight: bold;
  }
-  .delivery-data-con {
+  /*.delivery-data-con {*/
-    height: 100px;
+  /*  height: 100px;*/
-    margin: 20px auto;
+  /*  margin: 20px auto;*/
-  }
+  /*}*/
  .upload-demo {
    text-align: center;
@@ -804,12 +986,13 @@
  .table-header-spe {
    background-color: #F7F8FA;
-    margin:10px 0 10px;
+    padding:0 34px 0 22px;
+    margin: 5px 0;
  }
  /deep/ .title_table{
-    width: calc(100% - 94px) !important;
+    /*width: calc(100% - 94px) !important;*/
-    margin: 0 40px;
+    /*margin: 0 40px;*/
  }
  /deep/ .title_table .el-table__body-wrapper{
    display: none !important;
@@ -823,11 +1006,16 @@
  }
  .table-all-con {
-    height: calc(100% - 250px);
+    height: calc(100% - 190px);
    overflow: auto;
  }
  .ml10 {
    margin-left: 10px;
  }
+  .red-text {
+    font-size: 12px;
+    color: red!important;
+  }
 </style>
--- a/src/views/system/retreat/edit.vue
+++ b/src/views/system/retreat/edit.vue
@@ -88,6 +88,24 @@
          </el-row>
        </div>
      </div>
+      <!-- 买家信息 -->
+      <div>
+        <div class="card-header-title">
+          <span class="blue-block blue-block-goods-title"></span>买家信息
+        </div>
+        <div>
+          <el-row class="row-title">
+            <el-col :span="4" class="text-r text-c">收货人姓名</el-col>
+            <el-col :span="4" class="text-r text-c">联系电话</el-col>
+            <el-col :span="10" class="text-r text-c">收货地址</el-col>
+          </el-row>
+          <el-row class="row-title">
+            <el-col :span="4" class="text-l text-c">{{ orderConsignee.real_name }}</el-col>
+            <el-col :span="4" class="text-l text-c">{{ orderConsignee.mobile }}</el-col>
+            <el-col :span="10" class="text-l text-c">{{ orderConsignee.provice + orderConsignee.city + orderConsignee.district + orderConsignee.street + orderConsignee.address }}</el-col>
+          </el-row>
+        </div>
+      </div>
      <!-- 买家退货凭证 -->
      <div v-if="asOrderType == 2">
        <div class="card-header-title">
@@ -280,6 +298,16 @@
          goods_option_title: '', // 商品规格
          total: '', // 商品数量
        },
+        // 买家信息
+        orderConsignee: {
+          real_name: '',
+          mobile: '',
+          provice: '',
+          city: '',
+          district: '',
+          street: '',
+          address: '',
+        },
        // 售后申请 图片 list
        asSrcList: [],
        asApplyList: [],
@@ -498,6 +526,11 @@
              this.goodsOrderDetail.goods_price = res.data.order_goods.goods_price / 100
            }
+            // 买家 信息
+            if (res.data.order_consignee) {
+              this.orderConsignee = res.data.order_consignee;
+            }
            // 退款凭证 list 数据
            this.returnInfoTableData = [];
            if(res.data.order_refund.return_info && res.data.order_refund.return_info.express_code) {
@@ -843,6 +876,10 @@
    text-align: left;
  }
+  .text-c {
+    justify-content: center!important;
+  }
  .count-down-con {
    padding: 10px 20px;
    margin: 0;