Merge branch 'dev' into release/1.0.0

components/fileList/fileList.axml

@@ -12,7 +12,8 @@
       <view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
     </view>
   </view>
-  <view class="btns-pop" a:if="{{fileView.id == logId && (organizer === currentPeople ? true : currentPeople === fileView.creatorId)}}">
+  <!-- && (organizer === currentPeople ? true : currentPeople === fileView.creatorId) -->
+  <view class="btns-pop" a:if="{{fileView.id == logId}}">
     <view class="edit" catchTap="updateFile" data-fileView="{{fileView}}">
           编辑
     </view>

components/relatedApp/relatedApp.js

@@ -26,7 +26,11 @@ create.Component({
   didUnmount() {},
   methods: {
     getData() {
-      getThirdUserPlatForm().then(res => {
+      let data = {
+        platForm: "",
+        ddUserId: getApp().globalData.userid
+      };
+      getThirdUserPlatForm(data).then(res => {
         let relatedAppPlatformList = [];
         res.data.data.forEach(item => {
           relatedAppPlatformList.push(item.platform);

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/appDetails/appDetails.js

@@ -47,12 +47,28 @@ create.Page({
         clearInterval(interval);
       }
       requestNum++;
-      getThirdUserPlatForm().then(res => {
-        let relatedAppPlatformList = [];
-        res.data.data.forEach(item => {
-          if (item.platform === this.data.platform) {
+      let data = {
+        platForm: this.data.platform,
+        ddUserId: getApp().globalData.userid
+      };
+      getThirdUserPlatForm(data).then(res => {
+        console.log(JSON.stringify(res));
+        console.log(res.data.msg === "当前账号已被其他账号绑定！");
+        if (res.data.msg === "当前账号已被其他账号绑定！") {
+          this.setData({
+            isBind: false,
+            bindStatus: "binded"
+          });
+          setTimeout(() => {
+            that.setData({
+              isLoading: false
+            });
+          }, 10000);
+          clearInterval(interval);
+        } else if (res.data.data) {
+          if (res.data.data.platform === this.data.platform) {
             this.setData({
-              name: item.userName,
+              name: res.data.data.userName,
               isBind: true,
               bindStatus: "success"
             });
@@ -65,7 +81,7 @@ create.Page({
             this.$store.data.relatedAppNeedUpdate = true;
             this.update();
           }
-        });
+        }
       });
     }, 1000);
   },

pages/index/index.js

@@ -810,7 +810,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "0.0.12"
+        content: "0.0.13"
       });
       maxClickCount = 5;
     }

pages/meetingDetail/meetingDetail.acss

@@ -529,7 +529,6 @@ input {
 }
 
 .affair-placeholder {
-    border-top: 1px solid rgba(239, 242, 245, 1);
     padding-top: 168rpx;
     text-align: center;
     width: 600rpx;

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

pages/meetingRoomList/meetingRoomList.js

@@ -951,8 +951,8 @@ create.Page({
     endTimeDate.setMinutes(endTimeDate.getMinutes() + 30);
     let data = {
       meetingRoomId: this.data.meetingTime.meetingRoomId,
-      startTime: `${startTime}:00`,
-      endTime: `${endTimeDate.getFullYear()}-${
+      endTime: `${startTime}:00`,
+      startTime: `${endTimeDate.getFullYear()}-${
         endTimeDate.getMonth() + 1 < 10
           ? "0" + (endTimeDate.getMonth() + 1)
           : endTimeDate.getMonth() + 1
@@ -1099,11 +1099,15 @@ create.Page({
       startTime: meetingDate
     };
     getReserveRoomList(data).then(res => {
+      const isExpired =
+        new Date().getTime() >
+        new Date(`${meetingDate.replace(/-/g, "/")} 23:59:59`);
       let modalList = res.data.data[0].timeSlotWithMeetingVOS.map(item => {
         // 判断是否过期
         if (
           item.reserveStatus === "expired" ||
-          item.reserveStatus === "occupied"
+          item.reserveStatus === "occupied" ||
+          isExpired
         ) {
           return {
             ...item,