BUG回归

1

src/views/buildVip/index.vue

@@ -898,7 +898,7 @@ export default {
     this.$router.beforeEach(async (to, from, next) => {
       if (this.leftForm?.classOrganId && from.path == "/business/buildVip") {
         console.log(this.leftForm?.classOrganId);
-        this.$confirm("检测到您有未提交的数据, 离开将丢失该数据?", "提示", {
+        this.$confirm("检测到您有未提交的数据, 离开将丢失该数据!", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           closeOnClickModal: false,
@@ -1126,12 +1126,13 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate: (time) => {
-          if (self.leftForm.courseStart) {
+          if (self.leftForm.courseStart&&self.leftForm.courseEnd) {
             let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
+            let endDate = new Date(self.leftForm.courseEnd.replace(/-/, "/"));
             let nowDate = new Date();
-            let changeDate =
-              date.getTime() - nowDate.getTime() > 0 ? date : nowDate;
-            return time.getTime() < changeDate.getTime();
+            let changeDate =date.getTime() - nowDate.getTime() > 0 ? date : nowDate;
+            let endChangeDate =  endDate.getTime() - nowDate.getTime() > 0 ? endDate : nowDate;
+            return time.getTime() < changeDate.getTime() || time.getTime() > endChangeDate.getTime();
           }
           return;
         },

src/views/vipClass/vipList.vue

@@ -344,7 +344,7 @@
                   >修改</el-button
                 >
                 <el-button type='text'  v-if="
-                    scope.row.vipGroupActivityId <=0 &&
+                    scope.row.vipGroupCategoryName =='乐理课' &&
                     permission('vipGroupManage/update')&&scope.row.status==1" @click="isStartCourse(scope.row)">确认成课</el-button>
               </div>
             </template>