Merge branch 'master' of http://139.159.178.92:8090/zhenglide/UbainsMeeting

# Conflicts:
#	pages/conference/addmeeting/addmeeting.js

pages/conference/addmeeting/addmeeting.js

@@ -98,7 +98,9 @@ Page({
   formSubmit: function(e) {
     console.log('form发生了submit事件，携带数据为：', e.detail.value);
     var conferenceList=this.data.conferenceList;
-   
+  //  dd.showLoading({
+  //   content: '预定中...',
+  //  });
     var startTime =  this.data.dates+" "+this.data.time.startTime  ;
     var endTime = this.data.dates + " "+ this.data.time.endTime ;
      
@@ -209,8 +211,9 @@ Page({
        }
       },
       fail: function(res) {
-        //console.log("httpRequestFail---", res)
+ //console.log("httpRequestFail---", res)
         //dd.alert({ content: JSON.stringify(res) });
+
       },
       complete: function(res) {
         dd.hideLoading();