Merge remote-tracking branch 'origin/yingdi2.0' into yingdi2.0

src/views/base/active/Active.vue

@@ -15,6 +15,7 @@
             <el-checkbox v-for="(item2, index2) in item.labelLists"
                          :key="index2"
                          :label="item2.lableId"
+                         :class="checkAll[index]?'is-check-all':''"
                          border>{{item2.lableName}}
             </el-checkbox>
           </el-checkbox-group>
@@ -50,6 +51,7 @@
             <el-checkbox v-for="(item, index) in supportList"
                          :key="index"
                          :label="item.lableId"
+                         :class="checkAllSupp?'is-check-all':''"
                          border>{{item.lableName}}
             </el-checkbox>
           </el-checkbox-group>
@@ -403,6 +405,7 @@
           }
 
           ::v-deep .el-checkbox {
+            color: #333333;
             border: 0;
             padding: 0 10px;
             margin: 0 0 0 15px;
@@ -424,6 +427,12 @@
                 color: var(--all_color) !important;
               }
             }
+
+            /*&.is-check-all {*/
+            /*  .el-checkbox__label {*/
+            /*    color: #333333 !important;*/
+            /*  }*/
+            /*}*/
           }
 
           ::v-deep .el-input {

src/views/base/active/ActiveInfo.vue

@@ -58,7 +58,6 @@
             </div>
             <div class="center-area-title-box-item"
                  :class="activeContent==2?'is-active':''"
-                 v-if="type=='previous'"
                  @click="changeActive(2)"
             >活动回顾
             </div>
@@ -214,7 +213,7 @@
           name: '2023年寒假历史营地',
           school: ['南开大学', '历史学', '大学生'],
           beginTime: '2023-09-01',
-          endTime: '20230903',
+          endTime: '2023-09-03',
           days: '3',
           bmEndTime: '2023-08-31',
           free: 6000,
@@ -245,7 +244,7 @@
               name: '2023年寒假历史营地1',
               school: ['南开大学', '历史学', '大学生'],
               beginTime: '2023-09-01',
-              endTime: '20230903',
+              endTime: '2023-09-03',
               days: '3',
               bmEndTime: '2023-08-31',
               free: 6000,
@@ -258,7 +257,7 @@
               name: '2023年寒假历史营地2',
               school: ['南开大学', '历史学', '大学生'],
               beginTime: '2023-09-01',
-              endTime: '20230903',
+              endTime: '2023-09-03',
               days: '3',
               bmEndTime: '2023-08-31',
               free: 6000,
@@ -274,7 +273,7 @@
               name: '2023年寒假历史营地3',
               school: ['南开大学', '历史学', '大学生'],
               beginTime: '2023-09-01',
-              endTime: '20230903',
+              endTime: '2023-09-03',
               days: '3',
               bmEndTime: '2023-08-31',
               free: 6000,
@@ -287,7 +286,7 @@
               name: '2023年寒假历史营地4',
               school: ['南开大学', '历史学', '大学生'],
               beginTime: '2023-09-01',
-              endTime: '20230903',
+              endTime: '2023-09-03',
               days: '3',
               bmEndTime: '2023-08-31',
               free: 6000,
@@ -518,7 +517,7 @@
             height: 50px;
             display: flex;
             flex-flow: row;
-            justify-content: center;
+            justify-content: left;
             border-bottom: 1px solid #cccccc;
 
             .center-area-title-box-item {