diff --git a/package.json b/package.json
index 51c6836..b057882 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,11 @@
   "dependencies": {
     "@antv/data-set": "^0.10.2",
     "@antv/g2": "^3.4.10",
+    "@fullcalendar/core": "^4.2.0",
+    "@fullcalendar/daygrid": "^4.2.0",
+    "@fullcalendar/interaction": "^4.2.0",
+    "@fullcalendar/timegrid": "^4.2.0",
+    "@fullcalendar/vue": "^4.2.2",
     "@tinymce/tinymce-vue": "^2.0.0",
     "axios": "^0.18.0",
     "clipboard": "^2.0.0",
diff --git a/src/components/fullcalendar/fullcalendar.vue b/src/components/fullcalendar/fullcalendar.vue
deleted file mode 100644
index 660d739..0000000
--- a/src/components/fullcalendar/fullcalendar.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-
-<template>
-  <div id='calendar'></div>
-</template>
-
-<script>
-import $ from 'jquery'
-import 'fullcalendar'
-import 'fullcalendar/dist/fullcalendar.css'
-
-export default {
-  name: 'Fullcalendar',
-  data () {
-    return {
-
-    }
-  },
-  methods: {
-    /* 初始化日历插件fullcalendar */
-    calendarInit () {
-      $('#calendar').fullCalendar({
-        defaultView: 'month',
-        locale: 'zh-cn', // 设置语言为中文
-        timezone: 'local',
-        header: {
-          left: '',
-          center: 'prev title next',
-          right: 'newButton'
-        },
-        views: { // 设置不同视图中标题日期显示格式等
-          month: {
-            titleFormat: 'YYYY年M月',
-            displayEventTime: false // allDay等于false是可以用来设置不显示时间
-          },
-          listWeek: {
-            titleFormat: 'YYYY-M-D',
-            noEventsMessage: '没有任务' // 没有任务时显示的提示
-            // columnFormat:"M.D dddd",
-            // allDaySlot:false,   //是否显示all-day行
-          },
-          day: {
-            titleFormat: 'YYYY-M-D dddd'
-            // columnFormat:"M/D dddd"
-          }
-        },
-        // eventLimit: true,    //是否限制每天日程显示个数
-        events: [],
-        timeFormat: 'HH:mm', // 设置的是添加的日程上显示的时间
-        customButtons: {
-          newButton: {
-            text: '新建任务',
-            click: function () {
-
-            }
-          }
-        },
-        dayClick: function (date, allDay, jsEvent, view) {
-
-        },
-        eventClick: function (event, jsEvent, view) {
-
-        }
-      })
-    }
-
-  },
-  created () {
-
-  },
-  mounted () {
-    this.calendarInit()
-  },
-  watch: {
-
-  }
-}
-</script>
-
-<style lang="less">
-
-</style>
diff --git a/src/view/chat/chat.vue b/src/view/chat/chat.vue
index 1bf593a..9750419 100644
--- a/src/view/chat/chat.vue
+++ b/src/view/chat/chat.vue
@@ -177,8 +177,8 @@ export default {
 
     // 主动发送消息会话列表顺序改变
     handleSendMessage (val) {
+      this.currentConversation.updateTime = val
       if (this.currentConversationIndex !== 0) {
-        this.currentConversation.updateTime = val
         this.conversationList.splice(this.currentConversationIndex, 1)
         this.conversationList = [this.currentConversation, ...this.conversationList]
         this.currentConversationIndex = 0
diff --git a/src/view/chat/components/ChatBox.vue b/src/view/chat/components/ChatBox.vue
index def0871..7a44a34 100644
--- a/src/view/chat/components/ChatBox.vue
+++ b/src/view/chat/components/ChatBox.vue
@@ -53,8 +53,7 @@
 </template>
 <script>
 import { mapState } from 'vuex'
-// import Verbal from './Verbal'
-// import SelfUpload from '@/views/mail/mail-home/components/write-mail/self-upload'
+
 export default {
   name: 'ChatBox',
   props: {
diff --git a/src/view/components/fullcalendar/fullcalendar.vue b/src/view/components/fullcalendar/fullcalendar.vue
index 94f8017..275410f 100644
--- a/src/view/components/fullcalendar/fullcalendar.vue
+++ b/src/view/components/fullcalendar/fullcalendar.vue
@@ -1,24 +1,97 @@
-
 <template>
-  <fullcalendar></fullcalendar>
+  <div class='demo-app'>
+    <FullCalendar
+      class='demo-app-calendar'
+      ref="fullCalendar"
+      defaultView="dayGridMonth"
+      locale="zh-cn"
+      :header="{
+        left: 'prev,next today',
+        center: 'title',
+        right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek'
+      }"
+      :buttonText="buttonText"
+      :plugins="calendarPlugins"
+      :weekends="calendarWeekends"
+      :events="calendarEvents"
+      :eventLimit="true"
+      eventLimitText="更多"
+      @dateClick="handleDateClick"
+      @eventClick="handleEventClick"
+      />
+  </div>
 </template>
 
 <script>
-import Fullcalendar from '_c/fullcalendar/fullcalendar'
-
+import FullCalendar from '@fullcalendar/vue'
+import dayGridPlugin from '@fullcalendar/daygrid'
+import timeGridPlugin from '@fullcalendar/timegrid'
+import interactionPlugin from '@fullcalendar/interaction'
 export default {
   name: 'fullcalendar_page',
-  components: { Fullcalendar },
+  components: {
+    FullCalendar // make the <FullCalendar> tag available
+  },
   data () {
     return {
-
+      buttonText: {
+        today: '今天',
+        month: '月',
+        week: '周',
+        day: '天',
+        list: '列表'
+      },
+      calendarPlugins: [ // plugins must be defined in the JS
+        dayGridPlugin,
+        timeGridPlugin,
+        interactionPlugin // needed for dateClick
+      ],
+      calendarWeekends: true,
+      calendarEvents: [ // initial event data
+        {
+          title: 'Event Now',
+          start: new Date(),
+          color: '#A61000'
+        }
+      ]
     }
   },
-  created () {
-
-  },
-  mounted () {
-
+  methods: {
+    toggleWeekends () {
+      this.calendarWeekends = !this.calendarWeekends // update a property
+    },
+    gotoPast () {
+      let calendarApi = this.$refs.fullCalendar.getApi() // from the ref="..."
+      calendarApi.gotoDate('2019-08-01') // call a method on the Calendar object
+    },
+    handleDateClick (arg) {
+      if (confirm('Would you like to add an event to ' + arg.dateStr + ' ?')) {
+        this.calendarEvents.push({ // add new event data
+          title: 'New Event',
+          start: arg.date,
+          allDay: arg.allDay
+        })
+      }
+    },
+    handleEventClick (info) {
+      alert('Event: ' + info.event.title)
+    }
   }
 }
 </script>
+
+<style lang='less'>
+// you must include each plugins' css
+// paths prefixed with ~ signify node_modules
+@import '~@fullcalendar/core/main.css';
+@import '~@fullcalendar/daygrid/main.css';
+@import '~@fullcalendar/timegrid/main.css';
+.demo-app {
+  font-family: Arial, Helvetica Neue, Helvetica, sans-serif;
+  font-size: 14px;
+}
+.demo-app-calendar {
+  margin: 0 auto;
+  max-width: 900px;
+}
+</style>
diff --git a/src/view/directive/directive.vue b/src/view/directive/directive.vue
index d731335..4c8fab5 100644
--- a/src/view/directive/directive.vue
+++ b/src/view/directive/directive.vue
@@ -23,8 +23,11 @@
           </Row>
         </Card>
       </i-col>
-      <Modal v-draggable="options" v-model="modalVisible">
+      <!-- <Modal v-draggable="options" v-model="modalVisible">
         拖动这里即可拖动整个弹窗
+      </Modal> -->
+      <Modal draggable title="Modal 1" v-model="modalVisible">
+        可拖动弹窗
       </Modal>
     </Row>
     <Row style="margin-top: 10px;">
@@ -59,9 +62,6 @@
           </Row>
         </Card>
       </i-col>
-      <Modal v-draggable="options" v-model="modalVisible">
-        拖动这里即可拖动整个弹窗
-      </Modal>
     </Row>
   </div>
 </template>