From 7e0bc1ef61b0fd26a8c27d4a544e123272b8cc5a Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 8 Jun 2023 16:53:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=AD=98=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppSessionArchive/AppSessionArchive.vue | 2 +- .../AppSessionArchive/components/Detail.vue | 93 +++++++++---------- 2 files changed, 43 insertions(+), 52 deletions(-) diff --git a/project/pidu/app/AppSessionArchive/AppSessionArchive.vue b/project/pidu/app/AppSessionArchive/AppSessionArchive.vue index bfc262b4..b67feb38 100644 --- a/project/pidu/app/AppSessionArchive/AppSessionArchive.vue +++ b/project/pidu/app/AppSessionArchive/AppSessionArchive.vue @@ -26,7 +26,7 @@ export default { }, data() { return { - component: "Detail", + component: "List", params: {}, include: [], }; diff --git a/project/pidu/app/AppSessionArchive/components/Detail.vue b/project/pidu/app/AppSessionArchive/components/Detail.vue index 18c35859..f477f6a2 100644 --- a/project/pidu/app/AppSessionArchive/components/Detail.vue +++ b/project/pidu/app/AppSessionArchive/components/Detail.vue @@ -45,48 +45,46 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="onChange"> - +
-
+

{{item.createTime}}

- + + +

{{item.content}}

+
-
- + +
+
- -
-
-
-

{{item.createTime}}

-
- -
- -

{{item.content}}

-
-
- -
-
- -
- + + + + + +
{{item.userName}}{{item.msgSendTime.substring(0, 16)}}撤回了一条消息
+ + +
@@ -131,12 +129,12 @@ msgType: 0, msgTypeList: [ {name: '全部', value: ''}, - {name: '文本', value: 'text'}, - {name: '图片', value: 'image'}, + {name: '图片/视频', value: 'imagevideo'}, {name: '语音', value: 'voice'}, + {name: '文件', value: 'file'}, ], searchMsg: '', - id: 'LiuYe' + id: '' } }, computed: { @@ -148,7 +146,6 @@ this.id = this.params.id this.getList() } - this.getList() }, methods: { @@ -188,10 +185,11 @@ this.instance.post(`/app/appsessionarchiveinfo/listByUser`, null, { params: { userId: this.id, - type: this.tabIndex, + // type: this.tabIndex, size: 20, current: this.msgCurrent, msgType: this.msgTypeList[this.msgType].value, + // msgType: 'file', toUserId: this.list[this.leftActiveIndex].type == 1 ? '' : this.list[this.leftActiveIndex].toUserId, roomId: this.list[this.leftActiveIndex].type == 1 ? this.list[this.leftActiveIndex].roomId : '', type: this.list[this.leftActiveIndex].type, @@ -201,6 +199,11 @@ } }).then(res => { if (res.code === 0) { + res.data.records.map((item) => { + if(item.msgType == 'file') { + item.files = [{url: item.sdkFileUrl, accessUrl: item.sdkFileUrl, name: item.sdkFileName, fileSizeStr: item.fileSizeStr}] + } + }) this.msgList = res.data.records this.msgTotal = res.data.total || 0 } @@ -233,26 +236,6 @@ this.msgType = index this.getMsgListInit() }, - - onConfirm() { - this.$refs.form.validate((valid) => { - if (valid) { - this.instance.post(`/app/appintegralmerchandiseorder/writeOffOrder`, null, { - params: { - code: this.form.code, - id: this.params.id, - } - }).then(res => { - if (res.code == 0) { - this.isShow = false - this.getInfo(this.params.id) - this.$message.success('核销成功') - } - }) - } - }) - }, - cancel () { this.$emit('change', { type: 'List', @@ -470,6 +453,14 @@ color: #f46; margin-top: 8px; } + .revoke-text { + line-height: 44px; + padding: 0 6px; + border-radius: 4px; + background-color: #EEE; + color: #999; + margin-top: 4px; + } } } .item-left { From 077fc80264a1852acc75562eab53abe9b9b0b8c1 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 8 Jun 2023 17:01:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=AD=98=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppSessionArchive/components/Detail.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/project/pidu/app/AppSessionArchive/components/Detail.vue b/project/pidu/app/AppSessionArchive/components/Detail.vue index f477f6a2..0a58e2e8 100644 --- a/project/pidu/app/AppSessionArchive/components/Detail.vue +++ b/project/pidu/app/AppSessionArchive/components/Detail.vue @@ -55,11 +55,11 @@
-
+

{{item.createTime}}

- - + +
@@ -83,8 +83,8 @@
{{item.userName}}{{item.msgSendTime.substring(0, 16)}}撤回了一条消息
- - + +
@@ -182,10 +182,10 @@ this.getMsgList() }, getMsgList() { - this.instance.post(`/app/appsessionarchiveinfo/listByUser`, null, { + this.instance.post(`/app/appsessionarchiveinfo/list`, null, { params: { userId: this.id, - // type: this.tabIndex, + type: this.tabIndex, size: 20, current: this.msgCurrent, msgType: this.msgTypeList[this.msgType].value, From ad2e5bccab63a93843eb24af6ae0e9cd7ce15323 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 8 Jun 2023 17:17:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=AD=98=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppSessionArchive/components/Detail.vue | 3 +++ .../components/img/user-img.png | Bin 0 -> 3948 bytes 2 files changed, 3 insertions(+) create mode 100644 project/pidu/app/AppSessionArchive/components/img/user-img.png diff --git a/project/pidu/app/AppSessionArchive/components/Detail.vue b/project/pidu/app/AppSessionArchive/components/Detail.vue index 0a58e2e8..e3669681 100644 --- a/project/pidu/app/AppSessionArchive/components/Detail.vue +++ b/project/pidu/app/AppSessionArchive/components/Detail.vue @@ -60,6 +60,7 @@
+
@@ -214,6 +215,7 @@ }, typeClick(index) { this.tabIndex = index + this.msgType = 0 this.getListInit() }, onChange() { @@ -230,6 +232,7 @@ }, leftClick(index) { this.leftActiveIndex = index + this.msgType = 0 this.getMsgListInit() }, msgTypeClick(index) { diff --git a/project/pidu/app/AppSessionArchive/components/img/user-img.png b/project/pidu/app/AppSessionArchive/components/img/user-img.png new file mode 100644 index 0000000000000000000000000000000000000000..06bdb18f6b840a4fec388fef0dc4063c9a325b07 GIT binary patch literal 3948 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