!243 代码合并

Merge pull request !243 from 杨耀威/yyw

public/dist/css/147.610fa777.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-58bd27bb]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-58bd27bb]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.imgBox .img[data-v-58bd27bb]{width:55px;height:55px;border-radius:4px;margin:3px}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-6c4b71cd]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-6c4b71cd]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.imgBox .img[data-v-6c4b71cd]{width:55px;height:55px;border-radius:4px;margin:3px}

public/dist/css/197.e8b8bfee.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-29045bd9]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap;.row[data-v-29045bd9]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}}.opaBox[data-v-29045bd9]{margin-bottom:15px}.btn[data-v-29045bd9]{float:right}.commodityimg[data-v-29045bd9]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-29045bd9]{width:100%;height:100%}[data-v-29045bd9] .flex .cell{display:flex;align-items:center}[data-v-29045bd9] .btn11{padding:0;width:14px;height:14px}[data-v-29045bd9] .btn11 img{width:100%;height:100%}.page[data-v-29045bd9]{margin-top:20px}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-825b4586]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap;.row[data-v-825b4586]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}}.opaBox[data-v-825b4586]{margin-bottom:15px}.btn[data-v-825b4586]{float:right}.commodityimg[data-v-825b4586]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-825b4586]{width:100%;height:100%}[data-v-825b4586] .flex .cell{display:flex;align-items:center}[data-v-825b4586] .btn11{padding:0;width:14px;height:14px}[data-v-825b4586] .btn11 img{width:100%;height:100%}.page[data-v-825b4586]{margin-top:20px}

public/dist/css/267.5b839817.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-823b7d84]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-823b7d84]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.opaBox[data-v-823b7d84]{margin-bottom:15px}.bgBox[data-v-823b7d84]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 15px 0}.bgBox .close[data-v-823b7d84]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-823b7d84]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-44368138]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-44368138]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.opaBox[data-v-44368138]{margin-bottom:15px}.bgBox[data-v-44368138]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 15px 0}.bgBox .close[data-v-44368138]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-44368138]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}

public/dist/css/282.feb6bf21.css

@@ -0,0 +1 @@
+.skuBox[data-v-4de310da]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-4de310da]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.skuBox[data-v-3dbf163e]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-3dbf163e]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.table[data-v-3e0ef0c7]{margin-top:20px;position:relative}.btn[data-v-3e0ef0c7]{float:right}.flex[data-v-3e0ef0c7]{display:flex;align-items:center}.goodBox .Img[data-v-3e0ef0c7]{width:50px;height:50px;margin-right:12px;border-radius:4px}.goodBox .tit[data-v-3e0ef0c7]{color:#000;font-size:13px}.confirmbtn[data-v-3e0ef0c7]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-3e0ef0c7]{margin-top:30px}.import-right a[data-v-3e0ef0c7]{color:#409eff}[data-v-3e0ef0c7] .btn11{padding:0;width:14px;height:14px}[data-v-3e0ef0c7] .btn11 img{width:100%;height:100%}.page[data-v-3e0ef0c7]{margin-top:20px}.searchBox[data-v-3e0ef0c7]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-3e0ef0c7]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.titBox[data-v-3e0ef0c7]{display:flex;align-items:center}.red[data-v-3e0ef0c7]{color:red}

public/dist/css/417.c022f0a7.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-453a2678]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-453a2678]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.opaBox[data-v-453a2678]{margin-bottom:15px}.bgBox[data-v-453a2678]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 15px 0}.bgBox .close[data-v-453a2678]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-453a2678]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-4d4e7fd8]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-4d4e7fd8]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.opaBox[data-v-4d4e7fd8]{margin-bottom:15px}.bgBox[data-v-4d4e7fd8]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 15px 0}.bgBox .close[data-v-4d4e7fd8]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-4d4e7fd8]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}

public/dist/css/574.1ae35ed9.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-36908574]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-36908574]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.bgBox[data-v-36908574]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 15px 0}.bgBox .close[data-v-36908574]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-36908574]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-a256b434]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-a256b434]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.bgBox[data-v-a256b434]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 15px 0}.bgBox .close[data-v-a256b434]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-a256b434]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}

public/dist/css/68.5f2d6e36.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-3f2df4e1]{margin-top:20px}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-6141beb2]{margin-top:20px}

public/dist/css/769.af7ff3f3.css

