合回msater

1

dist/static/css/chunk-12c6ad92.1f0956b2.css

@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 <<<<<<< HEAD:dist/static/css/chunk-2da2d7a8.dd716930.css
 .newBand[data-v-134e3746]{display:inline-block}[data-v-134e3746] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-134e3746]{display:inline-block}.lookTitle[data-v-134e3746]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-134e3746]{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-134e3746]{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-68015b7f]{display:inline-block}[data-v-68015b7f] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-68015b7f]{display:inline-block}.lookTitle[data-v-68015b7f]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-68015b7f]{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-68015b7f]{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}
 >>>>>>> 0609getMusicFee:dist/static/css/chunk-12c6ad92.1f0956b2.css
+=======
+.newBand[data-v-68015b7f]{display:inline-block}[data-v-68015b7f] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-68015b7f]{display:inline-block}.lookTitle[data-v-68015b7f]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-68015b7f]{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-68015b7f]{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}
+>>>>>>> master

dist/static/css/chunk-34d9c888.ec02c4c3.css

@@ -0,0 +1 @@
+/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.alert[data-v-f47677fa]{margin-bottom:22px}.shopImage[data-v-f47677fa]{width:60px;height:60px}.shopDesc[data-v-f47677fa]{max-height:70px;overflow:hidden}.el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light[data-v-f47677fa]{max-width:95px}

dist/static/css/chunk-3221000e.824a5e1c.css → dist/static/css/chunk-4296fd92.d58ee9e4.css

@@ -1 +1 @@
-[data-v-67661593] .el-input-group__append{width:88px}.feeInput[data-v-67661593] .el-input__inner{width:120px!important}/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.tree[data-v-1c5351fd]{min-width:630px}
+[data-v-32ed13de] .el-input-group__append{width:88px}.feeInput[data-v-32ed13de] .el-input__inner{width:120px!important}/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.tree[data-v-61a73e5c]{min-width:630px}

dist/static/css/chunk-4809fdfe.6131e7c2.css

@@ -1 +0,0 @@
-[data-v-67661593] .el-input-group__append{width:88px}.feeInput[data-v-67661593] .el-input__inner{width:120px!important}/deep/.avatar-uploader .el-upload,/deep/.upload-demo .el-upload{border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload:hover{border-color:#409eff}.avatar-uploader-icon{border:1px dashed #d9d9d9;font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar{width:120px;height:120px;display:block}.ivu-upload{display:none}.tree[data-v-61a73e5c]{min-width:630px}

dist/static/css/chunk-4c0abd5f.7f61a45b.css

@@ -1 +0,0 @@
-[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.coursetitle[data-v-ed7c90f6]{padding:0 20px;font-size:14px;color:#606266;line-height:40px}.title[data-v-ed7c90f6]{color:red;margin-bottom:30px;font-size:16px;font-weight:700}.tag[data-v-ed7c90f6]{margin-right:5px;cursor:pointer}.dialog-footer[data-v-ed7c90f6]{margin-top:20px;display:block;text-align:right}.lastBtnWrap[data-v-bd57c674]{margin-top:20px;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-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:1%}[data-v-bd57c674] .el-table .noShow .cell .el-table__expand-icon{display:none}

dist/static/css/chunk-584f76a2.c532a911.css

@@ -1 +0,0 @@
-.alert[data-v-64fe4b1c]{margin:10px 0}.dialog-footer[data-v-59fb2832]{margin-top:20px;display:block;text-align:right}

dist/static/css/chunk-59e0010c.3d4e2749.css

@@ -0,0 +1 @@
+.statistic .statistic-content>span[data-v-7af30d6c]{font-size:22px!important}.statistic .statistic-content>span[data-v-7af30d6c]:first-child{font-size:14px!important}.btnList[data-v-7af30d6c]{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;-ms-flex-wrap:wrap;flex-wrap:wrap}.btnList .el-button+.el-button[data-v-7af30d6c]{margin-left:0}.btnList>.el-button[data-v-7af30d6c]{margin-right:15px;margin-top:10px}

dist/static/css/chunk-705565be.12488f79.css

@@ -1 +0,0 @@
-.alert[data-v-a97fca8e] .el-alert__content{width:100%}.alert .title[data-v-a97fca8e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.content[data-v-a97fca8e]{padding:0 24px;padding-top:24px}.dialog-footer[data-v-028ec50e]{text-align:right;display:block;padding-bottom:20px;margin-top:20px}[data-v-528d6129] .el-button--primary,[data-v-528d6129] .el-button--primary:active,[data-v-528d6129] .el-button--primary:focus,[data-v-528d6129] .el-button--primary:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-528d6129] .el-date-editor.el-input,[data-v-528d6129] .el-select{width:100%!important}

dist/static/css/chunk-73886418.54df3078.css

@@ -0,0 +1 @@
+.newBand[data-v-ecd44c2a]{display:inline-block;margin-right:10px}.right-code .title[data-v-ecd44c2a]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-ecd44c2a] .studentInfo .multiple.el-select{width:185px!important}.red[data-v-ecd44c2a]{color:red}

dist/static/css/chunk-b44b2dbe.dd6c6c9e.css

@@ -1 +0,0 @@
-.newBand[data-v-bd355904]{display:inline-block;margin-right:10px}.right-code .title[data-v-bd355904]{font-size:18px;text-align:center;padding-bottom:8px}[data-v-bd355904] .studentInfo .multiple.el-select{width:185px!important}.red[data-v-bd355904]{color:red}

dist/static/css/chunk-b5446cf6.61c00417.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-7a85dee4]{width:100%}.number-input[data-v-7a85dee4] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-734e893a]{line-height:44px}.fixedBox[data-v-734e893a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-734e893a]{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}.fixedBox .boxWrap i[data-v-734e893a]{font-size:18px;cursor:pointer}[data-v-734e893a] .el-divider--horizontal{margin:0!important}.topWrap[data-v-734e893a]{margin:10px 0;padding:0 20px 0 0}.minus[data-v-734e893a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

dist/static/css/chunk-b95689ac.6e2df7fe.css

@@ -0,0 +1 @@
+.alert[data-v-df0b7ffa]{margin-bottom:22px}.el-button--primary[data-v-df0b7ffa],.el-button--primary[data-v-df0b7ffa]:active,.el-button--primary[data-v-df0b7ffa]:focus,.el-button--primary[data-v-df0b7ffa]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-df0b7ffa]{margin-top:40px}.el-col[data-v-df0b7ffa]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-df0b7ffa]{width:200px;margin:0 20px}[data-v-df0b7ffa] .el-tree-node__content{height:40px!important}[data-v-df0b7ffa] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-df0b7ffa]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-df0b7ffa]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-df0b7ffa]{width:120px;height:120px;display:block}.el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light[data-v-df0b7ffa]{max-width:95px}

