From 086c1655c88d12eb6f9b6055d261c88f3d03b856 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 11 Nov 2024 11:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/staffTabBer/tabBar.vue |  5 ++-
 components/tabBar/tabBar.vue      | 63 +++++++++++++++++++++----------
 main.js                           |  2 +
 pages/index/orderdetails.vue      | 33 ++++++++++------
 4 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/components/staffTabBer/tabBar.vue b/components/staffTabBer/tabBar.vue
index 839f21f..421a337 100644
--- a/components/staffTabBer/tabBar.vue
+++ b/components/staffTabBer/tabBar.vue
@@ -28,7 +28,7 @@
 	export default{
 		data(){
 			return{
-				msgSocket: this.$msgSocket,
+				msgSocket: null,
 				aindex:1,
 				arr:[
 					{text:'首页'},
@@ -45,7 +45,8 @@
 			this.aindex = this.msg
 		},
 		mounted() {
-			console.log(this.aindex);
+			
+			this.msgSocket = this.$msgSocket,
 			this.aindex = this.msg
 		},
 		watch: {
diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index c88306e..5218be3 100644
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@@ -35,10 +35,12 @@
 </template>
 
 <script>
+		const innerAudioContext = uni.createInnerAudioContext();
 	import request from '../../utils/request';
 	export default{
 		data(){
 			return{
+			
 				aindex:1,
 				chuan:0,
 				arr:[
@@ -61,26 +63,49 @@
 		},
 		mounted() {
 			this.aindex = this.msg
-		},
-		methods:{
-			// getgogo(index){
 			
-			// 	if(index == 1){
-			// 		this.aindex = index
-			// 		uni.reLaunch({
-			// 			url:'/pages/index/index'
-			// 		});
-				
-			// 	}
-			// 	if(index == 2){
-			// 			this.aindex = index
-			// 	uni.reLaunch({
-			// 		url:'/pages/my/my'
-			// 	});
-			// 	}
-				
-				
-			// }
+		},
+
+		methods:{
+			dianyidain() {
+				console.log('执行了，dianyidain');
+				innerAudioContext.src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3';
+				// 设置播放次数和计数器
+				const playCount = 5;
+				let currentCount = 0;
+			
+				// 监听音频播放结束事件
+				innerAudioContext.onEnded(() => {
+					// 播放计数加一
+					currentCount++;
+			
+					// 判断是否达到播放次数上限
+					if (currentCount < playCount) {
+						// 继续播放
+						innerAudioContext.play();
+					} else {
+						// 播放完成，可以在这里添加额外的逻辑
+						console.log('播放完成');
+					}
+				});
+			
+				// 初次播放
+				innerAudioContext.play();
+			
+			
+			},
+			msgInfo() {
+				console.log(this.msgSocket, 'msgSocket')
+				if (this.msgSocket) {
+					console.log('消息回调启动成功')
+					this.msgSocket.onMessage(res => {
+						console.log("发出提示音");
+						
+						this.dianyidain()
+					})
+				}
+			
+			},
 			async getbottom(){
 				let data = {
 					partnerId:uni.getStorageSync('partnerId')
diff --git a/main.js b/main.js
index d724e6b..2473386 100644
--- a/main.js
+++ b/main.js
@@ -15,6 +15,7 @@ import {
 } from './utils/orderSocket.js'
 let SocketTask;
 let timerId;
+
 export function startSocketConnect(userId) {
 	SocketTask = null
 	SocketTask = connect(userId);
@@ -26,6 +27,7 @@ export function startSocketConnect(userId) {
 			sendSocketMessage(SocketTask)
 		}, 10000);
 	}
+	
 }
 
 export function closeSocketMain(userId) {
diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue
index d126687..11c895a 100644
--- a/pages/index/orderdetails.vue
+++ b/pages/index/orderdetails.vue
@@ -92,21 +92,32 @@
 		<view class="" v-for="(item,index) in detailData.stepInfos" :key="index">
 			<view class="x-box">
 				<view class="h-title" style="display: flex;align-items: center;justify-content: space-between;">
-					<view class="qiu_">{{index +1}}</view>
-					<text style="width: 46%;" >{{ item.title }}</text>
+					<view style="width: 10%;">
+						<view class="qiu_">{{index +1}}</view>
+					</view>
+					
+					<text style="width:30%;box-sizing: border-box;padding-left: 5px;" > {{ item.title }}</text>
 					<text class="times">{{ item.createTime }}</text>
-					<text class="times">施工人员:{{ item.nickname }}</text>
+					<text class="times">施工人员:
+					{{ item.nickname }}</text>
+				</view>
+				
+				<view class="">
+						<view style="margin-bottom: 5px;">{{ item.content }}</view>
+					<view v-if="item.images" >
+						<view v-for="it in item.images.split(',')">
+						
+							<image :src="baseImageUrl+'/'+it" style="width: 28vw; height: 12vh; margin-right: 1vw; "  ></image>
+							
+						</view>
+						
+					
+					</view>
 				</view>
 				<view style="display: flex;align-items: center;">
 					<view class="xb_" v-if="index !=  detailData.stepInfos.length - 1 ">↓ </view>
-					<text>{{ item.content }}</text>
-					<view v-if="item.images" >
-						<view v-for="it in item.images.split(',')">
-							{{baseImageUrl+'/'+it}}
-							<image :src="baseImageUrl+'/'+it" mode=""></image>
-						</view>
+				
 					
-					</view>
 				</view>
 
 			</view>
@@ -845,7 +856,7 @@
 
 	.times {
 		width: 30%;
-		font-size: 15px;
+		font-size: 12px;
 		font-weight: 400;
 		color: #999999;
 		margin-left: 25px;