Merge branch '03/23resetCourse' into dev

src/views/teamDetail/components/modals/classroom-preview.vue

@@ -41,7 +41,7 @@
         label="周次"
         key="week"
       >
-        <span slot-scope="scope">{{$helpers.dayjs(scope.row.startClassTime).day()}}</span>
+        <span slot-scope="scope">{{weeks[$helpers.dayjs(scope.row.startClassTime).day()]}}</span>
       </el-table-column>
       <el-table-column
         label="开始时间"
@@ -90,6 +90,19 @@ export default {
       default: []
     },
   },
+  data() {
+    return {
+      weeks: {
+        0: '星期天',
+        1: '星期一',
+        2: '星期二',
+        3: '星期三',
+        4: '星期四',
+        5: '星期五',
+        6: '星期六',
+      }
+    }
+  },
   computed: {
     coreTeacherName() {
       let name = ''

src/views/teamDetail/components/modals/classroom-setting-item.vue

@@ -383,7 +383,8 @@ export default {
         row.dayOfWeek - date.getDay() >= 0
           ? (num = row.dayOfWeek - date.getDay())
           : (num = row.dayOfWeek - date.getDay() + 7);
-          let end = dayjs(val).add(num+(row.expectCourseNum*7), 'day')
+          const exp = Math.max(row.expectCourseNum - 1, 0)
+          let end = dayjs(val).add(num + (exp*7), 'day')
           if (row.holiday) {
             for (const d of this.holidays) {
               if (dayjs(d).isBetween(row.startDate, end.format('YYYY-MM-DD'), null, '[]')) {

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -121,7 +121,7 @@
       title="班级预览"
       :visible.sync="previewVisible"
       append-to-body
-      width="650px"
+      width="700px"
     >
       <classrome-preview
         :types="form.classs"
@@ -221,7 +221,7 @@ export default {
       musicSurplus: {},
       previewVisible: false,
       previewList: [],
-      holidays: []
+      holidays: [],
     };
   },
   watch: {