Merge branch 'dev' into release_beta/1.0.0

api/xFetch.js

@@ -24,11 +24,13 @@ export default function xFetch({ url, method, data, type }) {
                     if (res.data.code == 401) {
                         login();
                     }
-                    alertOnce('请求异常，请重试', rejects);
+                    alertOnce(res.data.msg || '请求异常，请重试', rejects);
                 }
             },
             fail: function (err) {
-                console.log(err)
+                if (err && err.status == 401) {
+                    login();
+                }
                 alertOnce('网络异常，请重试', rejects);
             }
         });

components/taskPanel/taskPanel.acss

@@ -36,7 +36,7 @@
 
 .iconicon_attender {
     position: relative;
-    top: 4rpx;
+    top: 6rpx;
 }
 
 .participator-title {

pages/meetingDetail/meetingDetail.acss

@@ -116,7 +116,6 @@ page {
     position: relative;
     width: 100%;
     padding-bottom: 0;
-    height: 200rpx;
 }
 
 .hideTitle {

pages/meetingDetail/meetingDetail.axml

@@ -202,7 +202,7 @@
     <!-- 动态列表 -->
     <import src="../../template/avater/index.axml"/>
     <import src="../../template/affairBlank/index.axml"/>
-    <scroll-view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate" scroll-y="{{true}}" lower-threshold="{{400}}" onScrollToLower="onScrollToLower">
+    <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}}">
@@ -226,7 +226,7 @@
           </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="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
         <view class="affair-placeholder" a:if="{{affairList.length == 1 && affairList[0].logType == 'create_schedule'}}">
           <template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会，快来上传会议文件吧。'}}"/>
         </view>
@@ -244,7 +244,7 @@
         <!-- 任务修改弹出框 -->
         <task-panel a:if="{{pop.type === 'updateTask'}}" action='update' onDeleteTask="deleteTask"/>
       </popup>
-    </scroll-view>
+    </view>
   </view>
 </block>
 <view class="loading" a:if="{{loading || !getData}}">