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

parts/time-table.vue

@@ -99,10 +99,15 @@ export default {
       let r = this.lessons.find(f => f.date == date && f.time == time);
       if (!r) return '--';
       else {
-        let { subname, teaname = '', reason } = r;
-        let text = `${subname}<br/><span style="color:red">${teaname}</span>`;
-        // if (reason && teaname !== '') text = `${text}<br/><span style="color:red">${reason}</span>`;
-        return text;
+        let { subname, teaname = '', reason, time } = r;
+        if (time == '08:30-11:30') {
+          let text = `${subname}<br/><span style="color:red">${teaname}</span><br/><span>${reason}</span>`;
+          return text;
+        } else {
+          let text = `${subname}<br/><span style="color:red">${teaname}</span>`;
+          // if (reason && teaname !== '') text = `${text}<br/><span style="color:red">${reason}</span>`;
+          return text;
+        }
       }
     },
     toPrint() {