猝死的边缘疯狂试探

yangzhi
1 parent e50342dd
Showing 254 changed files with 5261 additions and 2595 deletions
uniapp-wuduhuajiao/App.vue
uniapp-wuduhuajiao/apis/modules/message.js
uniapp-wuduhuajiao/common/config/config.js
uniapp-wuduhuajiao/pages/chat/chat.vue
uniapp-wuduhuajiao/pages/chat/emoji/100.gif
uniapp-wuduhuajiao/pages/chat/emoji/101.gif
uniapp-wuduhuajiao/pages/chat/emoji/102.gif
uniapp-wuduhuajiao/pages/chat/emoji/103.gif
uniapp-wuduhuajiao/pages/chat/emoji/104.gif
uniapp-wuduhuajiao/pages/chat/emoji/105.gif
uniapp-wuduhuajiao/pages/chat/emoji/106.gif
uniapp-wuduhuajiao/pages/chat/emoji/107.gif
uniapp-wuduhuajiao/pages/chat/emoji/108.gif
uniapp-wuduhuajiao/pages/chat/emoji/109.gif
uniapp-wuduhuajiao/pages/chat/emoji/110.gif
uniapp-wuduhuajiao/pages/chat/emoji/111.gif
uniapp-wuduhuajiao/pages/chat/emoji/112.gif
uniapp-wuduhuajiao/pages/chat/emoji/113.gif
uniapp-wuduhuajiao/pages/chat/emoji/114.gif
uniapp-wuduhuajiao/pages/chat/emoji/115.gif
@@ -20,6 +20,7 @@
 	/*#endif*/
 	import config from '@/common/config/config.js'
 	import service from '@/service/service.js'
+	import API from '@/apis/index.js'
 	export default {
 		onLaunch() {
 			// 检测客户端更新
@@ -70,6 +71,13 @@
 		methods: {
 			handleOnMessage(msg) {
 				let user = this.$store.state.user;
+				if(msg.method == 'initMessage'){
+					// this.setTabBarBadge(msg.unreadMessageCount);
+				}
+				if(msg.messageType == 'messageRead' || msg.messageType == 'text'){
+					getApp().globalData.updateUnReadMessageCount();
+				}
+				
 				if (msg.messageType == 'joinRoom' && msg.intToUserId == user.id && user.user_type.length) {
 					console.log('joinRoom', msg);
 					uni.showModal({
@@ -160,18 +168,34 @@
 				});
 				uni.$on('closeSocket', () => {
 					this.globalData.socketTask.close();
-				})
+				});
 				uni.$on('openSocket', () => {
 					this.globalData.socketTask.onMessage((msg) => {
 						console.log('openSocket.onMessage', msg);
-
 					});
-				})
+				});
+				this.globalData.updateUnReadMessageCount();
 			},
 		},
 		globalData: {
 			typeNum: 1,
-			socketTask: {}
+			socketTask: {},
+			updateUnReadMessageCount(){
+				API.message.getUserUnReadMessageCount().then(res=>{
+					console.log('getUserUnReadMessageCount',res);
+					let badgeNum = res.data;
+					if(badgeNum>0){
+						uni.setTabBarBadge({
+							index: 1,
+							text: badgeNum > 99 ? '99+' : badgeNum.toString()
+						});
+					}else{
+						uni.removeTabBarBadge({
+							index: 1,
+						});
+					}
+				})
+			}
 		}
 	};
 </script>
@@ -28,6 +28,10 @@ export default {
 	getMessageList(sendUserId,receviveUserId){
 		return request.get(`/message/getMessageList/${sendUserId}/${receviveUserId}`)
 	},
+	//未读消息条数
+	getUserUnReadMessageCount(){
+		return request.get(`/message/userUnReadMessageCount`);
+	},
  
  
 }
 \ No newline at end of file
