Merge branch 'master' into 04/27-resetBug

dist/static/css/chunk-32c02aa5.bd127738.css

@@ -0,0 +1 @@
+.titleP[data-v-1a887146],.titleP[data-v-601b2f46]{line-height:30px}

dist/static/css/chunk-3910a1eb.8bbcedaf.css

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

dist/static/css/chunk-7ec59306.541045a7.css

@@ -1 +0,0 @@
-.titleP[data-v-5f8e8d68]{line-height:30px}

dist/static/css/chunk-fbfb83d8.ffdb4678.css

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

src/views/teamBuild/components/forecast-list.vue

@@ -111,7 +111,7 @@
                         label="乐器准备方式"
                     >
                         <template slot-scope="scope">
-                            {{ scope.row.kitPurchaseMethod == 1 ? '参与团购' : '自行准备' }}
+                            {{ scope.row.kitPurchaseMethod | instrumentType }}
                         </template>
                     </el-table-column>
                     <el-table-column

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"