更新

src/layout/class/classGroup.vue

@@ -2,7 +2,9 @@
   <div id="classGroup">
     <el-row>
       <el-col :span="24" class="button_class">
-        <van-button round icon="smile" type="info" v-if="this.user.job === '班长'" @click="createGroup()">创建小组</van-button>
+        <van-button type="info" v-if="this.user.job === '班长'" @click="createGroup()">创建小组</van-button>
+
+        <van-button type="info" v-if="this.user.job === '班长'" @click="affirm()">确认小组</van-button>
       </el-col>
       <el-col :span="24">
         <groupList :columns="columns" :groupList="groupList" :form="form" :show="show" v-on="$listeners" :stuIdAndGroupId="stuIdAndGroupId"></groupList>
@@ -52,6 +54,10 @@ export default {
     ...mapState(['user']),
   },
   methods: {
+    //确认小组
+    affirm() {
+      this.$emit('affirm');
+    },
     // 创建分组
     createGroup() {
       this.$emit('createGroup');
@@ -65,7 +71,6 @@ export default {
 
 <style lang="less" scoped>
 .button_class {
-  text-align: center;
   padding: 20px 0px;
 }
 /deep/.el-dialog__body {
@@ -84,4 +89,9 @@ export default {
   overflow: hidden;
   font-size: 16px;
 }
+
+/deep/.van-button {
+  width: 186px;
+  height: 44px;
+}
 </style>

src/layout/class/groupList.vue

@@ -1,9 +1,6 @@
 <template>
   <div id="groupList">
     <el-row>
-      <el-col :span="24" class="top">
-        <van-button type="primary" v-if="this.user.job === '班长'" @click="affirm()">确认</van-button>
-      </el-col>
       <el-col :span="24" class="list" v-for="(item, index) in groupList" :key="index">
         <el-collapse accordion>
           <el-collapse-item>
@@ -103,9 +100,7 @@ export default {
     },
   },
   methods: {
-    affirm() {
-      this.$emit('affirm');
-    },
+ 
     // 进组
     joinGroup(groupId) {
       Dialog.confirm({

src/layout/index/mainData.vue

@@ -105,8 +105,10 @@ export default {
   filters: {
     getMD(date) {
       let arr = date.split('-');
+      console.log(arr);
+
       //${arr[1]}-
-      return `${arr[2]}`;
+      return `${arr[1]}-${arr[2]}`;
     },
   },
 };

src/views/index.vue

@@ -55,6 +55,7 @@ export default {
   }),
   created() {
     let today = this.getDay();
+    // let month = this.getMonth();
     let todate = this.getDate();
     this.$set(this.today, `date`, todate);
     this.$set(this.today, `day`, today);
@@ -142,6 +143,7 @@ export default {
           return 0;
         }
       });
+      console.log(appArray);
 
       this.$set(this, `arrange`, _.compact(appArray));
     },