diff --git a/public/mer.html b/public/mer.html
index 8288dbb..c2a654c 100755
--- a/public/mer.html
+++ b/public/mer.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>加载中...</title><script src=https://admin.njqicheng.cn/api/script></script><link href=/mer/css/chunk-libs.8547dd77.css rel=stylesheet><link href=/mer/css/app.fcbd9727.css rel=stylesheet></head><body><div id=app></div><script src=/mer/js/chunk-elementUI.e60abebc.js></script><script src=/mer/js/chunk-libs.457c64f0.js></script><script>(function(c){function d(d){for(var n,u,k=d[0],a=d[1],b=d[2],t=0,r=[];t<k.length;t++)u=k[t],h[u]&&r.push(h[u][0]),h[u]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(c[n]=a[n]);o&&o(d);while(r.length)r.shift()();return f.push.apply(f,b||[]),e()}function e(){for(var c,d=0;d<f.length;d++){for(var e=f[d],n=!0,u=1;u<e.length;u++){var k=e[u];0!==h[k]&&(n=!1)}n&&(f.splice(d--,1),c=a(a.s=e[0]))}return c}var n={},u={runtime:0},h={runtime:0},f=[];function k(c){return a.p+"mer/js/"+({"chunk-commons":"chunk-commons"}[c]||c)+"."+{"chunk-058c2db3":"14983853","chunk-0b82ed48":"46203daa","chunk-0c1cbcc4":"63766e7a","chunk-0d07854c":"1464f576","chunk-0f1041d4":"f0a58204","chunk-10999506":"a1f67d3f","chunk-12848218":"de987a4a","chunk-169cf82e":"3fe02146","chunk-171bc9d3":"0759b7b2","chunk-17df9043":"96d7c3bf","chunk-197a4d8b":"75d8a799","chunk-19b998f8":"aa0a24a4","chunk-1b6413b7":"c7f73518","chunk-1d04b296":"50ee369d","chunk-1e759944":"dd830cb0","chunk-1ebf3d75":"7c82b40e","chunk-1f890262":"13928090","chunk-274abd28":"ecd4cec4","chunk-275a7c87":"0ff5bb07","chunk-2a7f07f2":"fdacdaa0","chunk-2d054238":"61d0ac8b","chunk-2d0aba79":"b3bc7800","chunk-2d0abdff":"3388afe9","chunk-2d0aed35":"b60b24e4","chunk-2d0b1e40":"514e6248","chunk-2d0b5a65":"9b943e10","chunk-2d0ba554":"df6518c0","chunk-2d0c08f3":"946be73e","chunk-2d0c481a":"368fb419","chunk-2d0c8a44":"5aab403a","chunk-2d0cfb23":"447e559d","chunk-163ed606":"f644cf60","chunk-821a4192":"d9e9fe3d","chunk-db426b92":"c2ba4090","chunk-2d0d095b":"4becd2ef","chunk-2d0d364b":"07f4e069","chunk-2d0da983":"80fb5a98","chunk-2d0e5b8e":"8a90b472","chunk-2d0e625e":"6e5e72f4","chunk-2d0e6675":"afd99a20","chunk-2d207706":"06fa06fb","chunk-2d208819":"d7899c77","chunk-2d213182":"0dbe867a","chunk-2d213ed3":"1482fdec","chunk-2d21d8a3":"5633541a","chunk-2d229240":"59d64f2f","chunk-2d22ccf1":"6049056e","chunk-2d230c26":"14087868","chunk-2d230fe7":"72d20103","chunk-2f105f7b":"561b3efd","chunk-2fe6c138":"6d8822f3","chunk-32166dcd":"db3f7c86","chunk-35c0d5a1":"99213570","chunk-3c3562ac":"746ca36e","chunk-3f5334ed":"c80d54f2","chunk-fae2fff4":"4fd17f89","chunk-3fe6efc8":"4a91d3f0","chunk-4172bb78":"5699e27b","chunk-463d981f":"f5d4dd00","chunk-535a2d57":"e1328f7e","chunk-56326ab0":"84fff177","chunk-56bcb95e":"27a506a3","chunk-5c1f1857":"0e3caf42","chunk-631c8db2":"a4af454a","chunk-6b8f76da":"a41f2682","chunk-6dd8ad36":"431cbbad","chunk-779865ca":"3d6dc0bf","chunk-98e556f2":"6e51bc43","chunk-a366f0a2":"fde28cec","chunk-a73d2e72":"07eddf41","chunk-a97676f4":"3df689a0","chunk-b9566590":"18446cb7","chunk-bbb363ae":"3230d2a2","chunk-c44939ee":"f0c04f0f","chunk-commons":"fbb8c635","chunk-18164422":"6c81c213","chunk-26a0f96a":"3bb423bb","chunk-2d0ab2c5":"58598371","chunk-2f14fe56":"600d5f3b","chunk-3397cef4":"ffad8cb2","chunk-430a0a7e":"12d72826","chunk-781b0f0e":"3def5fae","chunk-018b6b2e":"3609ecca","chunk-2d0c8a73":"acd57f4c","chunk-4069bf85":"78e4ccf9","chunk-4963f895":"1824bb31","chunk-48b3c126":"b7f0675f","chunk-4a490806":"aaf5c1d6","chunk-e64c34de":"df24a0c3","chunk-83a46c26":"c8dc3c81","chunk-3739887b":"3514f837","chunk-3e052e58":"c1b3cfab","chunk-4bff4baf":"1ab9fdba","chunk-57fa5ed2":"772f15dd","chunk-7e8f996c":"cd09006b","chunk-a5c85652":"37a7abb6","chunk-b8817b4e":"ebe665e6","chunk-c3911a96":"77d84a55","chunk-ca6e7caa":"026a1d72","chunk-d97b72b4":"95fa4655","chunk-15159370":"42acb228","chunk-1ec664f0":"745c6ee4","chunk-2d213caa":"846d03ec","chunk-6dd0b7c5":"de66c339","chunk-c2c1b6c2":"9ac8e616","chunk-56a66d18":"5f1199f1","chunk-7dd21366":"027c57c8","chunk-eeec923e":"6083a414","chunk-ce53422a":"46660e4a","chunk-fd4f7644":"73943fcf","chunk-2d0b6747":"223bd9dc","chunk-0b65ffb6":"a920dbf5","chunk-12950967":"630c579a","chunk-2d0a3577":"6d7c8e42","chunk-2d0a43df":"edc4989f","chunk-2d0aa90c":"07c7ea69","chunk-2d0aab07":"4bc4e88a","chunk-2d0abc00":"1469fd22","chunk-2d0aeb45":"0ec15d50","chunk-2d0af08c":"01a6d3c6","chunk-2d0afa49":"b4e48d94","chunk-2d0b6187":"00337985","chunk-2d0ba136":"12d1142c","chunk-2d0bb267":"77d06824","chunk-2d0bcec1":"86feb86e","chunk-2d0bff92":"55de1f52","chunk-2d0c0494":"5adc358b","chunk-2d0c0a09":"0c66081a","chunk-2d0c4313":"bf31e4d3","chunk-2d0c46d1":"6ac88c30","chunk-2d0c512b":"899f04c9","chunk-2d0cf16e":"ca888ecf","chunk-2d0d056d":"b0eb18bb","chunk-2d0d0645":"40459d42","chunk-2d0d2f22":"3ee31235","chunk-2d0d61fd":"a4ed14e0","chunk-2d0d7e63":"2ea8c91e","chunk-2d0e1b57":"71c91d9f","chunk-2d0e1fbe":"cbdee0aa","chunk-2d0e22d6":"a86c6457","chunk-2d0e542a":"02a326d7","chunk-2d0e57ec":"c147ec55","chunk-2d0e6553":"f5e48f57","chunk-2d0e6c86":"e50be0c0","chunk-2d0f0a11":"631d5885","chunk-2d208ac5":"8cbdecb5","chunk-2d209408":"7f232250","chunk-2d20f745":"221e7d58","chunk-2d20ff23":"d9a0988d","chunk-2d2138c7":"24ea1d8b","chunk-2d216f3b":"84e79bc4","chunk-2d217e5b":"5bc6713d","chunk-2d21b84a":"ee0eb6f0","chunk-2d21dcd2":"13b26df1","chunk-2d21f327":"f28acdef","chunk-2d2214b3":"3a990375","chunk-2d221799":"9b6ea1f4","chunk-2d221814":"58381938","chunk-2d221a34":"87ff53be","chunk-2d22502a":"b6fa2b4c","chunk-2d226775":"655c4b65","chunk-2d229411":"02f133ef","chunk-2d2295e9":"8eaff5ce","chunk-2d22c171":"d2dd748f","chunk-2d22c2b8":"5a2624eb","chunk-2d22ca58":"d5ac07ae","chunk-2d2311f7":"f859bdaf","chunk-2d237ee7":"80a733f8","chunk-2d238465":"197b0da9","chunk-74523e0e":"de1400d6","chunk-7459c510":"67aab081","chunk-7470082e":"e3a05d21","chunk-74c572cd":"6561dc84","chunk-7532b3ea":"52ca9e9b","chunk-e13e4362":"84aaa7b2"}[c]+".js"}function a(d){if(n[d])return n[d].exports;var e=n[d]={i:d,l:!1,exports:{}};return c[d].call(e.exports,e,e.exports,a),e.l=!0,e.exports}a.e=function(c){var d=[],e={"chunk-058c2db3":1,"chunk-0b82ed48":1,"chunk-0c1cbcc4":1,"chunk-0d07854c":1,"chunk-10999506":1,"chunk-12848218":1,"chunk-169cf82e":1,"chunk-171bc9d3":1,"chunk-197a4d8b":1,"chunk-1b6413b7":1,"chunk-1d04b296":1,"chunk-1e759944":1,"chunk-1ebf3d75":1,"chunk-1f890262":1,"chunk-274abd28":1,"chunk-275a7c87":1,"chunk-2a7f07f2":1,"chunk-2d054238":1,"chunk-163ed606":1,"chunk-821a4192":1,"chunk-db426b92":1,"chunk-2fe6c138":1,"chunk-32166dcd":1,"chunk-35c0d5a1":1,"chunk-3c3562ac":1,"chunk-fae2fff4":1,"chunk-3fe6efc8":1,"chunk-4172bb78":1,"chunk-463d981f":1,"chunk-535a2d57":1,"chunk-56326ab0":1,"chunk-56bcb95e":1,"chunk-5c1f1857":1,"chunk-631c8db2":1,"chunk-6b8f76da":1,"chunk-6dd8ad36":1,"chunk-779865ca":1,"chunk-98e556f2":1,"chunk-a366f0a2":1,"chunk-a73d2e72":1,"chunk-b9566590":1,"chunk-bbb363ae":1,"chunk-c44939ee":1,"chunk-commons":1,"chunk-18164422":1,"chunk-26a0f96a":1,"chunk-2f14fe56":1,"chunk-3397cef4":1,"chunk-430a0a7e":1,"chunk-781b0f0e":1,"chunk-018b6b2e":1,"chunk-4069bf85":1,"chunk-4963f895":1,"chunk-48b3c126":1,"chunk-e64c34de":1,"chunk-83a46c26":1,"chunk-3739887b":1,"chunk-3e052e58":1,"chunk-4bff4baf":1,"chunk-57fa5ed2":1,"chunk-7e8f996c":1,"chunk-a5c85652":1,"chunk-b8817b4e":1,"chunk-c3911a96":1,"chunk-ca6e7caa":1,"chunk-15159370":1,"chunk-1ec664f0":1,"chunk-6dd0b7c5":1,"chunk-c2c1b6c2":1,"chunk-56a66d18":1,"chunk-7dd21366":1,"chunk-eeec923e":1,"chunk-ce53422a":1,"chunk-fd4f7644":1};u[c]?d.push(u[c]):0!==u[c]&&e[c]&&d.push(u[c]=new Promise((function(d,e){for(var n="mer/css/"+({"chunk-commons":"chunk-commons"}[c]||c)+"."+{"chunk-058c2db3":"a26f1f87","chunk-0b82ed48":"83294796","chunk-0c1cbcc4":"efaeace1","chunk-0d07854c":"2c622be5","chunk-0f1041d4":"31d6cfe0","chunk-10999506":"fa07cca4","chunk-12848218":"8ff82287","chunk-169cf82e":"2e4cca8d","chunk-171bc9d3":"e0ac7b20","chunk-17df9043":"31d6cfe0","chunk-197a4d8b":"e71f8c15","chunk-19b998f8":"31d6cfe0","chunk-1b6413b7":"5b67e233","chunk-1d04b296":"fd9175e0","chunk-1e759944":"13187d85","chunk-1ebf3d75":"ad7a9ef0","chunk-1f890262":"da05ad4e","chunk-274abd28":"f018453a","chunk-275a7c87":"588d3a87","chunk-2a7f07f2":"20f788ea","chunk-2d054238":"85c2e9c9","chunk-2d0aba79":"31d6cfe0","chunk-2d0abdff":"31d6cfe0","chunk-2d0aed35":"31d6cfe0","chunk-2d0b1e40":"31d6cfe0","chunk-2d0b5a65":"31d6cfe0","chunk-2d0ba554":"31d6cfe0","chunk-2d0c08f3":"31d6cfe0","chunk-2d0c481a":"31d6cfe0","chunk-2d0c8a44":"31d6cfe0","chunk-2d0cfb23":"31d6cfe0","chunk-163ed606":"764d7aeb","chunk-821a4192":"32940cd9","chunk-db426b92":"42e27511","chunk-2d0d095b":"31d6cfe0","chunk-2d0d364b":"31d6cfe0","chunk-2d0da983":"31d6cfe0","chunk-2d0e5b8e":"31d6cfe0","chunk-2d0e625e":"31d6cfe0","chunk-2d0e6675":"31d6cfe0","chunk-2d207706":"31d6cfe0","chunk-2d208819":"31d6cfe0","chunk-2d213182":"31d6cfe0","chunk-2d213ed3":"31d6cfe0","chunk-2d21d8a3":"31d6cfe0","chunk-2d229240":"31d6cfe0","chunk-2d22ccf1":"31d6cfe0","chunk-2d230c26":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-2f105f7b":"31d6cfe0","chunk-2fe6c138":"24e5e177","chunk-32166dcd":"2aecd557","chunk-35c0d5a1":"2682826d","chunk-3c3562ac":"9912aacf","chunk-3f5334ed":"31d6cfe0","chunk-fae2fff4":"61b8ec23","chunk-3fe6efc8":"ef822605","chunk-4172bb78":"51bc6532","chunk-463d981f":"299b9a7d","chunk-535a2d57":"65df382f","chunk-56326ab0":"da3d3587","chunk-56bcb95e":"4fe0ca23","chunk-5c1f1857":"f1d96a2f","chunk-631c8db2":"8e4f3276","chunk-6b8f76da":"f4308245","chunk-6dd8ad36":"e9b939d9","chunk-779865ca":"48bd3c0f","chunk-98e556f2":"07f63107","chunk-a366f0a2":"5fb0ed6e","chunk-a73d2e72":"576d9192","chunk-a97676f4":"31d6cfe0","chunk-b9566590":"7a7cf3d6","chunk-bbb363ae":"9a6b3cdc","chunk-c44939ee":"7209704d","chunk-commons":"59123995","chunk-18164422":"9fa88b6a","chunk-26a0f96a":"12e11632","chunk-2d0ab2c5":"31d6cfe0","chunk-2f14fe56":"94a1af3f","chunk-3397cef4":"80f2bb93","chunk-430a0a7e":"2cfe8e5e","chunk-781b0f0e":"44e92b98","chunk-018b6b2e":"71e218fa","chunk-2d0c8a73":"31d6cfe0","chunk-4069bf85":"4d0592f6","chunk-4963f895":"4d0592f6","chunk-48b3c126":"f7dcb935","chunk-4a490806":"31d6cfe0","chunk-e64c34de":"6823e97f","chunk-83a46c26":"871538f6","chunk-3739887b":"0b9cc9fc","chunk-3e052e58":"d42f19e7","chunk-4bff4baf":"3d5a9286","chunk-57fa5ed2":"b5dba6b7","chunk-7e8f996c":"2946ed58","chunk-a5c85652":"356ed959","chunk-b8817b4e":"5410fdab","chunk-c3911a96":"003f5deb","chunk-ca6e7caa":"6c0ca04d","chunk-d97b72b4":"31d6cfe0","chunk-15159370":"38aa9e04","chunk-1ec664f0":"6cbb5717","chunk-2d213caa":"31d6cfe0","chunk-6dd0b7c5":"afa7ab4e","chunk-c2c1b6c2":"ef5a307c","chunk-56a66d18":"2b44d725","chunk-7dd21366":"0c159301","chunk-eeec923e":"2198686d","chunk-ce53422a":"97a429d9","chunk-fd4f7644":"d50b9c97","chunk-2d0b6747":"31d6cfe0","chunk-0b65ffb6":"31d6cfe0","chunk-12950967":"31d6cfe0","chunk-2d0a3577":"31d6cfe0","chunk-2d0a43df":"31d6cfe0","chunk-2d0aa90c":"31d6cfe0","chunk-2d0aab07":"31d6cfe0","chunk-2d0abc00":"31d6cfe0","chunk-2d0aeb45":"31d6cfe0","chunk-2d0af08c":"31d6cfe0","chunk-2d0afa49":"31d6cfe0","chunk-2d0b6187":"31d6cfe0","chunk-2d0ba136":"31d6cfe0","chunk-2d0bb267":"31d6cfe0","chunk-2d0bcec1":"31d6cfe0","chunk-2d0bff92":"31d6cfe0","chunk-2d0c0494":"31d6cfe0","chunk-2d0c0a09":"31d6cfe0","chunk-2d0c4313":"31d6cfe0","chunk-2d0c46d1":"31d6cfe0","chunk-2d0c512b":"31d6cfe0","chunk-2d0cf16e":"31d6cfe0","chunk-2d0d056d":"31d6cfe0","chunk-2d0d0645":"31d6cfe0","chunk-2d0d2f22":"31d6cfe0","chunk-2d0d61fd":"31d6cfe0","chunk-2d0d7e63":"31d6cfe0","chunk-2d0e1b57":"31d6cfe0","chunk-2d0e1fbe":"31d6cfe0","chunk-2d0e22d6":"31d6cfe0","chunk-2d0e542a":"31d6cfe0","chunk-2d0e57ec":"31d6cfe0","chunk-2d0e6553":"31d6cfe0","chunk-2d0e6c86":"31d6cfe0","chunk-2d0f0a11":"31d6cfe0","chunk-2d208ac5":"31d6cfe0","chunk-2d209408":"31d6cfe0","chunk-2d20f745":"31d6cfe0","chunk-2d20ff23":"31d6cfe0","chunk-2d2138c7":"31d6cfe0","chunk-2d216f3b":"31d6cfe0","chunk-2d217e5b":"31d6cfe0","chunk-2d21b84a":"31d6cfe0","chunk-2d21dcd2":"31d6cfe0","chunk-2d21f327":"31d6cfe0","chunk-2d2214b3":"31d6cfe0","chunk-2d221799":"31d6cfe0","chunk-2d221814":"31d6cfe0","chunk-2d221a34":"31d6cfe0","chunk-2d22502a":"31d6cfe0","chunk-2d226775":"31d6cfe0","chunk-2d229411":"31d6cfe0","chunk-2d2295e9":"31d6cfe0","chunk-2d22c171":"31d6cfe0","chunk-2d22c2b8":"31d6cfe0","chunk-2d22ca58":"31d6cfe0","chunk-2d2311f7":"31d6cfe0","chunk-2d237ee7":"31d6cfe0","chunk-2d238465":"31d6cfe0","chunk-74523e0e":"31d6cfe0","chunk-7459c510":"31d6cfe0","chunk-7470082e":"31d6cfe0","chunk-74c572cd":"31d6cfe0","chunk-7532b3ea":"31d6cfe0","chunk-e13e4362":"31d6cfe0"}[c]+".css",h=a.p+n,f=document.getElementsByTagName("link"),k=0;k<f.length;k++){var b=f[k],t=b.getAttribute("data-href")||b.getAttribute("href");if("stylesheet"===b.rel&&(t===n||t===h))return d()}var r=document.getElementsByTagName("style");for(k=0;k<r.length;k++){b=r[k],t=b.getAttribute("data-href");if(t===n||t===h)return d()}var o=document.createElement("link");o.rel="stylesheet",o.type="text/css",o.onload=d,o.onerror=function(d){var n=d&&d.target&&d.target.src||h,f=new Error("Loading CSS chunk "+c+" failed.\n("+n+")");f.request=n,delete u[c],o.parentNode.removeChild(o),e(f)},o.href=h;var i=document.getElementsByTagName("head")[0];i.appendChild(o)})).then((function(){u[c]=0})));var n=h[c];if(0!==n)if(n)d.push(n[2]);else{var f=new Promise((function(d,e){n=h[c]=[d,e]}));d.push(n[2]=f);var b,t=document.createElement("script");t.charset="utf-8",t.timeout=120,a.nc&&t.setAttribute("nonce",a.nc),t.src=k(c),b=function(d){t.onerror=t.onload=null,clearTimeout(r);var e=h[c];if(0!==e){if(e){var n=d&&("load"===d.type?"missing":d.type),u=d&&d.target&&d.target.src,f=new Error("Loading chunk "+c+" failed.\n("+n+": "+u+")");f.type=n,f.request=u,e[1](f)}h[c]=void 0}};var r=setTimeout((function(){b({type:"timeout",target:t})}),12e4);t.onerror=t.onload=b,document.head.appendChild(t)}return Promise.all(d)},a.m=c,a.c=n,a.d=function(c,d,e){a.o(c,d)||Object.defineProperty(c,d,{enumerable:!0,get:e})},a.r=function(c){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(c,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(c,"__esModule",{value:!0})},a.t=function(c,d){if(1&d&&(c=a(c)),8&d)return c;if(4&d&&"object"===typeof c&&c&&c.__esModule)return c;var e=Object.create(null);if(a.r(e),Object.defineProperty(e,"default",{enumerable:!0,value:c}),2&d&&"string"!=typeof c)for(var n in c)a.d(e,n,function(d){return c[d]}.bind(null,n));return e},a.n=function(c){var d=c&&c.__esModule?function(){return c["default"]}:function(){return c};return a.d(d,"a",d),d},a.o=function(c,d){return Object.prototype.hasOwnProperty.call(c,d)},a.p="/",a.oe=function(c){throw console.error(c),c};var b=window["webpackJsonp"]=window["webpackJsonp"]||[],t=b.push.bind(b);b.push=d,b=b.slice();for(var r=0;r<b.length;r++)d(b[r]);var o=t;e()})([]);</script><script src=/mer/js/app.a3058557.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>加载中...</title><script src=https://admin.njqicheng.cn/api/script></script><link href=/mer/css/chunk-libs.8547dd77.css rel=stylesheet><link href=/mer/css/app.fcbd9727.css rel=stylesheet></head><body><div id=app></div><script src=/mer/js/chunk-elementUI.e60abebc.js></script><script src=/mer/js/chunk-libs.457c64f0.js></script><script>(function(c){function d(d){for(var n,u,k=d[0],a=d[1],b=d[2],t=0,r=[];t<k.length;t++)u=k[t],h[u]&&r.push(h[u][0]),h[u]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(c[n]=a[n]);o&&o(d);while(r.length)r.shift()();return f.push.apply(f,b||[]),e()}function e(){for(var c,d=0;d<f.length;d++){for(var e=f[d],n=!0,u=1;u<e.length;u++){var k=e[u];0!==h[k]&&(n=!1)}n&&(f.splice(d--,1),c=a(a.s=e[0]))}return c}var n={},u={runtime:0},h={runtime:0},f=[];function k(c){return a.p+"mer/js/"+({"chunk-commons":"chunk-commons"}[c]||c)+"."+{"chunk-058c2db3":"14983853","chunk-0b82ed48":"46203daa","chunk-0c1cbcc4":"63766e7a","chunk-0d07854c":"1464f576","chunk-0f1041d4":"f0a58204","chunk-10999506":"a1f67d3f","chunk-12848218":"de987a4a","chunk-169cf82e":"3fe02146","chunk-171bc9d3":"0759b7b2","chunk-17df9043":"96d7c3bf","chunk-197a4d8b":"75d8a799","chunk-19b998f8":"aa0a24a4","chunk-1b6413b7":"c7f73518","chunk-1d04b296":"50ee369d","chunk-1e759944":"dd830cb0","chunk-1ebf3d75":"7c82b40e","chunk-1f890262":"13928090","chunk-274abd28":"ecd4cec4","chunk-275a7c87":"0ff5bb07","chunk-2a7f07f2":"fdacdaa0","chunk-2d054238":"61d0ac8b","chunk-2d0aba79":"b3bc7800","chunk-2d0abdff":"3388afe9","chunk-2d0aed35":"b60b24e4","chunk-2d0b1e40":"514e6248","chunk-2d0b5a65":"9b943e10","chunk-2d0ba554":"df6518c0","chunk-2d0c08f3":"946be73e","chunk-2d0c481a":"368fb419","chunk-2d0c8a44":"5aab403a","chunk-2d0cfb23":"447e559d","chunk-163ed606":"f644cf60","chunk-821a4192":"d9e9fe3d","chunk-db426b92":"c2ba4090","chunk-2d0d095b":"4becd2ef","chunk-2d0d364b":"07f4e069","chunk-2d0da983":"80fb5a98","chunk-2d0e5b8e":"8a90b472","chunk-2d0e625e":"6e5e72f4","chunk-2d0e6675":"afd99a20","chunk-2d207706":"06fa06fb","chunk-2d208819":"d7899c77","chunk-2d213182":"0dbe867a","chunk-2d213ed3":"1482fdec","chunk-2d21d8a3":"5633541a","chunk-2d229240":"59d64f2f","chunk-2d22ccf1":"6049056e","chunk-2d230c26":"14087868","chunk-2d230fe7":"72d20103","chunk-2f105f7b":"561b3efd","chunk-2fe6c138":"6d8822f3","chunk-32166dcd":"db3f7c86","chunk-35c0d5a1":"99213570","chunk-3c3562ac":"746ca36e","chunk-3f5334ed":"c80d54f2","chunk-fae2fff4":"4fd17f89","chunk-3fe6efc8":"4a91d3f0","chunk-4172bb78":"5699e27b","chunk-463d981f":"f5d4dd00","chunk-535a2d57":"e1328f7e","chunk-56326ab0":"84fff177","chunk-56bcb95e":"27a506a3","chunk-5c1f1857":"0e3caf42","chunk-631c8db2":"a4af454a","chunk-6b8f76da":"a41f2682","chunk-6dd8ad36":"431cbbad","chunk-779865ca":"3d6dc0bf","chunk-98e556f2":"6e51bc43","chunk-a366f0a2":"fde28cec","chunk-a73d2e72":"07eddf41","chunk-a97676f4":"3df689a0","chunk-b9566590":"18446cb7","chunk-bbb363ae":"3230d2a2","chunk-c44939ee":"f0c04f0f","chunk-commons":"fbb8c635","chunk-18164422":"6c81c213","chunk-26a0f96a":"3bb423bb","chunk-2d0ab2c5":"58598371","chunk-2f14fe56":"600d5f3b","chunk-3397cef4":"ffad8cb2","chunk-430a0a7e":"12d72826","chunk-781b0f0e":"3def5fae","chunk-018b6b2e":"3609ecca","chunk-2d0c8a73":"acd57f4c","chunk-4069bf85":"78e4ccf9","chunk-4963f895":"1824bb31","chunk-48b3c126":"b7f0675f","chunk-4a490806":"aaf5c1d6","chunk-e64c34de":"df24a0c3","chunk-83a46c26":"c8dc3c81","chunk-3739887b":"3514f837","chunk-3e052e58":"c1b3cfab","chunk-4bff4baf":"1ab9fdba","chunk-57fa5ed2":"772f15dd","chunk-7e8f996c":"cd09006b","chunk-a5c85652":"37a7abb6","chunk-b8817b4e":"ebe665e6","chunk-c3911a96":"77d84a55","chunk-ca6e7caa":"026a1d72","chunk-d97b72b4":"95fa4655","chunk-15159370":"42acb228","chunk-1ec664f0":"745c6ee4","chunk-2d213caa":"846d03ec","chunk-6dd0b7c5":"de66c339","chunk-c2c1b6c2":"9ac8e616","chunk-56a66d18":"5f1199f1","chunk-7dd21366":"027c57c8","chunk-e0c6291c":"79b59fc8","chunk-ce53422a":"46660e4a","chunk-fd4f7644":"73943fcf","chunk-2d0b6747":"223bd9dc","chunk-0b65ffb6":"a920dbf5","chunk-12950967":"630c579a","chunk-2d0a3577":"6d7c8e42","chunk-2d0a43df":"edc4989f","chunk-2d0aa90c":"07c7ea69","chunk-2d0aab07":"4bc4e88a","chunk-2d0abc00":"1469fd22","chunk-2d0aeb45":"0ec15d50","chunk-2d0af08c":"01a6d3c6","chunk-2d0afa49":"b4e48d94","chunk-2d0b6187":"00337985","chunk-2d0ba136":"12d1142c","chunk-2d0bb267":"77d06824","chunk-2d0bcec1":"86feb86e","chunk-2d0bff92":"55de1f52","chunk-2d0c0494":"5adc358b","chunk-2d0c0a09":"0c66081a","chunk-2d0c4313":"bf31e4d3","chunk-2d0c46d1":"6ac88c30","chunk-2d0c512b":"899f04c9","chunk-2d0cf16e":"ca888ecf","chunk-2d0d056d":"b0eb18bb","chunk-2d0d0645":"40459d42","chunk-2d0d2f22":"3ee31235","chunk-2d0d61fd":"a4ed14e0","chunk-2d0d7e63":"2ea8c91e","chunk-2d0e1b57":"71c91d9f","chunk-2d0e1fbe":"cbdee0aa","chunk-2d0e22d6":"a86c6457","chunk-2d0e542a":"02a326d7","chunk-2d0e57ec":"c147ec55","chunk-2d0e6553":"f5e48f57","chunk-2d0e6c86":"e50be0c0","chunk-2d0f0a11":"631d5885","chunk-2d208ac5":"8cbdecb5","chunk-2d209408":"7f232250","chunk-2d20f745":"221e7d58","chunk-2d20ff23":"d9a0988d","chunk-2d2138c7":"24ea1d8b","chunk-2d216f3b":"84e79bc4","chunk-2d217e5b":"5bc6713d","chunk-2d21b84a":"ee0eb6f0","chunk-2d21dcd2":"13b26df1","chunk-2d21f327":"f28acdef","chunk-2d2214b3":"3a990375","chunk-2d221799":"9b6ea1f4","chunk-2d221814":"58381938","chunk-2d221a34":"87ff53be","chunk-2d22502a":"b6fa2b4c","chunk-2d226775":"655c4b65","chunk-2d229411":"02f133ef","chunk-2d2295e9":"8eaff5ce","chunk-2d22c171":"d2dd748f","chunk-2d22c2b8":"5a2624eb","chunk-2d22ca58":"d5ac07ae","chunk-2d2311f7":"f859bdaf","chunk-2d237ee7":"80a733f8","chunk-2d238465":"197b0da9","chunk-74523e0e":"de1400d6","chunk-7459c510":"67aab081","chunk-7470082e":"e3a05d21","chunk-74c572cd":"6561dc84","chunk-7532b3ea":"52ca9e9b","chunk-e13e4362":"84aaa7b2"}[c]+".js"}function a(d){if(n[d])return n[d].exports;var e=n[d]={i:d,l:!1,exports:{}};return c[d].call(e.exports,e,e.exports,a),e.l=!0,e.exports}a.e=function(c){var d=[],e={"chunk-058c2db3":1,"chunk-0b82ed48":1,"chunk-0c1cbcc4":1,"chunk-0d07854c":1,"chunk-10999506":1,"chunk-12848218":1,"chunk-169cf82e":1,"chunk-171bc9d3":1,"chunk-197a4d8b":1,"chunk-1b6413b7":1,"chunk-1d04b296":1,"chunk-1e759944":1,"chunk-1ebf3d75":1,"chunk-1f890262":1,"chunk-274abd28":1,"chunk-275a7c87":1,"chunk-2a7f07f2":1,"chunk-2d054238":1,"chunk-163ed606":1,"chunk-821a4192":1,"chunk-db426b92":1,"chunk-2fe6c138":1,"chunk-32166dcd":1,"chunk-35c0d5a1":1,"chunk-3c3562ac":1,"chunk-fae2fff4":1,"chunk-3fe6efc8":1,"chunk-4172bb78":1,"chunk-463d981f":1,"chunk-535a2d57":1,"chunk-56326ab0":1,"chunk-56bcb95e":1,"chunk-5c1f1857":1,"chunk-631c8db2":1,"chunk-6b8f76da":1,"chunk-6dd8ad36":1,"chunk-779865ca":1,"chunk-98e556f2":1,"chunk-a366f0a2":1,"chunk-a73d2e72":1,"chunk-b9566590":1,"chunk-bbb363ae":1,"chunk-c44939ee":1,"chunk-commons":1,"chunk-18164422":1,"chunk-26a0f96a":1,"chunk-2f14fe56":1,"chunk-3397cef4":1,"chunk-430a0a7e":1,"chunk-781b0f0e":1,"chunk-018b6b2e":1,"chunk-4069bf85":1,"chunk-4963f895":1,"chunk-48b3c126":1,"chunk-e64c34de":1,"chunk-83a46c26":1,"chunk-3739887b":1,"chunk-3e052e58":1,"chunk-4bff4baf":1,"chunk-57fa5ed2":1,"chunk-7e8f996c":1,"chunk-a5c85652":1,"chunk-b8817b4e":1,"chunk-c3911a96":1,"chunk-ca6e7caa":1,"chunk-15159370":1,"chunk-1ec664f0":1,"chunk-6dd0b7c5":1,"chunk-c2c1b6c2":1,"chunk-56a66d18":1,"chunk-7dd21366":1,"chunk-e0c6291c":1,"chunk-ce53422a":1,"chunk-fd4f7644":1};u[c]?d.push(u[c]):0!==u[c]&&e[c]&&d.push(u[c]=new Promise((function(d,e){for(var n="mer/css/"+({"chunk-commons":"chunk-commons"}[c]||c)+"."+{"chunk-058c2db3":"a26f1f87","chunk-0b82ed48":"83294796","chunk-0c1cbcc4":"efaeace1","chunk-0d07854c":"2c622be5","chunk-0f1041d4":"31d6cfe0","chunk-10999506":"fa07cca4","chunk-12848218":"8ff82287","chunk-169cf82e":"2e4cca8d","chunk-171bc9d3":"e0ac7b20","chunk-17df9043":"31d6cfe0","chunk-197a4d8b":"e71f8c15","chunk-19b998f8":"31d6cfe0","chunk-1b6413b7":"5b67e233","chunk-1d04b296":"fd9175e0","chunk-1e759944":"13187d85","chunk-1ebf3d75":"ad7a9ef0","chunk-1f890262":"da05ad4e","chunk-274abd28":"f018453a","chunk-275a7c87":"588d3a87","chunk-2a7f07f2":"20f788ea","chunk-2d054238":"85c2e9c9","chunk-2d0aba79":"31d6cfe0","chunk-2d0abdff":"31d6cfe0","chunk-2d0aed35":"31d6cfe0","chunk-2d0b1e40":"31d6cfe0","chunk-2d0b5a65":"31d6cfe0","chunk-2d0ba554":"31d6cfe0","chunk-2d0c08f3":"31d6cfe0","chunk-2d0c481a":"31d6cfe0","chunk-2d0c8a44":"31d6cfe0","chunk-2d0cfb23":"31d6cfe0","chunk-163ed606":"764d7aeb","chunk-821a4192":"32940cd9","chunk-db426b92":"42e27511","chunk-2d0d095b":"31d6cfe0","chunk-2d0d364b":"31d6cfe0","chunk-2d0da983":"31d6cfe0","chunk-2d0e5b8e":"31d6cfe0","chunk-2d0e625e":"31d6cfe0","chunk-2d0e6675":"31d6cfe0","chunk-2d207706":"31d6cfe0","chunk-2d208819":"31d6cfe0","chunk-2d213182":"31d6cfe0","chunk-2d213ed3":"31d6cfe0","chunk-2d21d8a3":"31d6cfe0","chunk-2d229240":"31d6cfe0","chunk-2d22ccf1":"31d6cfe0","chunk-2d230c26":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-2f105f7b":"31d6cfe0","chunk-2fe6c138":"24e5e177","chunk-32166dcd":"2aecd557","chunk-35c0d5a1":"2682826d","chunk-3c3562ac":"9912aacf","chunk-3f5334ed":"31d6cfe0","chunk-fae2fff4":"61b8ec23","chunk-3fe6efc8":"ef822605","chunk-4172bb78":"51bc6532","chunk-463d981f":"299b9a7d","chunk-535a2d57":"65df382f","chunk-56326ab0":"da3d3587","chunk-56bcb95e":"4fe0ca23","chunk-5c1f1857":"f1d96a2f","chunk-631c8db2":"8e4f3276","chunk-6b8f76da":"f4308245","chunk-6dd8ad36":"e9b939d9","chunk-779865ca":"48bd3c0f","chunk-98e556f2":"07f63107","chunk-a366f0a2":"5fb0ed6e","chunk-a73d2e72":"576d9192","chunk-a97676f4":"31d6cfe0","chunk-b9566590":"7a7cf3d6","chunk-bbb363ae":"9a6b3cdc","chunk-c44939ee":"7209704d","chunk-commons":"59123995","chunk-18164422":"9fa88b6a","chunk-26a0f96a":"12e11632","chunk-2d0ab2c5":"31d6cfe0","chunk-2f14fe56":"94a1af3f","chunk-3397cef4":"80f2bb93","chunk-430a0a7e":"2cfe8e5e","chunk-781b0f0e":"44e92b98","chunk-018b6b2e":"71e218fa","chunk-2d0c8a73":"31d6cfe0","chunk-4069bf85":"4d0592f6","chunk-4963f895":"4d0592f6","chunk-48b3c126":"f7dcb935","chunk-4a490806":"31d6cfe0","chunk-e64c34de":"6823e97f","chunk-83a46c26":"871538f6","chunk-3739887b":"0b9cc9fc","chunk-3e052e58":"d42f19e7","chunk-4bff4baf":"3d5a9286","chunk-57fa5ed2":"b5dba6b7","chunk-7e8f996c":"2946ed58","chunk-a5c85652":"356ed959","chunk-b8817b4e":"5410fdab","chunk-c3911a96":"003f5deb","chunk-ca6e7caa":"6c0ca04d","chunk-d97b72b4":"31d6cfe0","chunk-15159370":"38aa9e04","chunk-1ec664f0":"6cbb5717","chunk-2d213caa":"31d6cfe0","chunk-6dd0b7c5":"afa7ab4e","chunk-c2c1b6c2":"ef5a307c","chunk-56a66d18":"2b44d725","chunk-7dd21366":"0c159301","chunk-e0c6291c":"e1405316","chunk-ce53422a":"97a429d9","chunk-fd4f7644":"d50b9c97","chunk-2d0b6747":"31d6cfe0","chunk-0b65ffb6":"31d6cfe0","chunk-12950967":"31d6cfe0","chunk-2d0a3577":"31d6cfe0","chunk-2d0a43df":"31d6cfe0","chunk-2d0aa90c":"31d6cfe0","chunk-2d0aab07":"31d6cfe0","chunk-2d0abc00":"31d6cfe0","chunk-2d0aeb45":"31d6cfe0","chunk-2d0af08c":"31d6cfe0","chunk-2d0afa49":"31d6cfe0","chunk-2d0b6187":"31d6cfe0","chunk-2d0ba136":"31d6cfe0","chunk-2d0bb267":"31d6cfe0","chunk-2d0bcec1":"31d6cfe0","chunk-2d0bff92":"31d6cfe0","chunk-2d0c0494":"31d6cfe0","chunk-2d0c0a09":"31d6cfe0","chunk-2d0c4313":"31d6cfe0","chunk-2d0c46d1":"31d6cfe0","chunk-2d0c512b":"31d6cfe0","chunk-2d0cf16e":"31d6cfe0","chunk-2d0d056d":"31d6cfe0","chunk-2d0d0645":"31d6cfe0","chunk-2d0d2f22":"31d6cfe0","chunk-2d0d61fd":"31d6cfe0","chunk-2d0d7e63":"31d6cfe0","chunk-2d0e1b57":"31d6cfe0","chunk-2d0e1fbe":"31d6cfe0","chunk-2d0e22d6":"31d6cfe0","chunk-2d0e542a":"31d6cfe0","chunk-2d0e57ec":"31d6cfe0","chunk-2d0e6553":"31d6cfe0","chunk-2d0e6c86":"31d6cfe0","chunk-2d0f0a11":"31d6cfe0","chunk-2d208ac5":"31d6cfe0","chunk-2d209408":"31d6cfe0","chunk-2d20f745":"31d6cfe0","chunk-2d20ff23":"31d6cfe0","chunk-2d2138c7":"31d6cfe0","chunk-2d216f3b":"31d6cfe0","chunk-2d217e5b":"31d6cfe0","chunk-2d21b84a":"31d6cfe0","chunk-2d21dcd2":"31d6cfe0","chunk-2d21f327":"31d6cfe0","chunk-2d2214b3":"31d6cfe0","chunk-2d221799":"31d6cfe0","chunk-2d221814":"31d6cfe0","chunk-2d221a34":"31d6cfe0","chunk-2d22502a":"31d6cfe0","chunk-2d226775":"31d6cfe0","chunk-2d229411":"31d6cfe0","chunk-2d2295e9":"31d6cfe0","chunk-2d22c171":"31d6cfe0","chunk-2d22c2b8":"31d6cfe0","chunk-2d22ca58":"31d6cfe0","chunk-2d2311f7":"31d6cfe0","chunk-2d237ee7":"31d6cfe0","chunk-2d238465":"31d6cfe0","chunk-74523e0e":"31d6cfe0","chunk-7459c510":"31d6cfe0","chunk-7470082e":"31d6cfe0","chunk-74c572cd":"31d6cfe0","chunk-7532b3ea":"31d6cfe0","chunk-e13e4362":"31d6cfe0"}[c]+".css",h=a.p+n,f=document.getElementsByTagName("link"),k=0;k<f.length;k++){var b=f[k],t=b.getAttribute("data-href")||b.getAttribute("href");if("stylesheet"===b.rel&&(t===n||t===h))return d()}var r=document.getElementsByTagName("style");for(k=0;k<r.length;k++){b=r[k],t=b.getAttribute("data-href");if(t===n||t===h)return d()}var o=document.createElement("link");o.rel="stylesheet",o.type="text/css",o.onload=d,o.onerror=function(d){var n=d&&d.target&&d.target.src||h,f=new Error("Loading CSS chunk "+c+" failed.\n("+n+")");f.request=n,delete u[c],o.parentNode.removeChild(o),e(f)},o.href=h;var i=document.getElementsByTagName("head")[0];i.appendChild(o)})).then((function(){u[c]=0})));var n=h[c];if(0!==n)if(n)d.push(n[2]);else{var f=new Promise((function(d,e){n=h[c]=[d,e]}));d.push(n[2]=f);var b,t=document.createElement("script");t.charset="utf-8",t.timeout=120,a.nc&&t.setAttribute("nonce",a.nc),t.src=k(c),b=function(d){t.onerror=t.onload=null,clearTimeout(r);var e=h[c];if(0!==e){if(e){var n=d&&("load"===d.type?"missing":d.type),u=d&&d.target&&d.target.src,f=new Error("Loading chunk "+c+" failed.\n("+n+": "+u+")");f.type=n,f.request=u,e[1](f)}h[c]=void 0}};var r=setTimeout((function(){b({type:"timeout",target:t})}),12e4);t.onerror=t.onload=b,document.head.appendChild(t)}return Promise.all(d)},a.m=c,a.c=n,a.d=function(c,d,e){a.o(c,d)||Object.defineProperty(c,d,{enumerable:!0,get:e})},a.r=function(c){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(c,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(c,"__esModule",{value:!0})},a.t=function(c,d){if(1&d&&(c=a(c)),8&d)return c;if(4&d&&"object"===typeof c&&c&&c.__esModule)return c;var e=Object.create(null);if(a.r(e),Object.defineProperty(e,"default",{enumerable:!0,value:c}),2&d&&"string"!=typeof c)for(var n in c)a.d(e,n,function(d){return c[d]}.bind(null,n));return e},a.n=function(c){var d=c&&c.__esModule?function(){return c["default"]}:function(){return c};return a.d(d,"a",d),d},a.o=function(c,d){return Object.prototype.hasOwnProperty.call(c,d)},a.p="/",a.oe=function(c){throw console.error(c),c};var b=window["webpackJsonp"]=window["webpackJsonp"]||[],t=b.push.bind(b);b.push=d,b=b.slice();for(var r=0;r<b.length;r++)d(b[r]);var o=t;e()})([]);</script><script src=/mer/js/app.c679e97a.js></script></body></html>
\ No newline at end of file
diff --git a/view/mer/src/views/product/productList/index.vue b/view/mer/src/views/product/productList/index.vue
index 31acf22..66eb70f 100644
--- a/view/mer/src/views/product/productList/index.vue
+++ b/view/mer/src/views/product/productList/index.vue
@@ -145,6 +145,8 @@
                     查看评价
                   </router-link>
                 </el-dropdown-item>
+                <el-dropdown-item v-if="tableFrom.type !== '1' && tableFrom.type!== '3' && tableFrom.type !=='4'" @click.native="handleDelete(scope.row.product_id, scope.$index)">{{ tableFrom.type === '5' ? '删除' : '加入回收站' }}</el-dropdown-item>
+                <el-dropdown-item v-if="tableFrom.type === '5'" @click.native="handleRestore(scope.row.product_id)">恢复商品</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
