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

# Conflicts:
#	pages/conference/details/details.acss
#	pages/meeting/record/record.acss
#	pages/meeting/record/record.axml

pages/conference/addmeeting/addmeeting.axml

@@ -117,7 +117,7 @@
     <text class='left'>〉</text>
   </view>
 </checkbox-group>
-<view class="add"><button formType="submit" type="primary">预定</button></view>
+<view class="add"><button formType="submit" type="primary" disabled="{{isSubmit}}"><text a:if="{{!isSubmit}}">预定</text><text a:if="{{isSubmit}}">正在预定</text></button></view>
 <view class="mask2" onTap='mask2' catchtouchmove="preventTouchMove" hidden="{{!showModal2}}"></view>
 <view class="modaltime2" hidden="{{!showModal2}}" >
   <checkbox-group name="remindTime"   class="checkbox-group" onChange="checkboxChange">

pages/conference/addmeeting/addmeeting.js

@@ -41,7 +41,8 @@ Page({
     username:"",
     message:{},
     maxBookDay: '',
-    maxBookTime: ''
+    maxBookTime: '',
+    isSubmit:false
   },
   //密码
   radiopass: function(e){
@@ -112,7 +113,9 @@ Page({
   //  });
     var startTime =  this.data.dates+" "+this.data.time.startTime  ;
     var endTime = this.data.dates + " "+ this.data.time.endTime ;
-     
+     this.setData({
+       isSubmit:true
+     })
      var _this=this;
     // if (typeof (e.detail.value.conferenceName) == "undefined") {
     //   dd.alert({
@@ -206,7 +209,9 @@ Page({
                 content: '预定成功',
                 buttonText: '确定',
                 success: () => {
-                
+                 _this.setData({
+                    isSubmit:false
+                 })
                   dd.reLaunch({
                     url: '../index/index'
                   });

pages/conference/visitor/visitor.js

@@ -65,9 +65,6 @@ Page({
             departmentList
           })
         
-           that.setData({
-              departmentList
-         });
           // var data = res.data.departmentList;
     
           // that.setData({

pages/meeting/record/record.axml

@@ -50,7 +50,7 @@
         </view>
       </scroll-view>
     </swiper-item>
-    <swiper-item class="swiper-item">
+    <swiper-itemclass="swiper-item">
       <scroll-view class='swiper_con' scroll-y="{{true}}" onScrollToUpper="upper" onScrollToLower="lower" onScroll="scroll" scroll-into-view="{{toView}}" scroll-top="{{scrollTop}}">
         <view class='de_bg' a:for="{{mymessageList}}" a:for-item="mymessage">
             <view>