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

pages/index/index.axml

@@ -28,7 +28,7 @@
                     <view class="dynamicTime" data-groupId="{{item.meetingId}}" catchTap="nextDetail" data-item="{{item}}">
                       <text>{{dynamicItem.creator && dynamicItem.creator.name}}</text>
                       <text>{{actionLog[dynamicItem.commentCategory]}}</text>
-                      <text>{{dynamicItem.createTime}}</text>
+                      <text>{{dynamicItem.updateTime}}</text>
                     </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}}"/>

pages/index/index.js

@@ -103,30 +103,7 @@ create.Page({
       }
     }
 
-    this.connect_start();
-
-    // 注意： 回调方法的注册在整个小程序启动阶段只要做一次，调多次会有多次回调
-    dd.onSocketOpen((res) => {
-      console.log('连接已打开！');
-
-      dd.sendSocketMessage({
-        data: 'heartbeat', // 需要发送的内容
-        success: (res) => {
-          console.log('数据发送！' + 'heartbeat');
-        },
-      });
-
-    });
 
-    dd.onSocketError(function (res) {
-      console.log('WebSocket 连接打开失败，请检查！' + res);
-    });
-
-    // 注意： 回调方法的注册在整个小程序启动阶段只要做一次，调多次会有多次回调
-    dd.onSocketMessage((res) => {
-      console.log(res)
-      this.onSocketMessageCallback(res.data)
-    });
     //webSocket.connectSocket();
     //webSocket.onSocketMessageCallback = this.onSocketMessageCallback.bind(this);
   },
@@ -174,6 +151,31 @@ create.Page({
     }
     this.update();
 
+    this.connect_start();
+
+    // 注意： 回调方法的注册在整个小程序启动阶段只要做一次，调多次会有多次回调
+    dd.onSocketOpen((res) => {
+      console.log('连接已打开！');
+
+      dd.sendSocketMessage({
+        data: 'heartbeat', // 需要发送的内容
+        success: (res) => {
+          console.log('数据发送！' + 'heartbeat');
+        },
+      });
+
+    });
+
+    dd.onSocketError(function (res) {
+      console.log('WebSocket 连接打开失败，请检查！' + res);
+    });
+
+    // 注意： 回调方法的注册在整个小程序启动阶段只要做一次，调多次会有多次回调
+    dd.onSocketMessage((res) => {
+      console.log(res)
+      this.onSocketMessageCallback(res.data)
+    });
+
   },
   connect_start() {
     dd.connectSocket({
@@ -284,12 +286,13 @@ create.Page({
     });
   },
   onHide() {
-    dd.closeSocket();
 
     clearInterval(this.timer);
     this.timer = null;
   },
   onUload() {
+    dd.closeSocket();
+
   },
   refresh() {
     this.isNeverShowSchedulePage = true;
@@ -309,8 +312,8 @@ create.Page({
         const dynamicList = res.data.data.map((item, index) => {
           for (let i = 0; i < item.commentListDataModelList.length; i++) {
             let itemData = item.commentListDataModelList[i];
-            if (itemData.createTime) {
-              itemData.createTime = getCreateShowTime(itemData.createTime);
+            if (itemData.updateTime) {
+              itemData.updateTime = getCreateShowTime(itemData.updateTime);
             }
           }
           return item;