|
|
@@ -221,10 +221,11 @@
|
|
|
<view class="other" v-if="row.msg.user_info.uid != my_data.id">
|
|
|
<!-- 左-头像 -->
|
|
|
<view class="left">
|
|
|
+
|
|
|
<image @longtap="showAction(row)" @tap="goDetails(row.msg.user_info.uid,row)"
|
|
|
:src="(row.msg.is_niming == 1)? '/static/theme/default/my/niming.png' : (staticPhoto + row.msg.user_info.face)"
|
|
|
:lazy-load="true" style="border-radius: 10px;" :data-id="index"
|
|
|
- @error="imageError" class="u-logo"/>
|
|
|
+ @error="imageError" class="u-logo" />
|
|
|
<view class="action" v-if="row.showAction">
|
|
|
<view class="action-item" @click="addFriendChat(row)">
|
|
|
@TA
|
|
|
@@ -247,9 +248,10 @@
|
|
|
<!-- 右-用户名称-时间-消息 -->
|
|
|
<view class="right"
|
|
|
@longtap="msgAction(row.msg.id +'',row.msg.user_info.uid + '',row.msg.content,row.msg.type)">
|
|
|
- <!-- <view class="username">
|
|
|
- <view class="name">{{row.msg.user_info.username}}</view> <view class="time">{{row.msg.time}}</view>
|
|
|
- </view> -->
|
|
|
+ <view class="username">
|
|
|
+ <view class="name">{{row.msg.user_info.name}}</view>
|
|
|
+ <!-- <view class="time">{{row.msg.time}}</view> -->
|
|
|
+ </view>
|
|
|
<!-- 文字消息 -->
|
|
|
<view v-if="row.msg.type==0 && !isImage(row.msg.content.text)" class="bubble">
|
|
|
<rich-text :nodes="row.msg.content.text ? getHtml(row.msg.content.text) : ' '"
|
|
|
@@ -381,7 +383,7 @@
|
|
|
mode="heightFix">
|
|
|
<view class="tool_text">语音通话</view>
|
|
|
</view> -->
|
|
|
-
|
|
|
+
|
|
|
<view class="list-box" @tap="chooseImage">
|
|
|
<image class="fun-icon" src="../../static/theme/default/Image.png" mode="heightFix">
|
|
|
</image>
|
|
|
@@ -395,7 +397,7 @@
|
|
|
<view class="tool_text">拍摄</view>
|
|
|
</view>
|
|
|
|
|
|
-<!-- <view class="list-box" @tap="video">
|
|
|
+ <!-- <view class="list-box" @tap="video">
|
|
|
<image class="fun-icon" src="../../static/theme/default/message/video.png"
|
|
|
mode="heightFix">
|
|
|
</image>
|
|
|
@@ -422,16 +424,16 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="list" style="margin-top: 8upx;">
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<view class="list-box" @tap="chooseChuo">
|
|
|
<image class="fun-icon" src="../../static/theme/default/tool_icon.png" mode="heightFix">
|
|
|
</image>
|
|
|
<view class="tool_text">戳一戳</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
<view class="list-box" @tap="sendPos">
|
|
|
<image class="fun-icon" src="../../static/theme/default/location_icon.png"
|
|
|
mode="heightFix">
|
|
|
@@ -439,7 +441,7 @@
|
|
|
<view class="tool_text2">位置</view>
|
|
|
</view>
|
|
|
|
|
|
-<!-- <view class="list-box" @tap="videoCall(1)" v-if="msgList.type == 0">
|
|
|
+ <!-- <view class="list-box" @tap="videoCall(1)" v-if="msgList.type == 0">
|
|
|
<image class="fun-icon" src="../../static/theme/default/message/concat.png"
|
|
|
mode="heightFix">
|
|
|
<view class="tool_text">视频通话</view>
|
|
|
@@ -481,7 +483,7 @@
|
|
|
</swiper-item>
|
|
|
<swiper-item>
|
|
|
<view class="list">
|
|
|
-
|
|
|
+
|
|
|
<view class="list-box" @tap="chooseFile">
|
|
|
<image class="fun-icon" src="../../static/theme/default/file_icon.png" mode="heightFix">
|
|
|
</image>
|
|
|
@@ -1109,7 +1111,7 @@
|
|
|
},
|
|
|
is_action_data: 1,
|
|
|
});
|
|
|
- console.log(chat_data,'chat_data+++++++');
|
|
|
+ console.log(chat_data, 'chat_data+++++++');
|
|
|
if (chat_data && chat_data.list.length) {
|
|
|
_this.scrollAnimation = false;
|
|
|
// TODO 图片列表
|
|
|
@@ -1142,11 +1144,11 @@
|
|
|
_this.getGroupSteate();
|
|
|
}
|
|
|
}
|
|
|
- console.log('添加当前的会话',this.list_id);
|
|
|
+ console.log('添加当前的会话', this.list_id);
|
|
|
/** 添加当前的会话list_id */
|
|
|
_data.localData("message_list_id", this.list_id);
|
|
|
- console.log('_data',_data);
|
|
|
-console.log('监听会话数据变化的会话');
|
|
|
+ console.log('_data', _data);
|
|
|
+ console.log('监听会话数据变化的会话');
|
|
|
/** 监听会话数据变化 */
|
|
|
uni.$on("data_chat_data_unshift", function(data) {
|
|
|
console.log('会话数据有变化');
|
|
|
@@ -1601,7 +1603,7 @@ console.log('监听会话数据变化的会话');
|
|
|
success_action: true,
|
|
|
success(res) {
|
|
|
if (res.err === 0) {
|
|
|
- console.log("通话数据",res);
|
|
|
+ console.log("通话数据", res);
|
|
|
//图片转化
|
|
|
res.data.myavatar = _this.staticPhoto + res.data.myavatar;
|
|
|
res.data.avatar = _this.staticPhoto + res.data.avatar;
|
|
|
@@ -1620,8 +1622,8 @@ console.log('监听会话数据变化的会话');
|
|
|
user_id = item;
|
|
|
}
|
|
|
})
|
|
|
- console.log("开始打电话",data);
|
|
|
- console.log(uni.$TUICalling,'uni.$TUICalling');
|
|
|
+ console.log("开始打电话", data);
|
|
|
+ console.log(uni.$TUICalling, 'uni.$TUICalling');
|
|
|
uni.$TUICalling.call({
|
|
|
type: data.callType,
|
|
|
userID: user_id,
|
|
|
@@ -2818,14 +2820,17 @@ console.log('监听会话数据变化的会话');
|
|
|
|
|
|
<style lang="scss">
|
|
|
@import "@/static/css/chat/style.scss";
|
|
|
+
|
|
|
.other {
|
|
|
.left {
|
|
|
position: relative;
|
|
|
+
|
|
|
.u-logo {
|
|
|
width: 90rpx !important;
|
|
|
height: 90rpx !important;
|
|
|
flex-shrink: 0;
|
|
|
}
|
|
|
+
|
|
|
.action {
|
|
|
width: 160rpx;
|
|
|
background: #fff;
|
|
|
@@ -3072,4 +3077,4 @@ console.log('监听会话数据变化的会话');
|
|
|
width: 40rpx;
|
|
|
height: 40rpx;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