dist/static/css/chunk-d4a89ac0.a9a88b9f.css

@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 <<<<<<< HEAD:dist/static/css/chunk-fd992dc0.380fc7a1.css
 .newBand[data-v-32de7ee1]{display:inline-block}[data-v-32de7ee1] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-32de7ee1]{display:inline-block}.lookTitle[data-v-32de7ee1]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-32de7ee1]{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-32de7ee1]{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-68b120bd]{display:inline-block}[data-v-68b120bd] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-68b120bd]{display:inline-block}.lookTitle[data-v-68b120bd]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-68b120bd]{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-68b120bd]{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}
 >>>>>>> 0609getMusicFee:dist/static/css/chunk-d4a89ac0.a9a88b9f.css
+=======
+.newBand[data-v-68b120bd]{display:inline-block}[data-v-68b120bd] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-68b120bd]{display:inline-block}.lookTitle[data-v-68b120bd]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-68b120bd]{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-68b120bd]{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}
+>>>>>>> master

dist/static/css/chunk-e8cf9a0e.41b95c51.css

@@ -1 +0,0 @@
-.statistic .statistic-content>span[data-v-9b1df636]{font-size:22px!important}.statistic .statistic-content>span[data-v-9b1df636]:first-child{font-size:14px!important}.btnList[data-v-9b1df636]{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;-ms-flex-wrap:wrap;flex-wrap:wrap}.btnList .el-button+.el-button[data-v-9b1df636]{margin-left:0}.btnList>.el-button[data-v-9b1df636]{margin-right:15px;margin-top:10px}

dist/static/css/chunk-ed2a11ec.e66fc568.css

@@ -1 +0,0 @@
-.alert[data-v-274cb61d]{margin-bottom:22px}.el-button--primary[data-v-274cb61d],.el-button--primary[data-v-274cb61d]:active,.el-button--primary[data-v-274cb61d]:focus,.el-button--primary[data-v-274cb61d]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-274cb61d]{margin-top:40px}.el-col[data-v-274cb61d]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-274cb61d]{width:200px;margin:0 20px}[data-v-274cb61d] .el-tree-node__content{height:40px!important}[data-v-274cb61d] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-274cb61d]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-274cb61d]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-274cb61d]{width:120px;height:120px;display:block}.el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light[data-v-274cb61d]{max-width:95px}

dist/static/css/chunk-f9670960.0ecaf40d.css

@@ -1 +0,0 @@
-.number-input[data-v-b6d286e0]{width:100%}.number-input[data-v-a10777a0] .el-input__inner,.number-input[data-v-b6d286e0] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}