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

src/pages/Work.vue

@@ -37,7 +37,10 @@
       </q-btn>-->
       <q-btn flat @click="changeMenu(3)" :color="chosenMenu==3?'primary':'blue-grey-14'" :class="[chosenMenu==3?'text-weight-bold':'']" label="我的排班计划"></q-btn>
       <q-btn flat @click="changeMenu(4)" v-if="AccountType==2" :color="chosenMenu==4?'primary':'blue-grey-14'" :class="[chosenMenu==4?'text-weight-bold':'']" label="我的上课计划"></q-btn>
-
+      <q-btn flat @click="changeMenu(6)" :color="chosenMenu==6?'primary':'blue-grey-14'" :class="[chosenMenu==6?'text-weight-bold':'']" label="活动日历"></q-btn>
+    </div>
+    <div class="bg-white col" v-if="chosenMenu==6">
+      <eventsCalendar></eventsCalendar>
     </div>
     <div class="bg-white col" v-if="chosenMenu==5">
       <work></work>
@@ -78,6 +81,7 @@
   import mySchedule from './scheduling/mySchedule'
   import myClassmate from './scheduling/myClassmate';
   import work from '../components/work/index'
+  import eventsCalendar from '../components/stuMan/eventsCalendar'
 
   export default {
     components:{
@@ -87,7 +91,8 @@
       noticeForm,
       mySchedule,
       myClassmate,
-      work
+      work,
+      eventsCalendar
     },
     name: 'PageIndex',
     data(){

src/pages/stuMan/activeList.vue

@@ -386,7 +386,12 @@
     },
 
     mounted() {
+      if(this.$route.query.ActivityName){
+        this.msg.ActivityName = this.$route.query.ActivityName
         this.getList();
+      }else{
+        this.getList();
+      }
     },
     methods: {
       // getItem(item) {