Merge branch '03/03Lebao' into test

src/views/serverDetail/index.vue

@@ -378,7 +378,7 @@ export default {
         this.searchForm.unDone = this.$route.query.unDone+'' || ""
          this.searchForm.reminded = this.$route.query.reminded+'' || ""
         const dayjs = this.$helpers.dayjs;
-        let nowDate = dayjs(new Date()).format("YYYY-MM-DD");
+        let nowDate = dayjs(new Date()).subtract(7, 'day').format("YYYY-MM-DD");
         this.orderDate = [
           getNowDateAndMonday(nowDate),
           getNowDateAndSunday(nowDate),

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -154,7 +154,6 @@ import { queryRemainCourseTypeDuration } from '../../api'
 import { courseType } from '@/constant'
 import { getTimes, objectToOptions } from "@/utils";
 import { paymentPatternType } from '@/constant'
-// console.log(Math.round(numeral(item.courseTotalMinuties || 1).multiply(active.unitPrice || 1).value()))
 export default {
   props: ["snapList", "highList", "mixList", "signList", 'createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId', 'baseInfo'],
   components: {
@@ -205,7 +204,6 @@ export default {
     }
   },
   mounted() {
-    console.log([...this.snapList])
     this.formatCourse()
   },
   methods: {

src/views/teamDetail/components/studentList.vue

@@ -1145,18 +1145,19 @@ export default {
           this.mixList = [];
           this.highList = [];
           this.snapList = [];
+          // else if (item.type == "HIGH_ONLINE") {
+          //    this.highonlineList.push(item);
+          //  }
           this.classList.forEach((item) => {
             if (item.type == "NORMAL") {
               this.signList.push(item);
             } else if (item.type == "MIX") {
               this.mixList.push(item);
-            } else if (item.type == "HIGH") {
+            } else if (item.type == "HIGH" || (item.type=="HIGH_ONLINE"&&item.studentNum<6)) {
               this.highList.push(item);
             } else if (item.type == "SNAP") {
               this.snapList.push(item);
-            } else if (item.type == "HIGH_ONLINE") {
-              this.highonlineList.push(item);
-            } else if (item.type == "MUSIC_NETWORK") {
+            }  else if (item.type == "MUSIC_NETWORK") {
               this.muiscnetworkList.push(item);
             }
           });

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {