From d14e7b3ab52bc52166a01d7ce03ff762322b83ad Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 17 Jul 2023 15:20:36 +0800 Subject: [PATCH] =?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 --- .../pidu/AppConversation/AppConversation.vue | 508 +++++++++--------- .../AppConversation/conversationDetail.vue | 15 +- .../pidu/AppConversation/img/dept-img.png | Bin 0 -> 2224 bytes src/project/pidu/AppConversation/list.vue | 285 ++++++++++ 4 files changed, 561 insertions(+), 247 deletions(-) create mode 100644 src/project/pidu/AppConversation/img/dept-img.png create mode 100644 src/project/pidu/AppConversation/list.vue diff --git a/src/project/pidu/AppConversation/AppConversation.vue b/src/project/pidu/AppConversation/AppConversation.vue index 522691b1..fa01e4cb 100644 --- a/src/project/pidu/AppConversation/AppConversation.vue +++ b/src/project/pidu/AppConversation/AppConversation.vue @@ -1,283 +1,309 @@ \ No newline at end of file + diff --git a/src/project/pidu/AppConversation/conversationDetail.vue b/src/project/pidu/AppConversation/conversationDetail.vue index 96f8834e..2b834aea 100644 --- a/src/project/pidu/AppConversation/conversationDetail.vue +++ b/src/project/pidu/AppConversation/conversationDetail.vue @@ -20,12 +20,12 @@
-
+
- - + +

{{item.userName}}{{item.msgSendTime}}

@@ -111,7 +111,7 @@
- +
@@ -158,7 +158,8 @@ export default { dateList: [], scrollTop: 0, scrollHeight: '', - preveHeight: '' + preveHeight: '', + id: '' }; }, computed: { @@ -171,6 +172,7 @@ export default { this.roomId = option.roomId } this.type = option.type + this.id = option.id this.getList() console.log() this.scrollHeight = uni.getSystemInfoSync().windowHeight - 150 @@ -234,12 +236,13 @@ export default { this.preveHeight = res.height }).exec(); } - this.$http.post(`/app/appsessionarchiveinfo/listByUser`, null, { + this.$http.post(`/app/appsessionarchiveinfo/list`, null, { params: { current: this.current, size: 10, msgType: this.tabList[this.currentTabs].value, // msgType: 'link', + userId: this.id, toUserId: this.toUserId, roomId: this.roomId, type: this.type, diff --git a/src/project/pidu/AppConversation/img/dept-img.png b/src/project/pidu/AppConversation/img/dept-img.png new file mode 100644 index 0000000000000000000000000000000000000000..7076628f3688aa60a1e59f42d380441cbdd8c566 GIT binary patch literal 2224 zcmV;h2v7HkP)Px-YDq*vRCr$PolR^cM-_nItE%q#u^o?-*s<5vE}(=%IBBt$F_A_$NS zN!AO9z{J@ne{iN~Jt z%yid~$-3ucd8*!2ef_Fly;rZQ5&j<^A_PS0`Y9q@-}twmE6pfva-Nw|9vR_@0F|(9 z(e_cGMZtAQkj({Tt;kvHlSXMnS=XVG?XX>~>5cWrgI@B_{cj9?#WBcySL7LRhJ7N@2#Ct5lk!p#SwmWrA9%(DX1dv2czwQ6 zE~D)d~QbBFwa^R1Cxfx$YZT@^*Jq*fwFdL;kEo$yH=fAe6;G*$ln4zDwh@v^6&Tdfbx?cDr0hND0n3E=uGcXD#((WRy@yh*XJqjdJ7 zvOJ^F((cL$kz7o$>vh4t)~%aS*@$ z!pDI`I2H-=8_m`-=~n!5CKK*|5yEg54Ls zK40q#y5AS&%D?=(;qrSL;ijH8YoO==QSAp^&wk zU!L0OrEEO`mMeSHJ7I3=vTEL0P&|~Ey!KAHhu?e-AiHS`VQWQ0;Aa4jQAXh~@Pj=s zzj@Z(I|uNY*Q#?ui+MrTxQ-eRJ9$r9IgWO-w`Y~z|H+q12dCTD1(4T#yVt5$DTS-X zPfMKari}u^3bK=|@!T&AY`FMV>A$DfhFt)^{mX+=DC9y~!=XXdbD`Ct8ZKa)Q-}fS zsY$o^?CN>e?EUbobJb2DBL0Jj@VQ?#S1{0pqyXcM9V^90g{6lrPailKB3ZCP;$KW# z*QJ{d$NOuW8{c~stcvRNB}SLe)vh9 zLEa9R0DZu?buS;z=C9WPXPeO z)#Q*3=KWy>h<}t8*8>wAN}&pq=zFuGoObadfNVVOK5_VgG;>fq$qG;XfRI)JfT2XG z8AEncn#7!T_kCri}cXWOHX4x0=WK*+PszN zA})>qM(bAAL<0PWvT%beZ3CgFRWbmcAWLMLB1GkCT^kK!g9jU5o7s;5e)CpiSwgxE zB8LFENs;yQ|M<^HVKRF9?gea8ea4ZMyPy9OBh#$iF<#kA|cF>9bJ zfOiDKXIyGvydK2w+-fX0R9H+i|3#+rWFeh$8Iu;++4{#`4uErj+~1=18n|}r{#6&& z=`sQ&ZQA(UYX{fJ3NP)Wzia@R7YZBV_1o1CTEt;}*1nuCBS1l9@Yz=nA5W`&mvIh^ znPmV|YEL$VQvi&HaAri36O4?=ja!YYZ55_=vM-wv;r`~d*UlEw2^Fxjkj`AWWCS~| z+$9MnICbT^f(a8I&Pt{p@75ZdFWd=dapE|Y<|i?rnik&aaF$aI>L&!=`cPA)=Ee+vk{7jKX! zY^SSgadyOS0qpg(@VHTZlZ(=(x5cJigPcM|p8|pfhR7G5xS}zt9JEm$OOqu2-nPtk zn#585?cV8ar&^UZ!7`p7Fi;JVKfd$jz5Yldqbba55UF#%FHErHj=D_o6^@g6l0FC< zr5ppL%{Lq>#g`kIC7GXpR6{43bJgsa!+C%s9dn3=a(2+Bi{eNJZQ`2QQLkeXY&b?f z>UFGz* zWS36#9}hzTjEqWl?MY9HLj&a6*~L5O8IA;yt7lg~bweB(VC?Q?myew+w399uvg_|s z0*t|D7ceGO!Bh3JD?lAUWD(gVv<^UK*C0E97%jZBi@4p8%&vk@!!dgqK^l6e>h^sd y2Kc$s-LBVR1VLLBE%tmJMnjPG{oF*o4E(7_LYAlN+s0000 +
+ + + + + + +
+
+ + +
+
+

{{currentTabs == 1 ? item.toUserName : item.roomName}}

+
+
{{item.userType == 1 ? '内部' : '外部'}}
+
+
+
+ +
+ + + + + \ No newline at end of file