1

1

dist/static/css/chunk-14c20ba8.f621cf05.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-4794bab7.67416a25.css
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-df7c165a] .description-title{margin:0!important}
+=======
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-1ccac135] .description-title{margin:0!important}
+>>>>>>> 04/13classAddSound:dist/static/css/chunk-14c20ba8.f621cf05.css

dist/static/css/chunk-2c146260.d520790d.css

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

dist/static/css/chunk-4794bab7.67416a25.css

@@ -1 +1,5 @@
-.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-df7c165a] .description-title{margin:0!important}
+<<<<<<< HEAD:dist/static/css/chunk-4794bab7.67416a25.css
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-df7c165a] .description-title{margin:0!important}
+=======
+.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-1ccac135] .description-title{margin:0!important}
+>>>>>>> 04/13classAddSound:dist/static/css/chunk-14c20ba8.f621cf05.css

dist/static/css/chunk-8aa88ab0.ccfabf85.css

@@ -1 +1,5 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-9f44f890] .el-button+.el-button{margin-left:0}.select[data-v-9f44f890]{font-size:14px}.btnList[data-v-9f44f890]{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-9f44f890]{margin-right:15px}
+<<<<<<< HEAD:dist/static/css/chunk-8aa88ab0.ccfabf85.css
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-9f44f890] .el-button+.el-button{margin-left:0}.select[data-v-9f44f890]{font-size:14px}.btnList[data-v-9f44f890]{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-9f44f890]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-53357d20] .el-button+.el-button{margin-left:0}.select[data-v-53357d20]{font-size:14px}.btnList[data-v-53357d20]{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-53357d20]{margin-right:15px}
+>>>>>>> 04/13classAddSound:dist/static/css/chunk-dab89e7c.f50bb331.css

dist/static/css/chunk-91193b0c.4a2b6ea0.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .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-dab89e7c.f50bb331.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-8aa88ab0.ccfabf85.css
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-9f44f890] .el-button+.el-button{margin-left:0}.select[data-v-9f44f890]{font-size:14px}.btnList[data-v-9f44f890]{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-9f44f890]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-53357d20] .el-button+.el-button{margin-left:0}.select[data-v-53357d20]{font-size:14px}.btnList[data-v-53357d20]{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-53357d20]{margin-right:15px}
+>>>>>>> 04/13classAddSound:dist/static/css/chunk-dab89e7c.f50bb331.css

src/views/teamDetail/teamClassList.vue

@@ -3,7 +3,12 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      班级列表 <filter-search :keys="['lessThenThreeHighOnline']" @reload="reloadSearch" :moreKeys="['organId']"/>
+      班级列表
+      <filter-search
+        :keys="['lessThenThreeHighOnline']"
+        @reload="reloadSearch"
+        :moreKeys="['organId']"
+      />
     </h2>
     <div class="m-core">
       <save-form

src/views/vipClass/vipList.vue

@@ -90,7 +90,7 @@
           </el-select> -->
                <remote-search
             :commit="'setTeachers'"
-            v-model="searchForm.userId"
+            v-model="searchForm.teacherId"
           />
         </el-form-item>
         <el-form-item>