Merge branch 'master' of https://gitee.com/meliuxy_456/dangxingjiaoyujidi-web

src/views/active/activity.vue

@@ -431,28 +431,36 @@
             value: "商业"
           }],
           activityCon: [{
-            id: 1,
-            value: "讲座"
-          }, {
             id: 2,
-            value: "主题参观"
+            value: "主题党日"
+          }, {
+            id: 4,
+            value: "未成年课程"
           }, {
+            id: 5,
+            value: "大讲堂"
+          },{
             id: 3,
             value: "体验活动"
+          },{
+            id: 1,
+            value: "讲座"
           }],
           activityGroup: [{
             id: 1,
-            value: "幼儿园"
+            value: "未成年"
           }, {
             id: 2,
-            value: "小学生"
-          }, {
-            id: 3,
-            value: "初中生"
-          }, {
-            id: 4,
-            value: "高中生"
-          }, {
+            value: "成年人"
+          },
+          // {
+          //   id: 3,
+          //   value: "初中生"
+          // }, {
+          //   id: 4,
+          //   value: "高中生"
+          // },
+          {
             id: 5,
             value: "不限"
           }]
@@ -768,11 +776,11 @@
           return false;
         }
         //比较预约截止不能大于活动开始时间
-        let checktime = that.compareDate(that.form.start_time, that.form.end_plan);
-        if (!checktime) {
-          that.$message.error('截止时间不能晚于开始时间');
-          return false;
-        }
+        // let checktime = that.compareDate(that.form.start_time, that.form.end_plan);
+        // if (!checktime) {
+        //   that.$message.error('截止时间不能晚于开始时间');
+        //   return false;
+        // }
         let upTotal = 0
         if(that.form.numbers_list.length==0){
           that.$message.error('请填写活动场次');