Merge branch 'Nov16thResetMusic' into online

src/views/resetTeaming/modals/user-pay-form.vue

@@ -220,10 +220,11 @@ export default {
     },
     isMulticycle() {
       let editMulticycle = false
+      let paymentType = ''
       if (this.viewDetail) {
         const { musicGroupPaymentCalenders, auditDto } = this.viewDetail
-        editMulticycle = (musicGroupPaymentCalenders > 1 ||
-          musicGroupPaymentCalenders[0]?.paymentType != 'ADD_COURSE')
+        paymentType = musicGroupPaymentCalenders[0]?.paymentType
+        editMulticycle = (musicGroupPaymentCalenders.length > 1 || paymentType != 'ADD_COURSE')
         if (editMulticycle) {
           this.cycles = musicGroupPaymentCalenders.map(item => ({
             paymentAmount: item.paymentAmount,
@@ -232,7 +233,7 @@ export default {
           }))
         }
       }
-      return (this.payment.paymentPattern == 0 && this.form.leixing !== '2') || (this.payment.paymentPattern == 0 && editMulticycle)
+      return (this.payment.paymentPattern == 0 && this.form.leixing !== '2' && paymentType !== 'ADD_COURSE') || (this.payment.paymentPattern == 0 && editMulticycle)
     }
   },
   watch: {