Merge branch 'master' into 01/19NavMenu

.gitignore

@@ -21,3 +21,4 @@ debug.log
 
 *.log
 debug.log
+*.log

debug.log

@@ -1,2 +1,3 @@
 [0118/174310.352:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [0119/094348.688:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0122/094436.708:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

dist/static/css/chunk-014c06fa.3ced70c7.css

@@ -0,0 +1 @@
+.vip-base[data-v-0b9de86e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.vip-base[data-v-0b9de86e] .el-date-editor.el-input,.vip-base[data-v-0b9de86e] .el-date-editor.el-input__inner,.vip-base[data-v-0b9de86e] .el-input,.vip-base[data-v-0b9de86e] .el-select{width:180px!important}.vip-base .left[data-v-0b9de86e]{width:400px}.vip-base .tableWrap[data-v-0b9de86e]{margin-top:40px}.vip-base .tableWrap h4[data-v-0b9de86e]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-0b9de86e]{clear:both}.vip-base .right .resetBtn[data-v-0b9de86e]{margin-top:30px;float:right}.vip-base .disBox[data-v-0b9de86e]{background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;border-radius:4px;border:1px solid #dcdfe6;color:#333;padding:0 15px;width:180px}.title[data-v-b532b26c]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-b532b26c] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-b532b26c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;margin-bottom:15px}

dist/static/css/chunk-06a4ee6c.8ef91a1b.css

@@ -1 +0,0 @@
-.titlewrap[data-v-4fab6482]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-4fab6482],.wrap[data-v-4fab6482]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-4fab6482]{margin-right:20px}.countWrap[data-v-4fab6482] .el-date-editor.el-input,.countWrap[data-v-4fab6482] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-24f9553e.85647594.css

@@ -1 +0,0 @@
-.m-container[data-v-769459c3]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-769459c3]{display:inline-block}

dist/static/css/chunk-2e536d44.32ee2bfd.css

@@ -0,0 +1 @@
+.titlewrap[data-v-ec947fde]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-ec947fde],.wrap[data-v-ec947fde]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-ec947fde]{margin-right:20px}.countWrap[data-v-ec947fde] .el-date-editor.el-input,.countWrap[data-v-ec947fde] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-350e0cf8.75f8265b.css

@@ -0,0 +1 @@
+.m-container[data-v-5af81944]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-5af81944]{display:inline-block}

dist/static/css/chunk-1b4c27ab.1a1afc57.css → dist/static/css/chunk-54a711d9.d415cffe.css

@@ -1 +1 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-7a44cd83]{margin-top:20px;display:block;text-align:right}.select[data-v-459482cc]{font-size:14px}.btnList[data-v-459482cc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-459482cc]{margin-right:15px}
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-7a44cd83]{margin-top:20px;display:block;text-align:right}.select[data-v-4faa5310]{font-size:14px}.btnList[data-v-4faa5310]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-4faa5310]{margin-right:15px}

dist/static/css/chunk-2ce9de87.e3565c9e.css → dist/static/css/chunk-5a6d0468.b568ab56.css

@@ -1 +1 @@
-.left[data-v-89ba8374]{margin-right:20px}.listWrap[data-v-89ba8374]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.courseMask .el-tag.el-tag--info{margin-right:4px}
+.left[data-v-edd22182]{margin-right:20px}.listWrap[data-v-edd22182]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.courseMask .el-tag.el-tag--info{margin-right:4px}

dist/static/css/chunk-5c9841ec.39c96edf.css

@@ -1 +0,0 @@
-.vip-base[data-v-569e7cae]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.vip-base[data-v-569e7cae] .el-date-editor.el-input,.vip-base[data-v-569e7cae] .el-date-editor.el-input__inner,.vip-base[data-v-569e7cae] .el-input,.vip-base[data-v-569e7cae] .el-select{width:180px!important}.vip-base .left[data-v-569e7cae]{width:400px}.vip-base .tableWrap[data-v-569e7cae]{margin-top:40px}.vip-base .tableWrap h4[data-v-569e7cae]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-569e7cae]{clear:both}.vip-base .right .resetBtn[data-v-569e7cae]{margin-top:30px;float:right}.vip-base .disBox[data-v-569e7cae]{background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;border-radius:4px;border:1px solid #dcdfe6;color:#333;padding:0 15px;width:180px}.title[data-v-995f3a76]{display:inline-block;width:108px;text-align:right;margin-right:10px}[data-v-995f3a76] .el-input-number .el-input__inner{text-align:left!important}.btnWrap[data-v-995f3a76]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;margin-bottom:15px}

dist/static/css/chunk-5e5b78be.7d104bbf.css

@@ -1 +0,0 @@
-.m-core[data-v-0a47f545]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-0a47f545]{width:180px}.m-core h4[data-v-0a47f545]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-0a47f545],.m-core .right[data-v-0a47f545],.m-core .vipLeft[data-v-0a47f545]{width:400px}.planList[data-v-0a47f545]{padding:0 25px}.planList .planTop[data-v-0a47f545]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-0a47f545]{font-size:14px}.planList .planCore .row[data-v-0a47f545]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-0a47f545]{width:87px}.okBtn[data-v-0a47f545]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-09cd8292.03d1d739.css → dist/static/css/chunk-68fb5342.e29003cb.css

@@ -1 +1 @@
-.newBand[data-v-a81eeb0e]{display:inline-block}[data-v-a81eeb0e] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-a81eeb0e]{display:inline-block}.lookTitle[data-v-a81eeb0e]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-a81eeb0e]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-a81eeb0e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+.newBand[data-v-729706a0]{display:inline-block}[data-v-729706a0] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-729706a0]{display:inline-block}.lookTitle[data-v-729706a0]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-729706a0]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-729706a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

dist/static/css/chunk-72b7aa74.fb5c3744.css

@@ -0,0 +1 @@
+.computeMoney[data-v-1ce4a186]{margin-top:10px;float:right}.m-core[data-v-1ce4a186]{margin-top:30px}.m-core .el-input[data-v-1ce4a186]{width:180px}.m-core h4[data-v-1ce4a186]{font-size:16px;background-color:#ccc;color:#fff;width:100%;height:40px;line-height:40px;margin-bottom:20px;padding:0 20px}.vipMsg[data-v-1ce4a186]{margin-bottom:20px}.planList[data-v-1ce4a186]{padding:0 25px}.planList .planTop[data-v-1ce4a186]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-1ce4a186]{font-size:14px}.planList .planCore .row[data-v-1ce4a186]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-1ce4a186]{width:87px}.okBtn[data-v-1ce4a186]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}