@@ -12,6 +12,7 @@
  * @ 相关文档 https://doc.fastadmin.net/wanlshop/265.html
  */
 export default {  
+	baseurl_chaoge:'https://huajiao.t1j2.com',
 	appurl_chaoge: 'https://huajiao.t1j2.com/api',
 	socketurl: 'wss://huajiao.t1j2.com/api/message/websocket', //如果是ws:// 地址为ws://你服务器IP:7272 如 ws://123.4.56.78:7272，使用wss 后面不需要添加 :7272 端口
 	cdnurl: 'http://app.xn--43vp3ce98aj8m.com',
@@ -6,25 +6,34 @@
 			<view class="content-box-loading" v-if="!loading">
 				<u-loading mode="flower"></u-loading>
 			</view>
+			<view class="invite-btn" @click="handleInviteServieUser">
+				邀请客服参与
+			</view>
 			<view class="message" v-for="(item, index) in messageList" :key="index" :id="`msg-${item.id}`">
 				<view class="message-item " :class="item.isItMe ? 'right' : 'left'">
 					<image class="img" :src="item.fromUserHeadImg">
 					</image>
 					<text class="username">{{item.roleName}}</text>
-					<text class="read-status" :style="{color:item.state?'#999':'#333'}" v-if="item.userId == myMd5Id">{{ item.state?'已读':'未读' }}</text>
+					<text class="read-status" :style="{color:item.state?'#999':'#333'}"
+						v-if="item.userId == myMd5Id">{{ item.state?'已读':'未读' }}</text>
 					<!-- contentType = 1 文本 -->
-					<view class="content" v-if="item.contentType == 'text'">{{ item.content }}</view>
+					<view class="content" v-if="item.contentType == 'text'">
+						<block v-for="(msg,index) in item.content">
+							<text v-if="msg.type == 'text'">{{ msg.content }}</text>
+							<image v-if="msg.type == 'emjio'" :src="msg.content" style="width:50rpx;height:50rpx"></image>
+						</block>
+					</view>
 					<!-- contentType = 2 语音 -->
 					<view class="content contentType2" :class="[{ 'content-type-right': item.isItMe }]"
-						v-if="item.contentType == 2" @tap="handleAudio(item)" hover-class="contentType2-hover-class"
-						:style="{width:`${130+(item.contentDuration*2)}rpx`}">
+						v-if="item.contentType == 'voice'" @tap="handleAudio(item)" hover-class="contentType2-hover-class"
+						:style="{width:`${130+(item.length*2)}rpx`}">
 						<view class="voice_icon" :class="[
 									{ voice_icon_right: item.isItMe },
 									{ voice_icon_left: !item.isItMe },
 									{ voice_icon_right_an: item.anmitionPlay && item.isItMe },
 									{ voice_icon_left_an: item.anmitionPlay && !item.isItMe }
 								]"></view>
-						<view class="">{{ item.contentDuration }}''</view>
+						<view class="">{{ item.content.length }}''</view>
 					</view>
 					<!-- contentType = 3 图片 -->
 					<view class="content contentType3" v-if="item.contentType == 3" @tap="viewImg([item.content])">
@@ -43,6 +52,8 @@
 				<image v-if="chatType === 'keyboard'" class="icon_img" :src="require('@/static/keyboard.png')"
 					@click="switchChatType('voice')"></image>
 				<!-- #endif -->
+				<image  class="icon_img" :src="require('@/static/face.png')"
+					@click="switchFun('emj')"></image>
 				<view class="input-box-flex-grow">
 					<input v-if="chatType === 'voice'" type="text" class="content" id="input" v-model="formData.content"
 						:hold-keyboard="true" :confirm-type="'send'" :confirm-hold="true"
@@ -54,15 +65,11 @@
 						{{ voiceTitle }}
 					</view>
 				</view>
-
 				<!-- 功能性按钮 -->
-				<image class=" icon_btn_add" :src="require('@/static/add.png')" @tap="switchFun"></image>
+				<!-- <image class=" icon_btn_add" :src="require('@/static/add.png')" @tap="switchFun"></image> -->
  
-				<!-- #ifdef H5 -->
-				<button class="btn" type="primary" size="mini" @touchend.prevent="sendMsg(null)">发送</button>
-				<!-- #endif -->
+				<button class="btn" type="primary" size="mini" @touchend.prevent="sendMsg(null)" v-if="showEmoji">发送</button>
 			</view>
-
 			<view class="fun-box" :class="{'show-fun-box':showFunBtn}">
 				<u-grid :col="4" hover-class="contentType2-hover-class" :border="false" @click="clickGrid">
 					<u-grid-item v-for="(item, index) in funList" :index="index" :key="index" bg-color="#eaeaea">
@@ -71,6 +78,15 @@
 					</u-grid-item>
 				</u-grid>
 			</view>
+			<view class="popup-layer u-border-top"  @touchmove.stop.prevent="discard" v-show="showEmoji">
+				<swiper class="emoji-swiper" indicator-dots="true" duration="150" >
+					<swiper-item v-for="(page,pid) in emojiTree" :key="pid">
+						<view v-for="(em,eid) in page" :key="eid" @click="addEmoji(em)" class="emoji-item">
+							<image mode="widthFix" :src="getEmojiUrl(em.url)" class="emoji-item-img"></image>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
  
 		</view>
  
