Merge branch 'release/dev/2.1.0' of…

Merge branch 'release/dev/2.1.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/dev/2.1.0

.gitignore

 node_modules/
 .tea/
 debug.log
+.kaitian/settings.json

.kaitian/settings.json

 {
-  "editor.formatOnSave": true
+  "editor.formatOnSave": true,
+  "editor.fontSize": 14
 }
\ No newline at end of file

pages/createMeeting/createMeeting.js

@@ -50,7 +50,7 @@ create.Page({
     })
     this.setData({
       isIPX: checkFullScren(),
-      placeholder: `${getApp().globalData.name}创建的会议`
+      placeholder: '添加事件、会议、活动等标题'
     })
     this.reset(query)
   },
@@ -222,12 +222,18 @@ create.Page({
     if (this.data.limitClick) {
       return
     }
+    if (!this.data.title) {
+      dd.showToast({
+        content: '标题不能为空',
+      });
+      return
+    }
     this.setData({ limitClick: true });
     dd.showLoading({
       content: '正在创建...',
     });
     let data = {
-      title: this.data.title || `${getApp().globalData.name}创建的会议`,
+      title: this.data.title,
       location: {
         longitude: '10',
         latitude: '10',

pages/meetingDetail/meetingDetail.js

@@ -124,7 +124,7 @@ create.Page({
     this.reset()
     this.setData({
       isIPX: checkFullScren(),
-      placeholder: `${getApp().globalData.name}创建的会议`,
+      placeholder: '事件、会议、活动标题',
       scheduleItem,
       currentPeople: getApp().globalData.userid || dd.getStorageSync({ key: 'userid' }).data
     })