@@ -1 +0,0 @@
-.skuBox[data-v-4de310da]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-4de310da]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.skuBox[data-v-3dbf163e]{border:1px solid #e5e5e5;border-radius:5px;padding:15px 0;margin-bottom:15px;background-color:#f3f3f3}.skuBox .tit[data-v-3dbf163e]{padding-left:40px;font-weight:600;font-size:15px;margin-bottom:15px}.table[data-v-0b7fe2a3]{margin-top:20px;position:relative}.btn[data-v-0b7fe2a3]{float:right}.flex[data-v-0b7fe2a3]{display:flex;align-items:center}.goodBox .Img[data-v-0b7fe2a3]{width:50px;height:50px;margin-right:12px;border-radius:4px}.goodBox .tit[data-v-0b7fe2a3]{color:#000;font-size:13px}.confirmbtn[data-v-0b7fe2a3]{width:114px;height:44px;border-radius:3px;margin-top:21px;margin-bottom:8px}.import-right[data-v-0b7fe2a3]{margin-top:30px}.import-right a[data-v-0b7fe2a3]{color:#409eff}[data-v-0b7fe2a3] .btn11{padding:0;width:14px;height:14px}[data-v-0b7fe2a3] .btn11 img{width:100%;height:100%}.page[data-v-0b7fe2a3]{margin-top:20px}.searchBox[data-v-0b7fe2a3]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-0b7fe2a3]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.titBox[data-v-0b7fe2a3]{display:flex;align-items:center}.red[data-v-0b7fe2a3]{color:red}

public/dist/css/849.fb1fda00.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-7638a0e4]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-7638a0e4]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.opaBox[data-v-7638a0e4]{margin-bottom:15px}.bgBox[data-v-7638a0e4]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 1px 0}.bgBox .close[data-v-7638a0e4]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-7638a0e4]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.searchBox[data-v-03f5ca86]{display:flex;align-items:center;flex-wrap:wrap;white-space:nowrap}.searchBox .row[data-v-03f5ca86]{font-size:14px;margin-bottom:20px;margin-right:15px;display:flex;align-items:center}.opaBox[data-v-03f5ca86]{margin-bottom:15px}.bgBox[data-v-03f5ca86]{position:relative;border-radius:5px;background-color:#f5f2f2;margin-bottom:15px;padding:15px 30px 1px 0}.bgBox .close[data-v-03f5ca86]{color:red;position:absolute;right:5px;top:5px;font-size:20px;cursor:pointer}.btn[data-v-03f5ca86]{display:flex;align-items:center;font-size:14px;color:#409eff;cursor:pointer;width:-moz-fit-content;width:fit-content}

public/dist/css/999.0ae01dd7.css

@@ -1 +1 @@
-#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-660bbd5d]{margin-top:20px}
+#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;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%;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}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.block[data-v-f2546c40]{margin-top:20px}

public/dist/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.3074cc07.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.a4f4a4ff.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

resources/frontend/src/views/goods/combination.vue

@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="searchForm.sku_title" clearable></el-input>
+          <el-input v-model="searchForm.sku_title" @keyup.enter.native="handleChoose" clearable></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="searchForm.external_sku_id" clearable></el-input>
+          <el-input v-model="searchForm.external_sku_id" @keyup.enter.native="handleChoose" clearable></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -21,11 +21,12 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             clearable
-            style="width: 250px;">
+            style="width: 250px;"
+            @change="handleChoose()">
           </el-date-picker>
         </div>
         <div class="row">
-          <el-button type="primary" @click="handleChoose(1)" icon="el-icon-search">筛选</el-button>
+          <el-button type="primary" @click="handleChoose()" icon="el-icon-search">筛选</el-button>
         </div>
       </div>
     </div>

resources/frontend/src/views/goods/goods.vue

@@ -5,7 +5,7 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="form.goods_title" placeholder="商品名称" clearable></el-input>
+          <el-input v-model="form.goods_title" @keyup.enter.native="handleChoose" placeholder="商品名称" clearable></el-input>
         </div>
         <div class="row">
           <span>商品品种/品类：</span>
@@ -22,11 +22,11 @@
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="form.external_sku_id" placeholder="商品编码" clearable></el-input>
+          <el-input v-model="form.external_sku_id" @keyup.enter.native="handleChoose" placeholder="商品编码" clearable></el-input>
         </div>
         <div class="row">
           <span>商品状态：</span>
-          <el-select v-model="form.status" placeholder="商品状态" clearable>
+          <el-select v-model="form.status" placeholder="商品状态" clearable @change="handleChoose()">
             <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id">
             </el-option>
           </el-select>
@@ -42,7 +42,8 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             clearable
-            style="width: 250px;">
+            style="width: 250px;"
+            @change="handleChoose()">
           </el-date-picker>
         </div>
         <div class="row">

resources/frontend/src/views/logs/logs.vue

@@ -4,42 +4,42 @@
         <el-card class="box-card" :body-style="{ padding: '20px 20px 0 20px' }">
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="模块:" style="margin-right: 40px">
-                    <el-select v-model="form.module" clearable>
+                    <el-select v-model="form.module" clearable @change="query(1)">
                         <el-option v-for="item in mouduleOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="操作:" style="margin-right: 40px">
-                    <el-select v-model="form.action" clearable>
+                    <el-select v-model="form.action" clearable @change="query(1)">
                         <el-option v-for="item in actionOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="目标类型:" style="margin-right: 40px">
-                    <el-select v-model="form.target_type" clearable>
+                    <el-select v-model="form.target_type" clearable @change="query(1)">
                         <el-option v-for="item in target_ypeOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="类别:" style="margin-right: 40px">
-                    <el-select v-model="form.targetField" clearable>
+                    <el-select v-model="form.targetField" clearable @change="query(1)">
                         <el-option v-for="item in target_fieldOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="操作人:" style="margin-right: 40px">
-                    <el-select v-model="form.userId" placeholder="输入操作人" clearable>
+                    <el-select v-model="form.userId" placeholder="输入操作人" clearable @change="query(1)">
                         <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="时间:">
                     <el-date-picker v-model="value1" type="datetimerange" range-separator="-" start-placeholder="起"
-                        end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss" style="width: 340px;">
+                        end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss" style="width: 340px;" @change="query(1)">
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
@@ -307,7 +307,7 @@ export default {
                 userId: "",//操作人id(用户列表)
             },
             value1: "", //筛选时间变量
-            loading: true,
+            loading: false,
             tableData: [], //列表数据
             Paginationdata: {}, //分页相关数据
             current_page: 1, //当前页
@@ -317,6 +317,7 @@ export default {
     methods: {
         //请求列表数据
         getList() {
+            this.loading = true;
             let page = {
                 page: this.current_page,
                 per_page: this.per_page,
@@ -324,8 +325,11 @@ export default {
             recordList(page).then((res) => {
                 this.tableData = res.data.data;
                 this.Paginationdata = res.data.meta;
-            });
+                this.loading = false;
-            this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            })
+            
         },
 
         // 获取用户列表
@@ -337,6 +341,7 @@ export default {
 
         // 查询
         query(page) {
+            this.loading = true;
             let queryData = {
                 page: page,
                 per_page: this.per_page,
@@ -353,7 +358,10 @@ export default {
             recordList(queryData).then((res) => {
                 this.tableData = res.data.data;
                 this.Paginationdata = res.data.meta;
-            });
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            })
         },
 
         //分页功能

resources/frontend/src/views/plat/afterSaleOrder.vue

@@ -4,25 +4,25 @@
       <div class="searchBox">
         <div class="row">
           <span>店铺：</span>
-          <el-select v-model="filter.shop_id" placeholder="店铺">
+          <el-select v-model="filter.shop_id" placeholder="店铺" @change="handleSearch()">
             <el-option v-for="item in shopsList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </div>
         <div class="row">
           <span>售后单状态：</span>
-          <el-select v-model="filter.after_sales_status" placeholder="请选择">
+          <el-select v-model="filter.after_sales_status" placeholder="请选择" @change="handleSearch()">
             <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
         </div>
         <div class="row">
           <span>订单编号：</span>
-          <el-input v-model="filter.order_sn" clearable></el-input>
+          <el-input v-model="filter.order_sn" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>售后单编号：</span>
-          <el-input v-model="filter.after_sales_biz_sn" clearable></el-input>
+          <el-input v-model="filter.after_sales_biz_sn" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -33,7 +33,8 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">

resources/frontend/src/views/plat/goodsList.vue

@@ -3,19 +3,19 @@
         <el-card :body-style="{ padding: '20px 20px 0 20px' }">
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="店铺:">
-                    <el-select v-model="form.shop_id" placeholder="店铺">
+                    <el-select v-model="form.shop_id" placeholder="店铺" @change="handleChoose()">
                         <el-option v-for="item in shops" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="商品名称:">
-                    <el-input v-model="form.goods_name" placeholder="商品名称">
+                    <el-input v-model="form.goods_name" placeholder="商品名称" @keyup.enter.native="handleChoose">
                     </el-input>
                 </el-form-item>
 
                 <el-form-item label="商品编码:">
-                    <el-input v-model="form.external_sku_id" placeholder="商品编码">
+                    <el-input v-model="form.external_sku_id" placeholder="商品编码" @keyup.enter.native="handleChoose">
                     </el-input>
                 </el-form-item>
 

resources/frontend/src/views/plat/orderList.vue

@@ -3,14 +3,14 @@
         <el-card>
             <el-form ref="form" :inline="true" :model="form">
                 <el-form-item label="所属店铺:">
-                    <el-select v-model="form.shop_id" placeholder="店铺">
+                    <el-select v-model="form.shop_id" placeholder="店铺" @change="handleChoose()">
                         <el-option v-for="item in shops" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
 
                 <el-form-item label="发货状态:">
-                    <el-select v-model="form.shipping_status" placeholder="发货状态">
+                    <el-select v-model="form.shipping_status" placeholder="发货状态" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="0" label="未发货"></el-option>
                         <el-option value="2" label="部分发货"></el-option>
@@ -19,7 +19,7 @@
                 </el-form-item>
 
                 <el-form-item label="订单类型:">
-                    <el-select v-model="form.is_supplier" placeholder="订单类型">
+                    <el-select v-model="form.is_supplier" placeholder="订单类型" @change="handleChoose()">
                         <el-option value="" label="全部订单"></el-option>
                         <el-option value="1" label="自卖团订单"></el-option>
                         <el-option value="0" label="帮卖团订单"></el-option>
@@ -27,7 +27,7 @@
                 </el-form-item>
 
                 <el-form-item label="订单状态:">
-                    <el-select v-model="form.cancel_status" placeholder="订单状态">
+                    <el-select v-model="form.cancel_status" placeholder="订单状态" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="0" label="未取消"></el-option>
                         <el-option value="1" label="已取消"></el-option>
@@ -35,7 +35,7 @@
                 </el-form-item>
 
                 <el-form-item label="售后状态:">
-                    <el-select v-model="form.after_sales_status" placeholder="售后状态">
+                    <el-select v-model="form.after_sales_status" placeholder="售后状态" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="0" label="未售后"></el-option>
                         <el-option value="1" label="有售后"></el-option>
@@ -43,7 +43,7 @@
                 </el-form-item>
 
                 <el-form-item label="商品数量:">
-                    <el-select v-model="form.goods_sku_num" placeholder="商品数量">
+                    <el-select v-model="form.goods_sku_num" placeholder="商品数量" @change="handleChoose()">
                         <el-option value="" label="全部"></el-option>
                         <el-option value="1" label="1个商品"></el-option>
                         <el-option value="2" label="2-5个商品"></el-option>
@@ -70,12 +70,12 @@
 
                 <el-form-item label="下单时间:">
                     <el-date-picker v-model="confirmAt" type="datetimerange" range-separator="-" start-placeholder="起"
-                        end-placeholder="止" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+                        end-placeholder="止" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="handleChoose()">
                     </el-date-picker>
                 </el-form-item>
 
                 <el-form-item label="跟团号:">
-                    <el-input v-model="form.pno" placeholder="跟团号">
+                    <el-input v-model="form.pno" placeholder="跟团号" @keyup.enter.native="handleChoose">
                     </el-input>
                 </el-form-item>
 
@@ -266,8 +266,8 @@ export default {
                 ...this.form,
                 page: 1,
                 per_page: this.per_page,
-                confirm_at_start: this.confirmAt[0] ? this.confirmAt[0] : '',
+                confirm_at_start: this.confirmAt ? this.confirmAt[0] : '',
-                confirm_at_end: this.confirmAt[1] ? this.confirmAt[1] : ''
+                confirm_at_end: this.confirmAt ? this.confirmAt[1] : ''
             };
             this.getPlatOrderList(params)
         },

resources/frontend/src/views/supplyChain/dailyStock.vue

@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,7 +19,8 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">

resources/frontend/src/views/supplyChain/lossRecord.vue

@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,7 +19,8 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">

resources/frontend/src/views/supplyChain/procureCheck.vue

@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,12 +19,13 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">
           <span>审核状态：</span>
-          <el-select v-model="filter.status" placeholder="请选择" clearable>
+          <el-select v-model="filter.status" placeholder="请选择" clearable @change="handleSearch()">
             <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>

resources/frontend/src/views/supplyChain/procureLog.vue

@@ -4,11 +4,11 @@
       <div class="searchBox">
         <div class="row">
           <span>商品名称：</span>
-          <el-input v-model="filter.title" clearable></el-input>
+          <el-input v-model="filter.title" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>商品编码：</span>
-          <el-input v-model="filter.external_sku_id" clearable></el-input>
+          <el-input v-model="filter.external_sku_id" clearable @keyup.enter.native="handleSearch"></el-input>
         </div>
         <div class="row">
           <span>创建时间：</span>
@@ -19,12 +19,13 @@
             start-placeholder="开始时间"
             end-placeholder="结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 340px">
+            style="width: 340px"
+            @change="handleSearch()">
           </el-date-picker>
         </div>
         <div class="row">
           <span>审核状态：</span>
-          <el-select v-model="filter.status" placeholder="请选择" clearable>
+          <el-select v-model="filter.status" placeholder="请选择" clearable @change="handleSearch()">
             <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>