fixbug

pages-activity/detail.vue

@@ -216,12 +216,6 @@ export default {
     },
     onUnload(){
         // 存一次
-        const tem=uni.getStorageSync('audioMsg')
-        let storeId=0//本地缓存的活动id
-        if(tem){
-            storeId=JSON.parse(tem).activityId
-        }
-
         const tag=this.audioList.some(item=>item.voiceUrl==this.globalBgMusic.src)
         if(tag){
             let obj={
@@ -236,21 +230,6 @@ export default {
             }
             uni.setStorageSync('audioMsg', JSON.stringify(obj))
         }
-
-
-        // if(this.globalBgMusic.src&&this.id==storeId){
-        //     let obj={
-        //         activityId:this.id,//活动id
-        //         play:this.audioPlayStatus,//是否正在播放
-        //         list:this.audioList,//音频列表数据
-        //         show:false,//是否显示弹窗
-        //         title:this.info.activityTypeName,//音频弹窗标题
-        //         audioCurrentTime:this.audioCurrentTime,//音频播放实时时间
-        //         audioTime:this.activeAudioTime,//当前音频时间
-        //         audioCurrentUrl:this.activeAudioUrl,//当前音频地址
-        //     }
-        //     uni.setStorageSync('audioMsg', JSON.stringify(obj))
-        // }
     },
     onShareAppMessage() {
         let title=''
@@ -313,6 +292,9 @@ export default {
             this.globalBgMusic.onStop(()=>{
                 console.log('onStop');
                this.audioPlayStatus=false
+               this.activeAudioUrl=''
+               this.activeAudioTime=0
+               this.audioCurrentTime=0
             })
             this.globalBgMusic.onEnded(()=>{
                 console.log('onEnded');
@@ -336,11 +318,16 @@ export default {
         // 点击播放按钮
         handleAudioBtn(type,e){
             if(type==='center'){
-                if(this.audioPlayStatus){
-                    this.globalBgMusic.pause()
+                if(this.globalBgMusic.src){
+                    if(this.audioPlayStatus){
+                        this.globalBgMusic.pause()
+                    }else{
+                        this.globalBgMusic.play()
+                    }
                 }else{
-                    this.globalBgMusic.play()
+                    this.handlePlayAudio(this.audioList[0])
                 }
+                
             }
 
             if(type==='before'){

pages/activity/activity.vue

@@ -194,11 +194,17 @@ import {apiApplyPermission,apiUserInfo} from '@/api/user'
 export default {
     computed: {
         isFirstAudio(){
+            if(!this.currentAudioMsg.audioCurrentUrl){
+                return true
+            }
             if(this.currentAudioMsg.list.length>0){
                 return this.currentAudioMsg.audioCurrentUrl==this.currentAudioMsg.list[0].voiceUrl
             }
         },
         isLastAudio(){
+            if(!this.currentAudioMsg.audioCurrentUrl){
+                return true
+            }
             if(this.currentAudioMsg.list.length>0){
                 return this.currentAudioMsg.audioCurrentUrl==this.currentAudioMsg.list[this.currentAudioMsg.list.length-1].voiceUrl
             }
@@ -369,6 +375,10 @@ export default {
             })
             this.globalBgMusic.onStop(()=>{
                 this.currentAudioMsg.play=false
+                this.currentAudioMsg.play=false
+                this.currentAudioMsg.audioCurrentTime=0
+                this.currentAudioMsg.audioTime=0
+                this.currentAudioMsg.audioCurrentUrl=0
             })
             this.globalBgMusic.onEnded(()=>{
                 console.log('onEnded');
@@ -389,11 +399,16 @@ export default {
         // 点击弹窗中的按钮
         handleAudioBtn(type,e){
             if(type==='center'){
-                if(this.currentAudioMsg.play){
-                    this.globalBgMusic.pause()
+                if(this.globalBgMusic.src){
+                    if(this.currentAudioMsg.play){
+                        this.globalBgMusic.pause()
+                    }else{
+                        this.globalBgMusic.play()
+                    }
                 }else{
-                    this.globalBgMusic.play()
+                    this.handlePlayAudio(this.currentAudioMsg.list[0])
                 }
+                
             }
             if(type==='before'){
                 if(!this.isFirstAudio){