'!'

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)"
     >
       <text class="tow-seat tow-seat-active"></text>{{ childItem.name }}</view
     >

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') )
 })
 
 

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)"
           >
       </view>
 

src/subPages/merchantChild/orderRealTime/orderRealTime.ts

@@ -42,7 +42,7 @@ export default function orderRealTime() {
 
 
     /*************************************************
-     * 平台列表数据
+     * 平台数据
     */
     const vendorArr = ref<Array<AnyObject>>([
         {
@@ -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 '预计收益'
             }
         }
     })

src/subPages/messageChild/msgChat/msgChatChild/chat-item.vue

@@ -212,17 +212,66 @@ const avatar = computed(() => {
  */
 const isVoice = ref<boolean>(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()
+  }
+ 
 }
 
 /**

src/subPages/orderChild/orderDetail/detailChild/goodsList.vue

@@ -156,7 +156,7 @@
               <jx-price
                 v-else
                 color="#4fb433"
-                :price="sku.salePrice * sku.count * 0.7"
+                :price="sku.salePrice * sku.count * 0.6"
               />
             </view>
             <view class="price" v-else>
@@ -165,7 +165,7 @@
                 color="#f84a82"
                 :price="sku.salePrice"
               />
-              <jx-price v-else color="#f84a82" :price="sku.salePrice * 0.7" />
+              <jx-price v-else color="#f84a82" :price="sku.salePrice * 0.6" />
             </view>
           </view>
         </view>