Merge branch 'master' of http://git.cc-lotus.info/new_train/train-director

src/views/classes/parts/class-table.vue

@@ -355,6 +355,8 @@ export default {
     async getOtherList() {
       let res = await this.getSubject();
       if (this.$checkRes(res)) this.$set(this, `subjectList`, res.data);
+      res = await this.fetch({ model: 'notice', classid: this.classInfo.id, type: '4', planid: this.classInfo.planid, termid: this.classInfo.termid });
+      if (this.$checkRes(res)) this.$set(this, `noticeList`, res.data);
     },
     async seachTeacher() {
       let arr = this.oLessonList.filter(item => item.teaid != null);
@@ -362,8 +364,6 @@ export default {
       var ids = NewArr.map(item => item.teaid);
       let res = await this.lessonteafetch(ids);
       if (this.$checkRes(res)) this.$set(this, `teacherList`, res.data);
-      res = await this.fetch({ model: 'notice', classid: this.classInfo.id, type: '4', planid: this.classInfo.planid, termid: this.classInfo.termid });
-      if (this.$checkRes(res)) this.$set(this, `noticeList`, res.data);
     },
     //关闭抽屉
     toClose() {
@@ -444,7 +444,7 @@ export default {
         const { notified } = this.noticeList;
         if (notified) {
           const r = notified.find(f => f.notifiedid == teaid);
-          if (!r) word = '未绑定微信';
+          if (!r) word = '未收到通知';
           else {
             word = r.status == '0' ? '未确认' : '已确认';
           }