Merge branch '01/19NavMenu' into online

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

@@ -342,11 +342,19 @@ export default {
             batchNo: this.rowDetail.batchNo,
           })
           this.viewDetail = res.data
+          const firstPayment = res.data.musicGroupPaymentCalenders[0] || {}
           this.eclass = (res.data.musicGroupPaymentCalenderCourseSettings || []).filter(item => {
             return !item.isStudentOptional || this.paymentType !== undefined
           })
-          this.eclassuser = res.data.musicGroupPaymentCalenderStudentDetails
-          const firstPayment = res.data.musicGroupPaymentCalenders[0] || {}
+          this.eclassuser = res.data.musicGroupPaymentCalenderStudentDetails.map(item => {
+            if (this.paymentTypeString === 'SPAN_GROUP_CLASS_ADJUST') {
+              return {
+                ...item,
+                courseCurrentPrice: item.masterSubCoursePrice
+              }
+            }
+            return item
+          })
           this.$set(this.payment, 'paymentPattern', String(this.viewDetail.auditDto?.paymentPattern))
           if (this.$refs.cycle) {
             this.$set(

src/views/teamDetail/teamCourseList.vue

@@ -702,7 +702,25 @@ export default {
     const { query } = this.$route
     if (query.start || query.end) {
       this.searchForm.timer = [query.start, query.end]
-    } 
+    } else {
+      let flag = false
+      for(let item in this.searchForm){
+        if(typeof this.searchForm[item] == 'object'){
+          // 对象或者数组
+          if(this.searchForm[item]?.length >0){
+            flag = true
+          }
+        }else{
+          if (this.searchForm[item]){
+            flag = true
+          }
+        }
+      }
+      if(!flag){
+        this.searchForm.timer = [nowTime, nowTime]
+      }
+    }
+
     if (query.organId) {
       this.searchForm.organIdList = Number(query.organId)
     }