diff --git a/components/meetingTimePicker/meetingTimePicker.js b/components/meetingTimePicker/meetingTimePicker.js
index 68c970b..614aa60 100644
--- a/components/meetingTimePicker/meetingTimePicker.js
+++ b/components/meetingTimePicker/meetingTimePicker.js
@@ -12,7 +12,7 @@ function padZero(val) {
 // 生成分钟 每隔五分钟
 function generateMin(max) {
   const time = [];
-  for (let i = 0; i < max; i += 15) {
+  for (let i = 0; i < max; i += 5) {
     time.push(padZero(i))
   }
   return time;
diff --git a/pages/meetingDetail/meetingDetail.js b/pages/meetingDetail/meetingDetail.js
index 8ba6031..ae463a2 100644
--- a/pages/meetingDetail/meetingDetail.js
+++ b/pages/meetingDetail/meetingDetail.js
@@ -176,7 +176,9 @@ create.Page({
       })
 
       this.$store.data.originalData = res.data.data;
-      this.$store.data.locationName = res.data.data.location ? res.data.data.location.locationName : ''
+      if (res.data.data.location) {
+        this.$store.data.locationName = res.data.data.location.meetingRoomName || res.data.data.location.locationName;
+      }
       this.$store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId
       this.store.data.scheduleId = res.data.data.groupId
       this.$store.data.startTime = res.data.data.startTime.replace(/-/g, "/")