@@ -94,9 +110,12 @@
 	import {
 		mapState
 	} from 'vuex';
+	import emojiMixin from '@/pages/chat/emojiMixin.js'
 	import service from '@/service/service.js'
+	import config from '@/common/config/config.js';
 	let socketTask = getApp().globalData.socketTask;
 	export default {
+		mixins:[emojiMixin],
 		data() {
 			return {
 				intId: 0,
@@ -175,6 +194,19 @@
 			...mapState(['user', 'statistics', 'common']),
 		},
 		methods: {
+			handleInviteServieUser(){
+				let that=this;
+				uni.showModal({
+					content:'是否确认跳转到多人聊天？',
+					success({confirm}) {
+						if(confirm){
+							uni.redirectTo({
+								url:`/pages/meeting/meeting?userid=${that.intId}&username=${that.fromUserInfo.fromUserName}`
+							})
+						}
+					}
+				})
+			},
 			addMessage(data) {
 				this.messageList.push(data);
 			},
@@ -186,30 +218,40 @@
 					return;
 				}
 				this.API.message.getMessageList(this.md5Id, this.myMd5Id).then(res => {
-					console.log('getMessageList',res)
+					console.log('getMessageList', res)
 					this.messageList = res.data.list.map(t => {
 						t.isItMe = t.sendUserId == this.myMd5Id;
 						if (t.sendUserId == this.md5Id) {
 							t.fromUserHeadImg = this.fromUserInfo.fromUserHeadImg ||
 								'/static/head/head1.png'
-								t.roleName = this.fromUserInfo.user_type && this.fromUserInfo.user_type.includes(1)?'供方':'需方';
+							t.roleName = this.fromUserInfo.user_type && this.fromUserInfo.user_type
+								.includes(1) ? '供方' : '需方';
 						} else {
 							t.fromUserHeadImg = this.user.avatar || '/static/head/head2.png';
-							t.roleName = this.user.user_type && this.user.user_type.includes(1)?'供方':'需方';
+							t.roleName = this.user.user_type && this.user.user_type.includes(1) ? '供方' :
+								'需方';
 						}
 						t.userId = t.sendUserId;
+						if(t.contentType == 'text'){
+							t.content = this.replaceEmoji(t.content)
+						}
+						if(t.contentType == 'voice'){
+							t.content = JSON.parse(t.content)
+						}
 						return t;
 					});
 					this.updateReadMessage();
 				})
 			},
-			updateReadMessage(){
+			updateReadMessage() {
+				let params = JSON.stringify({
+					method: 'UpdateReadMessage',
+					formUserId: this.md5Id,
+					token: service.getTokenChaoge()
+				});
+				console.log('updateReadMessage', params);
 				socketTask.send({
-					data: JSON.stringify({
-						method: 'UpdateReadMessage',
-						fromUserId: this.md5Id,
-						token: service.getTokenChaoge()
-					}),
+					data: params,
 					success() {
 						console.log('UpdateReadMessage success');
 					}
@@ -244,12 +286,18 @@
 			switchChatType(type) {
 				this.chatType = type;
 				this.showFunBtn = false;
+				this.showEmoji = false;
 			},
 			//切换功能性按钮
-			switchFun() {
-				this.chatType = 'keyboard'
-				this.showFunBtn = !this.showFunBtn;
-				uni.hideKeyboard()
+			switchFun(type) {
+				// this.showFunBtn = !this.showFunBtn;
+				
+				console.log('switchFun',type);
+				if(type == 'emj'){
+					this.chatType = 'voice';
+					uni.hideKeyboard();
+					this.showEmoji = true;
+				}
 			},
 			//发送消息
 			sendMsg(data) {
@@ -264,10 +312,9 @@
 				if (data) {
 					if (data.contentType == 'voice') {
 						//说明是发送语音
-						params.content = data.content;
+						params.messageContent = data.messageContent;
+						params.length = data.length;
 						params.messageType = 'voice';
-						params.contentDuration = data.contentDuration;
-						params.anmitionPlay = false;
 					} else if (data.contentType == 'image') {
 						//发送图片
 						params.content = data.content;
@@ -277,7 +324,7 @@
 					//验证输入框书否为空字符传
 					return;
 				}
-				console.log(params);
+				console.log(JSON.stringify(params));
 				socketTask.send({
 					data: JSON.stringify(params),
 					success(res) {
@@ -316,6 +363,7 @@
 					if (this.showFunBtn) {
 						this.showFunBtn = false;
 					}
+					this.showEmoji = false;
  
 					// #ifdef MP-WEIXIN 
 					if (params.contentType == 1) {
@@ -331,6 +379,7 @@
 			//用户触摸屏幕的时候隐藏键盘
 			touchstart() {
 				uni.hideKeyboard();
+				this.showEmoji = false;
 			},
 			// userid 用户id
 			linkToBusinessCard(userId) {
@@ -399,6 +448,7 @@
 				tempFilePath,
 				duration
 			}) {
+				let that=this;
 				let contentDuration;
 				// #ifdef MP-WEIXIN
 				this.voiceTime = 0;
@@ -425,21 +475,36 @@
 				// #endif
  
 				this.recording = false;
-				const params = {
-					contentType: 'voice',
-					content: tempFilePath,
-					contentDuration: Math.ceil(contentDuration)
-				};
-				this.canSend && this.sendMsg(params);
+				
+				console.log('tempFilePath',tempFilePath);
+				uni.uploadFile({
+					url:config.appurl_chaoge+'/file/Uploader/chat_voice',
+					filePath:tempFilePath,
+					name: 'file',
+					success(res){
+						console.log('uploadfile ',res);
+						let data = JSON.parse(res.data);
+						if(data.data && data.data.url){
+							const params = {
+								contentType: 'voice',
+								length:contentDuration || 1,
+								messageContent:data.data.url,
+							};
+							that.canSend && that.sendMsg(params);
+						}
+					}
+				});
+				
 			},
 			//控制播放还是暂停音频文件
 			handleAudio(item) {
+				console.log('handleAudio',item);
 				this.AudioExam = item;
 				this.Audio.paused ? this.playAudio(item) : this.stopAudio(item);
 			},
 			//播放音频
 			playAudio(item) {
-				this.Audio.src = item.content;
+				this.Audio.src = config.baseurl_chaoge+item.content.path;
 				this.Audio.hasBeenSentId = item.hasBeenSentId;
 				this.Audio.play();
 				item.anmitionPlay = true;
@@ -471,6 +536,7 @@
 					sizeType: ['compressed'],
 					success: res => {
 						this.showFunBtn = false;
+						this.showEmoji = false;
 						for (let i = 0; i < res.tempFilePaths.length; i++) {
 							const params = {
 								contentType: 'image',
@@ -520,7 +586,7 @@
 				userid,
 				username
 			} = info;
-			
+
 			this.API.message.getUserInfo(this.user.id).then(res => {
 				this.myMd5Id = res.data.user.userId;
 			})
@@ -567,30 +633,37 @@
  
 			//socket
 			uni.$on('socketMessage', (data) => {
-				console.log('socketMessage',data);
+				console.log('socketMessage', data);
 				this.updateReadMessage();
 				if (data.messageType == 'text') {
 					let message = {
-						isItMe:data.UserId == this.myMd5Id,
-						content:data.toMessage,
-						contentType:'text',
-						userId:data.UserId
+						isItMe: data.UserId == this.myMd5Id,
+						content: data.toMessage,
+						contentType: 'text',
+						userId: data.UserId
 					};
 					if (data.UserId == this.md5Id) {
 						//别人
 						message.fromUserHeadImg = this.fromUserInfo.fromUserHeadImg ||
 							'/static/head/head1.png'
-						message.roleName = this.fromUserInfo.user_type && this.fromUserInfo.user_type.includes(1)?'供方':'需方';
+						message.roleName = this.fromUserInfo.user_type && this.fromUserInfo.user_type.includes(1) ?
+							'供方' : '需方';
 					} else {
 						//我
 						message.fromUserHeadImg = this.user.avatar || '/static/head/head2.png';
-						message.roleName = this.user.user_type && this.user.user_type.includes(1)?'供方':'需方';
+						message.roleName = this.user.user_type && this.user.user_type.includes(1) ? '供方' : '需方';
+					}
+					if(message.contentType == 'text'){
+						message.content = this.replaceEmoji(message.content)
+					}
+					if(message.contentType == 'voice'){
+						message.content = JSON.parse(message.content)
 					}
 					this.addMessage(message);
 				}
-				if(data.messageType == 'messageRead'){
-					if(data.userId == this.md5Id){
-						this.messageList = this.messageList.map(t=>{
+				if (data.messageType == 'messageRead') {
+					if (data.userId == this.md5Id) {
+						this.messageList = this.messageList.map(t => {
 							t.state = 1;
 							return t;
 						});
@@ -623,6 +696,7 @@
 					// #endif
 				} else {
 					this.showFunBtn = false;
+					this.showEmoji = false;
 				}
 			});
 		}