Merge branch 'dev' into release/1.0.0

pages/index/index.js

@@ -34,7 +34,7 @@ create.Page({
     $data: null,
     iconDay: currentDate.getDate(),
     scheduleList: [],
-    todayStr: toLocaleDateString(currentDate),
+    todayStr: '',
     currentData: toLocaleDateString(currentDate),
     currentDataIndex: 0,
     offset: "stop",
@@ -170,7 +170,9 @@ create.Page({
           loading: false
         });
         this.isLoaded = true;
+        setTimeout(() => {
           this.backToToday('first')
+        }, 300)
         return;
       }
 
@@ -181,7 +183,9 @@ create.Page({
           sign: res.data.data.sign
         })
         if (this.isFirstLoad) {
+          setTimeout(() => {
             this.backToToday('first')
+          }, 300)
           this.isFirstLoad = false;
         }
         return

pages/meetingRoomList/meetingRoomList.js

@@ -421,7 +421,8 @@ create.Page({
               );
             } else {
               dd.alert({
-                content: "会议室已被占用"
+                content: "会议室已被占用",
+                buttonText: "确定"
               });
             }
           });
@@ -530,7 +531,8 @@ create.Page({
               );
             } else {
               dd.alert({
-                content: "会议室已被占用"
+                content: "会议室已被占用",
+                buttonText: "确定"
               });
             }
           });
@@ -828,7 +830,8 @@ create.Page({
               );
             } else {
               dd.alert({
-                content: "会议室已被占用"
+                content: "会议室已被占用",
+                buttonText: "确定"
               });
             }
           });
@@ -937,7 +940,8 @@ create.Page({
               );
             } else {
               dd.alert({
-                content: "会议室已被占用"
+                content: "会议室已被占用",
+                buttonText: "确定"
               });
             }
           });
@@ -1326,8 +1330,8 @@ create.Page({
       }
     );
   },
-  onMonthChange() {},
-  onYearChange() {},
+  onMonthChange() { },
+  onYearChange() { },
   onSelectHasDisableDate() {
     my.alert({
       content: "SelectHasDisableDate"