From be3f9dfe047d813f8e8cd0bce1ab922ba6d891b4 Mon Sep 17 00:00:00 2001 From: wtq <2394975549@qq.com> Date: Wed, 29 Jul 2026 11:26:55 +0800 Subject: [PATCH] '!' --- .../component/left-bar/left-bar.vue | 2 +- .../childPages/component/orderListTop.vue | 9 +-- .../evaluateM/commentList/commentList.vue | 2 +- .../orderRealTime/orderRealTime.ts | 8 ++- .../msgChat/msgChatChild/chat-item.vue | 61 +++++++++++++++++-- .../orderDetail/detailChild/goodsList.vue | 4 +- 6 files changed, 69 insertions(+), 17 deletions(-) diff --git a/src/pages/goods-manager/component/left-bar/left-bar.vue b/src/pages/goods-manager/component/left-bar/left-bar.vue index 42b7264..402b5aa 100644 --- a/src/pages/goods-manager/component/left-bar/left-bar.vue +++ b/src/pages/goods-manager/component/left-bar/left-bar.vue @@ -28,7 +28,7 @@ :class="{ 'tow-item-active': towActive == childIndex }" v-for="(childItem, childIndex) in item.children" :key="childIndex" - @tap="towItemFn(childItem, childIndex)" + @tap="towItemFn(childItem, +childIndex)" > {{ childItem.name }} diff --git a/src/pages/order-manager/childPages/component/orderListTop.vue b/src/pages/order-manager/childPages/component/orderListTop.vue index b403488..f4a991d 100644 --- a/src/pages/order-manager/childPages/component/orderListTop.vue +++ b/src/pages/order-manager/childPages/component/orderListTop.vue @@ -188,10 +188,11 @@ const isCancelTime = computed(() => { * 是否显示急送 美团 饿百 */ const isShowRushOrder = computed(() => { - return (props.item.vendorID === 1 || props.item.vendorID === 3) - && props.item.status <=20 ? - (props.item.couponIDs && props.item.couponIDs.includes('11002') || props.item.couponIDs.includes('11003') ) - : false + // return (props.item.vendorID === 1 || props.item.vendorID === 3) + // && props.item.status <=20 ? + // (props.item.couponIDs && props.item.couponIDs.includes('11002') || props.item.couponIDs.includes('11003') ) + // : false + return (props.item.vendorID === 1 || props.item.vendorID === 3) && (props.item.couponIDs && props.item.couponIDs.includes('11002') || props.item.couponIDs.includes('11003') ) }) diff --git a/src/subPages/merchantChild/evaluateM/commentList/commentList.vue b/src/subPages/merchantChild/evaluateM/commentList/commentList.vue index 10c97d7..f44f3ab 100644 --- a/src/subPages/merchantChild/evaluateM/commentList/commentList.vue +++ b/src/subPages/merchantChild/evaluateM/commentList/commentList.vue @@ -52,7 +52,7 @@ :key="index" :src="item.includes('https') ? item : item.replace('http','https')" style="width: 240rpx;height:240rpx; flex: 0 0 auto;margin-right: 20rpx;" - @tap.stop="previewImg((JSON.parse(comment.msg).comment_pictures).split(','),index)" + @tap.stop="previewImg((JSON.parse(comment.msg).comment_pictures).split(','),+index)" > diff --git a/src/subPages/merchantChild/orderRealTime/orderRealTime.ts b/src/subPages/merchantChild/orderRealTime/orderRealTime.ts index 8c17d54..c5765d2 100644 --- a/src/subPages/merchantChild/orderRealTime/orderRealTime.ts +++ b/src/subPages/merchantChild/orderRealTime/orderRealTime.ts @@ -42,7 +42,7 @@ export default function orderRealTime() { /************************************************* - * 平台列表数据 + * 平台数据 */ const vendorArr = ref>([ { @@ -352,7 +352,8 @@ export default function orderRealTime() { return '实际支付' } else { //报价 - return '实际收入' + // return '实际收入' + return '预计收益' } } } else { @@ -361,7 +362,8 @@ export default function orderRealTime() { return '平台结算' } else { //报价 - return '实际收入' + // return '实际收入' + return '预计收益' } } }) diff --git a/src/subPages/messageChild/msgChat/msgChatChild/chat-item.vue b/src/subPages/messageChild/msgChat/msgChatChild/chat-item.vue index 54282fa..777f004 100644 --- a/src/subPages/messageChild/msgChat/msgChatChild/chat-item.vue +++ b/src/subPages/messageChild/msgChat/msgChatChild/chat-item.vue @@ -212,17 +212,66 @@ const avatar = computed(() => { */ const isVoice = ref(false) const voice = uni.createInnerAudioContext() + +// 全局音频实例，避免重复创建 +let innerAudio:any = null +// const isVoice = ref(false) function playVoice(playUrl: string) { - if (uni.getSystemInfoSync().platform != 'android') + console.log(uni.getSystemInfoSync(),'playVoice,9999999999999', playUrl) + // if (uni.getSystemInfoSync().platform != 'android' && uni.getSystemInfoSync().platform != 'ohos') // ohos + if (uni.getSystemInfoSync().platform === 'ios') // ohos return toast('ios系统不支持') - toast('正在播放音频') + else{ + toast('正在播放音频') + // isVoice.value = true + // voice.src = playUrl + // voice.stop() + // voice.play() + // voice.onEnded(() => { + // console.log('111111111111111111',) + // isVoice.value = false + // }) + + // const innerAudioContext = uni.createInnerAudioContext(); + // innerAudioContext.autoplay = true; + // innerAudioContext.src = playUrl; + // innerAudioContext.onPlay(() => { + // console.log('开始播放'); + // }); + // innerAudioContext.onError((res) => { + // console.log(res.errMsg); + // console.log(res.errCode); + // }); + + // toast('正在播放音频') isVoice.value = true - voice.src = playUrl - voice.stop() - voice.play() - voice.onEnded(() => { + + // 销毁上一个播放器 + if (innerAudio) { + innerAudio.stop() + innerAudio.destroy() + } + // 创建小程序原生音频上下文 + innerAudio = uni.createInnerAudioContext() + innerAudio.src = playUrl + + // 播放结束回调 + innerAudio.onEnded(() => { + console.log('播放结束') + isVoice.value = false + innerAudio.destroy() + }) + + // 播放失败监听（关键，排查格式/地址错误） + innerAudio.onError((err:any) => { + console.error('音频播放失败', err) + toast('音频播放失败，格式不支持') isVoice.value = false }) + + innerAudio.play() + } + } /** diff --git a/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue b/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue index 04064d4..f713d03 100644 --- a/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue +++ b/src/subPages/orderChild/orderDetail/detailChild/goodsList.vue @@ -156,7 +156,7 @@ @@ -165,7 +165,7 @@ color="#f84a82" :price="sku.salePrice" /> - +