Merge branch 'ol_12_30' into 11/24SAAS

src/App.vue

@@ -449,7 +449,13 @@ input[type="number"] {
   overflow: hidden;
   flex-wrap: nowrap;
 }
+.select-all {
+  .el-select__tags {
+    flex-wrap: nowrap!important;
+  }
+}
 .el-select__tags {
+
   .el-tag.el-tag--info.el-tag--small.el-tag--light {
     display: flex;
     flex-direction: row;

src/views/teacherManager/teacherDetail/index.vue

@@ -126,7 +126,7 @@ export default {
   data () {
     return {
       teacherName: this.$route.query.teacherName,
-      activeName: "0",
+      activeName: "",
       // activeStatus: [true, false, false, false, false, false, false]
       permissionList: {
         teacherInfo: permission("/teacherDetail/teacherInfo"),
@@ -153,10 +153,11 @@ export default {
   mounted () {
       this.teacherName = this.$route.query.teacherName;
       this.teacherId = this.$route.query.teacherId
-      this.activeName = "0";
+
       teacherGet({ teacherId: this.teacherId }).then(res => {
         if (res.code == 200) {
          this.teacherInfos = res.data
+         this.activeName = "0";
 
         }
       })

src/views/teamBuild/signupList.vue

@@ -78,6 +78,7 @@
           </auth>
           <div
             class="newBand"
+              style="background-color: #f97215; border: 1px solid #f97215"
             @click="onCreateQRCode('payment')"
             v-show="
               (status == 'PAY' ||
@@ -89,6 +90,20 @@
           >
             报名链接
           </div>
+               <div
+            class="newBand"
+            style="background-color: #f97215; border: 1px solid #f97215"
+            @click="onCreateQRCode('rePayment')"
+            v-show="
+              (status == 'PAY' ||
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
+            "
+          >
+            报名链接（无乐器）
+          </div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <auth :auths="'studentRegistration/queryPreApplyList/4263'">
             <div
@@ -114,20 +129,7 @@
           >
             合并学员
           </div>
-          <div
-            class="newBand"
-            style="background-color: #f97215; border: 1px solid #f97215"
-            @click="onCreateQRCode('rePayment')"
-            v-show="
-              (status == 'PAY' ||
-                status == 'APPLY' ||
-                status == 'PROGRESS' ||
-                status == 'PREPARE') &&
-              ischeckCanReg
-            "
-          >
-            报名链接（无乐器）
-          </div>
+
           <div
             class="newBand"
             v-permission="'studentRegistration/queryStudentApplyDetailExport'"