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

pages/appDetails/appDetails.js

@@ -52,16 +52,18 @@ create.Page({
         ddUserId: getApp().globalData.userid
       };
       getThirdUserPlatForm(data).then(res => {
-        if (res.data.msg === "当前账号已被其他账号绑定!") {
+        console.log(JSON.stringify(res));
+        console.log(res.data.msg === "当前账号已被其他账号绑定！");
+        if (res.data.msg === "当前账号已被其他账号绑定！") {
           this.setData({
             isBind: false,
-            bindStatus: "fail"
+            bindStatus: "binded"
           });
           setTimeout(() => {
             that.setData({
               isLoading: false
             });
-          }, 2000);
+          }, 10000);
           clearInterval(interval);
         } else if (res.data.data) {
           if (res.data.data.platform === this.data.platform) {

pages/meetingRoomList/meetingRoomList.axml

@@ -4,7 +4,7 @@
     <view class="iconfont iconicon_open" onTap="selectSearchTime"></view>
   </view>
 </view>
-<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}">
+<scroll-view scroll-y="true" class="roomScrollView" disable-scroll="{{!canScroll}}">
   <view class="reserveMeeting">
     <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
       <view class="roomMessage">
@@ -52,8 +52,8 @@
       <view class="noRoomTip">当前暂无会议室</view>
     </view>
   </view>
-  <view>
-    <popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
+</scroll-view>
+<popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
   <view a:if="{{!isShowCalendar}}" class="modalContent">
     <view class="modalHeader">
       <text onTap="onDetermine">确定</text>
@@ -115,4 +115,4 @@
     </view>
     <calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
   </view>
-    </popup>
+</popup>
\ No newline at end of file