Merge branch '03/03GRADE' into jenkins

src/views/main/constant.js

@@ -120,7 +120,7 @@ export const errorType = {
     permission: '/teamCLassList',
     always: true,
     query: {
-      lessThenThreeHighOnline: 'true',
+      lessThenThreeHighOnline: 'false',
     },
   },
   HIGH_CLASS_STUDENT_LESS_THAN_THREE_INFO: {
@@ -130,7 +130,7 @@ export const errorType = {
     permission: '/teamCLassList',
     always: true,
     query: {
-      lessThenThreeHighOnline: 'false',
+      lessThenThreeHighOnline: 'true',
     },
   },
 

src/views/teacherManager/teacherOperation/components/accompanySet.vue

@@ -82,7 +82,7 @@
                           format="HH:mm"
                           value-format="HH:mm"
                           :picker-options="{
-              selectableRange:`06:00:00 - 23:59:00`
+              selectableRange:`06:00:00 - 21:30:00`
   }"
                           placeholder="选择时间"></el-time-picker>
         </el-form-item>
@@ -91,7 +91,7 @@
                           format="HH:mm"
                           value-format="HH:mm"
                           :picker-options="{
-              selectableRange:`${startTime ? startTime+':00' : '06:00:00'}-23:59:00`
+              selectableRange:`${startTime ? startTime+':00' : '06:00:00'}-21:30:00`
   }"
                           placeholder="选择时间"></el-time-picker>
         </el-form-item>

src/views/teamDetail/components/modals/class-resetclass-name.vue

@@ -27,11 +27,11 @@
       <el-form-item
       v-else
         label="备注"
-        prop="memo"
+        prop="desc"
 
       >
         <el-input
-          v-model="form.memo"
+          v-model="form.desc"
           type="textarea"
           :rows="3"
           style="width: 100%"
@@ -53,14 +53,14 @@ export default {
       form: {
         name: "",
         id: "",
-        memo:""
+        desc:""
       },
     };
   },
   computed: {},
   mounted() {
     this.form.name = this.detail.name;
-    this.form.memo = this.detail.memo;
+    this.form.desc = this.detail.desc;
     this.form.id = this.detail.id;
   },
   methods: {

src/views/vipClass/vipReset.vue

@@ -367,7 +367,7 @@
                             format='HH:mm'
                             value-format='HH:mm'
                             :picker-options="{
-                            selectableRange: '06:00:00 - 23:30:00'
+                            selectableRange: '06:00:00 - 21:00:00'
                             }"></el-time-picker>
             <span style="margin-left:10px;">结束时间</span>
             <el-time-picker style="margin-left:10px;"
@@ -377,7 +377,7 @@
                             value-format='HH:mm'
                             disabled
                             :picker-options="{
-                            selectableRange: '06:00:00 - 23:30:00'
+                            selectableRange: '06:00:00 - 21:00:00'
                             }"></el-time-picker>
             <el-button style="margin-left:10px;"
                        type="danger"