Merge branch 'temp_0223' into online

src/views/teamBuild/signupList.vue

@@ -46,8 +46,9 @@
           >
             延长报名
           </div>
-          <div class="newBand" @click="onCreateQRCode">报名链接</div>
-          <div class="newBand" @click="onCreateQRCode2">缴费详情</div>
+          <div class="newBand" @click="onCreateQRCode('payment')">报名链接</div>
+          <div class="newBand" @click="onCreateQRCode('rePayment')">学生报名缴费连接</div>
+          <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <div
             class="newBand"
             v-show="rightList.length > 0"
@@ -482,7 +483,7 @@
         >
       </div>
     </el-dialog>
-    <el-dialog title="报名二维码" :visible.sync="qrcodeStatus" width="300px">
+    <!-- <el-dialog title="报名二维码" :visible.sync="qrcodeStatus" width="300px">
       <div class="left-code">
         <h2>学员报名连接</h2>
         <div id="qrcode" class="qrcode code" ref="qrCodeUrl"></div>
@@ -499,7 +500,10 @@
         <div id="qrcode2" class="qrcode code" ref="qrCodeUrl"></div>
         <p class="code-url" v-show="codeUrl2">{{ codeUrl2 }}</p>
       </div>
-    </el-dialog>
+    </el-dialog> -->
+
+    <!-- 预报名连接 -->
+    <qr-code v-model="codeStatus" :title="codeTitle" :codeUrl="qrCodeUrl" />
 
     <!-- 退团弹窗 -->
     <el-dialog
@@ -658,6 +662,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import qrCode from '@/components/QrCode/index'
 import {
   getintoClass,
   getStudentList,
@@ -692,6 +697,7 @@ export default {
   name: "signupList",
   components: {
     pagination,
+    qrCode,
     changeVoice,
     mergeMusic,
     forecastList,
@@ -770,6 +776,9 @@ export default {
       qrcodes2: true,
       qrcode2: null,
       codeUrl2: null,
+      codeStatus: false,
+      codeTitle: null,
+      qrCodeUrl: null,
       organId: "",
       extendPaymentStatus: false,
       extendForm: {
@@ -978,24 +987,22 @@ export default {
         })
         .catch(() => {});
     },
-    onCreateQRCode() {
+    onCreateQRCode(type) {
       // 生成报名二维码
-      this.qrcodeStatus = true;
       let id = this.id;
+      this.codeStatus = true
+      if(type == 'payment') {
+        this.codeTitle = '学员报名连接'
+        this.qrCodeUrl = vaildStudentUrl() + "/#/login?musicGroupId=" + id;
+      } else if(type == 'detail') {
+        let teamName = this.$route.query.name;
+        this.codeTitle = '报名缴费详情'
+        this.qrCodeUrl = vaildTeacherUrl() + "/#/order?musicGroupId=" + id + "&musicGroupName=" + teamName;
+      } else if(type == 'rePayment') {
+        this.codeTitle = '学生报名缴费连接'
+        this.qrCodeUrl = vaildStudentUrl() + "/#/musicGroupRePayment?musicGroupId=" + id;
+      }
 
-      let teamName = this.$route.query.name;
-      setTimeout(() => {
-        document.getElementById("qrcode").innerHTML = "";
-        this.qrcode = new QRCode("qrcode", {
-          width: 200,
-          height: 200,
-          colorDark: "#000000",
-          colorLight: "#ffffff",
-          correctLevel: QRCode.CorrectLevel.H,
-        });
-        this.qrcode.makeCode(vaildStudentUrl() + "/#/login?musicGroupId=" + id);
-        this.codeUrl = vaildStudentUrl() + "/#/login?musicGroupId=" + id;
-      }, 500);
     },
     onCreateQRCode2() {
       // 生成报名二维码
@@ -1633,6 +1640,7 @@ export default {
 }
 .newBand {
   margin-bottom: 0;
+  max-width: inherit;
 }
 /deep/.el-button--danger {
   background: #f85043;