Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/stuMan/eventsCalendar.vue

@@ -344,6 +344,11 @@ export default {
   },
   data() {
     return {
+        pickerOptions: {
+          disabledDate: time => {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
         date:'',
         value: new Date(),
         calendarData:[],

src/components/work/index.vue

@@ -127,7 +127,7 @@
       </div> -->
       <q-btn-group
         outline
-        style="position: fixed;top: 15px;right:20px;z-index: 666666;"
+        style="position: fixed;top: 75px;right:20px;z-index: 666666;"
       >
         <q-btn
           dense

src/pages/Work.vue

@@ -271,7 +271,7 @@ export default {
 .sub-header {
   position: fixed;
   height: 56px;
-  top: 0;
+  top: 60px;
   left: 0;
   right: 0;
   transition: top 0.3s ease;