1

1

dist/static/css/chunk-1ca30b97.3194f810.css

@@ -0,0 +1 @@
+.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-69ae4217] .description-title{margin:0!important}

dist/static/css/chunk-df9f4870.d71b0954.css

@@ -0,0 +1 @@
+.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-fe6f92be] .el-button+.el-button{margin-left:0}.select[data-v-fe6f92be]{font-size:14px}.btnList[data-v-fe6f92be]{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-fe6f92be]{margin-right:15px}

src/views/main/baseinfo/index.vue

@@ -234,7 +234,7 @@ export default {
 
 
       // console.log(this.dataInfo)
-      // this.dataInfo = {...this.dataInfo,...data};
+      this.dataInfo = {...this.dataInfo};
     },
   },
 };

src/views/teamDetail/componentCourse/addCompound.vue

@@ -184,7 +184,7 @@ export default {
           com.type == "MUSIC_NETWORK" ||
           com.type == "HIGH_ONLINE"
         ) {
-          this.$message.error("只有乐团课的下线课可以合并");
+          this.$message.error("只有乐团的线下课可以合并");
           isFlage = true;
           return;
         }

src/views/teamDetail/componentCourse/teacherList.vue

@@ -433,7 +433,7 @@ export default {
               this.teacherMask = {
                 salary: "",
                 subsidy: "",
-                radio: "",
+                radio: "one",
               };
               // this.dialogTableVisible = false;
               this.innerVisible = false;

src/views/teamDetail/components/modals/class-pay-list.vue

@@ -48,7 +48,7 @@
     <div style="clear: both"></div>
     <el-dialog
       :visible.sync="showLastVisable"
-      title="合并结果确认"
+      title="结果确认"
       append-to-body
       width="800px"
     >

src/views/teamDetail/components/studentList.vue

@@ -297,7 +297,7 @@
               <!-- musicGroupPaymentCalenderDetail/queryPage/studentList -->
               <auth
                 auths="musicGroupPaymentCalenderDetail/queryPage/studentList"
-                :router="['/teamLists']"
+                :router="['/resetTeaming']"
               >
                 <i
                   style="color: #14928a; font-size: 17px"