会议室列表滚动问题

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,67 +52,67 @@
       <view class="noRoomTip">当前暂无会议室</view>
     </view>
   </view>
-  <view>
-    <popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
-      <view a:if="{{!isShowCalendar}}" class="modalContent">
-        <view class="modalHeader">
-          <text onTap="onDetermine">确定</text>
+</scroll-view>
+<popup show="{{isShowModal}}" onClose="onCancel" position="bottom">
+  <view a:if="{{!isShowCalendar}}" class="modalContent">
+    <view class="modalHeader">
+      <text onTap="onDetermine">确定</text>
+    </view>
+    <view class="modalTimeSlot">
+      <text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text>
+      <text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>
+    </view>
+    <view class="changeDay">
+      <view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">
+        <view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view>
+        <view>今天</view>
+      </view>
+      <view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">
+        <view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view>
+        <view>明天</view>
+      </view>
+      <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">
+        <view>{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view>
+        <view>后天</view>
+      </view>
+      <view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">
+        <view>
+          自定义日期
         </view>
-        <view class="modalTimeSlot">
-          <text a:if="{{!modalFooter.startTime || !modalFooter.endTime}}">请选择会议时间</text>
-          <text a:if="{{modalFooter.startTime && modalFooter.endTime}}">{{modalFooter.startTime}}至{{modalFooter.isOneDay ? modalFooter.endTime.substr(11,16):modalFooter.endTime}} 共{{modalFooter.allMinutes}}分钟</text>
+        <view>
+          <text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
         </view>
-        <view class="changeDay">
-          <view class="{{dataNum == '0' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="0">
-            <view>{{TimeSlot.todayTime.split('/')[1]}}月{{TimeSlot.todayTime.split('/')[2]}}日</view>
-            <view>今天</view>
+      </view>
+    </view>
+    <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}">
+      <view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}">
+        <view>
+          <view a:if="{{item.status==='BeOverdue'}}" class="beOverdue">
+            <text class="iconfont iconicon_Agreed1"></text>
           </view>
-          <view class="{{dataNum == '1' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="1">
-            <view>{{TimeSlot.tomorrowTime.split('/')[1]}}月{{TimeSlot.tomorrowTime.split('/')[2]}}日</view>
-            <view>明天</view>
+          <view a:elif="{{item.status==='Uncheck'}}" class="Unchecked">
+            <text class="iconfont iconicon_uncheck"></text>
           </view>
-          <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">
-            <view>{{TimeSlot.afterTomorrowTime.split('/')[1]}}月{{TimeSlot.afterTomorrowTime.split('/')[2]}}日</view>
-            <view>后天</view>
-          </view>
-          <view class="{{dataNum == '3' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="3">
-            <view>
-          自定义日期
-            </view>
-            <view>
-              <text a:if="{{dataNum == '3'}}">{{meetingTime.date.split('/')[1]}}月{{meetingTime.date.split('/')[2]}}日</text>
-            </view>
+          <view a:elif="{{item.status==='checked'}}" class="checked">
+            <text class="iconfont iconicon_Agreed1"></text>
           </view>
         </view>
-        <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" scroll-into-view="{{toThisTime}}">
-          <view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(11,15)}}">
-            <view>
-              <view a:if="{{item.status==='BeOverdue'}}" class="beOverdue">
-                <text class="iconfont iconicon_Agreed1"></text>
-              </view>
-              <view a:elif="{{item.status==='Uncheck'}}" class="Unchecked">
-                <text class="iconfont iconicon_uncheck"></text>
-              </view>
-              <view a:elif="{{item.status==='checked'}}" class="checked">
-                <text class="iconfont iconicon_Agreed1"></text>
-              </view>
-            </view>
-            <view>
-              <view>{{item.reserveStartTime.substr(10,15)}} ~ {{item.reserveEndTime.substr(10,15)}}</view>
-              <view class="expiredStatus" a:if="{{item.reserveStatus === 'expired'}}">
+        <view>
+          <view>{{item.reserveStartTime.substr(10,15)}} ~ {{item.reserveEndTime.substr(10,15)}}</view>
+          <view class="expiredStatus" a:if="{{item.reserveStatus === 'expired'}}">
           已过期
-              </view>
-              <view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}">
+          </view>
+          <view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}">
           已被{{item.scheduleList[0].organizerName}}预定
-              </view>
-            </view>
           </view>
-        </scroll-view>
-      </view>
-      <view class="calendarMoadl" a:else>
-        <view class="calendarTip">
-      自定义时间
         </view>
-        <calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
       </view>
-    </popup>
+    </scroll-view>
\ No newline at end of file
+  </view>
+  <view class="calendarMoadl" a:else>
+    <view class="calendarTip">
+      自定义时间
+    </view>
+    <calendar type="single" haveYear="{{false}}" selectedDate="{{meetingTime.date}}" onSelect="handleSelect" onMonthChange="onMonthChange" onYearChange="onYearChange" onSelectHasDisableDate="onSelectHasDisableDate" />
+  </view>
+</popup>
\ No newline at end of file