Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0

pages/createTask/createTask.js

@@ -76,7 +76,9 @@ create.Page({
           this.store.data.affairList.unshift(addData);
           this.store.data.tasks.unshift(addData);
           this.store.data.isNeedReloadIndexList = true;
-          this.store.data.separateIndex += 1;
+          if (this.store.data.separateIndex !== -1) {
+            this.store.data.separateIndex += 1;
+          }
           this.update();
           dd.navigateBack();
         }

pages/index/index.axml

@@ -26,7 +26,7 @@
                       <text>{{actionLog[dynamicItem.commentCategory]}}</text>
                       <text>{{dynamicItem.createTime}}</text>
                     </view>
-                    <view class="desc" a:if="{{dynamicItem.remark}}">{{dynamicItem.remark}}</view>
+                    <view class="desc" data-groupId="{{item.meetingId}}" catchTap="nextDetail" data-item="{{item}}" a:if="{{dynamicItem.remark}}">{{dynamicItem.remark}}</view>
                     <file-list a:if="{{dynamicItem.fileDetailList}}" fileInfos="{{dynamicItem.fileDetailList}}" isCanEdit="{{false}}"/>
                     <task-list a:if="{{dynamicItem.meetingTaskSimpleViewModel}}" onChangeTaskStatusOnList="onChangeTaskStatusOnList" taskView="{{dynamicItem.meetingTaskSimpleViewModel}}" commentId="{{dynamicItem.commentId}}" meetingId="{{item.meetingId}}" isCanEdit="{{false}}"/>
                     <notes a:if="{{dynamicItem.notes}}" meetingNotes="{{dynamicItem.notes}}"/>

pages/meetingDetail/meetingDetail.js

@@ -1076,7 +1076,7 @@ create.Page({
               changeData.updateTime = getCreateShowTime(new Date());
               this.store.data.affairList.splice(index, 1);
               this.store.data.affairList.unshift(changeData);
-              if (index > this.store.data.separateIndex) {
+              if (index > this.store.data.separateIndex && this.store.data.separateIndex !== -1) {
                 this.store.data.separateIndex += 1;
                 this.store.data.separateIndex = fixSeperateIndex(this.store.data.separateIndex, this.store.data.affairList)
               }
@@ -1262,7 +1262,7 @@ create.Page({
             changeData.updateTime = getCreateShowTime(new Date());
             this.store.data.affairList.splice(index, 1);
             this.store.data.affairList.unshift(changeData);
-            if (index > this.store.data.separateIndex) {
+            if (index > this.store.data.separateIndex && this.store.data.separateIndex !== -1) {
               this.store.data.separateIndex += 1;
               this.store.data.separateIndex = fixSeperateIndex(this.store.data.separateIndex, this.store.data.affairList)
             }

pages/meetingDetail/store.js

@@ -39,7 +39,8 @@ class Store {
             this.data.affairList.splice(index, 1);
             this.data.affairList.unshift(changeData);
 
-            if (index > this.data.separateIndex) {
+
+            if (index > this.data.separateIndex && this.data.separateIndex !== -1) {
                 this.data.separateIndex += 1;
                 this.data.separateIndex = fixSeperateIndex(this.data.separateIndex, this.data.affairList)
             }

pages/uploadFile/uploadFile.js

@@ -92,7 +92,6 @@ create.Page({
       this.store.data.fileInfos = []
       this.store.data.description = ''
       this.update();
-      //this.store.data.isNeedReloadList = true;
 
       if (res.data.data) {
         const addData = res.data.data[0].commentListDataModelList[0];
@@ -100,7 +99,9 @@ create.Page({
         this.store.data.affairList.unshift(addData);
         addData.fileDetailList.forEach(it => this.store.data.files.unshift(it));
         this.store.data.isNeedReloadIndexList = true;
-        this.store.data.separateIndex += 1;
+        if (this.store.data.separateIndex !== -1) {
+          this.store.data.separateIndex += 1;
+        }
         this.update();
         dd.navigateBack();
       }