|
@@ -165,7 +165,7 @@ Page({
|
165
|
165
|
console.log(con, 1);
|
166
|
166
|
|
167
|
167
|
// console.log(ImgRes.tempFilePaths[0], 1222222);
|
168
|
|
- that.SocketSend({ type: ImageType, content: con });
|
|
168
|
+ that.SocketSend({ type: ImageType, content: con.img_name });
|
169
|
169
|
|
170
|
170
|
// that.msgManager.sendMsg({ type: IMOperator.ImageType, content: con })
|
171
|
171
|
|
|
@@ -292,11 +292,11 @@ Page({
|
292
|
292
|
// 接收消息
|
293
|
293
|
onSocketMessageCallback: function (e) {
|
294
|
294
|
var that = this;
|
295
|
|
- let data = JSON.parse(e);
|
|
295
|
+ let data = JSON.parse(e);
|
296
|
296
|
|
297
|
297
|
// console.log(data,'接受消息成功');
|
298
|
298
|
|
299
|
|
- var arrData = data.data;
|
|
299
|
+ var arrData = data.data.data;
|
300
|
300
|
|
301
|
301
|
switch (data.type) {
|
302
|
302
|
// 接收历史消息
|
|
@@ -311,7 +311,10 @@ Page({
|
311
|
311
|
} else {
|
312
|
312
|
arrData[index].isMy = false; //他人
|
313
|
313
|
}
|
314
|
|
-
|
|
314
|
+
|
|
315
|
+ if (arrData[index].type == 2){
|
|
316
|
+ arrData[index].content = data.data.url + arrData[index].content + data.data.stylename;
|
|
317
|
+ }
|
315
|
318
|
|
316
|
319
|
that.ArrMsg.push(arrData[index]);
|
317
|
320
|
}
|