zhaoxiaohai 3 anni fa
parent
commit
daf361306a
2 ha cambiato i file con 59 aggiunte e 5 eliminazioni
  1. 1 1
      pages/chatRoom/dialogbox.js
  2. 58 4
      pages/chatRoom/history.js

+ 1 - 1
pages/chatRoom/dialogbox.js

@@ -485,7 +485,7 @@ Page({
             })
         } else if (name == '历史') {
             wx.navigateTo({
-                url: './history?id=' + that.data.timdialogid,
+                url: './history?id=' + that.data.timdialogid + '&type=' + that.data.fimdialogtype,
             })
         }
     },

+ 58 - 4
pages/chatRoom/history.js

@@ -13,7 +13,8 @@ Page({
     onLoad: function (options) {
         this.setData({
             userid: wx.getStorageSync('userData').userid,
-            timdialogid: options.id
+            timdialogid: options.id,
+            pageType: options.type
         })
         this.query_imdialogMessage();
     },
@@ -35,8 +36,31 @@ Page({
                     "enddate": enddate
                 }
             }
-        }).then(res => {
+        }).then(async res => {
+            console.log("聊天记录", res)
+            if (res.msg != '成功') return wx.showToast({
+                title: res.data,
+                icon: "none"
+            });
+            let list = res.data;
+            list = list.reverse();
             if (res.pageNumber != 1) {
+                if (this.data.pageType == '话题') list = await this.querySubject(list);
+                list = list.concat(this.data.socketMsgQueue);
+                this.setData({
+                    socketMsgQueue: list,
+                    toView: `item${res.data.length - 1}`,
+                    triggered: false
+                })
+            } else {
+                if (this.data.pageType == '话题') list = await this.querySubject(list);
+                this.setData({
+                    socketMsgQueue: list,
+                    toView: `item${res.data.length - 1}`,
+                    pageTotal: res.pageTotal
+                })
+            }
+            /* if (res.pageNumber != 1) {
                 let list = res.data;
                 list = list.reverse();
                 list = list.concat(this.data.socketMsgQueue);
@@ -51,10 +75,40 @@ Page({
                     toView: `item${res.data.length - 1}`,
                     pageTotal: res.pageTotal
                 })
-            }
+            } */
         })
     },
-
+    async querySubject(array) {
+        console.log("列表", array)
+        let list = [];
+        for (let index = 0; index < array.length; index++) {
+            await _Http.basic({
+                "accesstoken": wx.getStorageSync('userData').token,
+                "classname": "system.im.imdialog.imdialog",
+                "method": "querySubject",
+                "content": {
+                    "timsubjectid": array[index].message.data.ownerid
+                }
+            }, false).then(res => {
+                if (res.data.length != 0 && res.data[0].imsubjectcontent.length != 0) {
+                    res.data[0].sendfrom = array[index].message.sendfrom;
+                    res.data[0].timdialogid = array[index].message.timdialogid;
+                    if (res.data[0].closedate != null) {
+                        let time = res.data[0].closedate.split('.');
+                        res.data[0].closedate = time[0];
+                    } else {
+                        let time = res.data[0].createdate.split('.');
+                        res.data[0].createdate = time[0];
+                    }
+                    let obj = {
+                        message: res.data[0]
+                    }
+                    list.push(obj);
+                }
+            })
+        }
+        return list;
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */