merge

pages/appDetails/appDetails.axml

@@ -46,11 +46,17 @@
           关联成功
         </view>
     </view>
-    <view a:else>
+    <view a:elif="{{bindStatus==='fail'}}">
         <image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/>
         <view>
           关联失败
         </view>
     </view>
+    <view a:else>
+        <image class="fix-img-width-fix" mode="scaleToFill" src="./../../assests/bindFail.png"/>
+        <view>
+          账户已关联
+        </view>
+    </view>
 </view>
 <selectpopup showSelectPopup="{{showSelectPopup}}" selectPopupList="{{selectPopupList}}" onSelectPopup="onSelectPopup" onSelectPopupCancel="onSelectPopupCancel"></selectpopup>
\ No newline at end of file

pages/meetingDetail/meetingDetail.axml

@@ -224,7 +224,7 @@
     <view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
       <view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
       <block a:if="{{!affairLoading}}">
-        <block a:for="{{affairList}}" key="{{item.id}}">
+        <block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.id}}">
           <view a:if="{{item.category == '3' && item.taskViewList && item.taskViewList.length > 0}}" class='compose-column'>
             <view class="avater task-avater">
               <text class="iconfont iconicon_task1"></text>
@@ -245,10 +245,10 @@
           </view>
           <view a:if="{{item.content && ((item.category == 1 || item.taskViewList && item.taskViewList.length > 0) || ( item.fileView && item.fileView.fileInfos && item.fileView.fileInfos.length > 0 ))}}" class='simple-column'>{{item.content}} {{item.createTime}}</view>
         </block>
-        <view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
-        <view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
+        <view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
           <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
         </view>
+        <view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
       </block>
       <view a:else></view>
       <popup a:if="{{popupShow}}" title="{{popupTitle}}" show="{{popupShow}}" mask="true" onClose="closePopup">

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