优化音频

activityPages/activityDetail/activityDetail.vue

@@ -282,7 +282,7 @@ export default {
       //当前音频是否暂停状态
       return this.$store.state.audioBg.paused;
     },
-      curTime() {
+    curTime() {
       //当前音频的播放时间
       return this.$store.state.audioBg.curTime;
     },
@@ -465,13 +465,18 @@ export default {
     },
     //音频点击暂停播放
     audioPlayBack() {
-      if (this.$store.state.audioBg.activityId == this.detailData.ActivityId) {
-        if (this.globalBgAudioManager.paused) {
-          this.globalBgAudioManager.play();
+      if (this.globalBgAudioManager.src) {
+        if (this.$store.state.audioBg.activityId == this.detailData.ActivityId) {
+          if (this.globalBgAudioManager.paused) {
+            this.globalBgAudioManager.play();
+          } else {
+            this.globalBgAudioManager.pause();
+          }
         } else {
-          this.globalBgAudioManager.pause();
+          this.$store.commit("audioBg/addAudio", { list: this.detailData.VoiceList, activityId: this.detailData.ActivityId, activityTitle: this.detailData.ActivityName });
         }
       } else {
+        this.$store.commit("audioBg/removeAudio");
         this.$store.commit("audioBg/addAudio", { list: this.detailData.VoiceList, activityId: this.detailData.ActivityId, activityTitle: this.detailData.ActivityName });
       }
     },
@@ -757,7 +762,7 @@ export default {
     }
     .card-title {
       color: #3385ff;
-      font-size: 26rpx;
+      font-size: 28rpx;
       padding: 0 66rpx;
       text-align: center;
       margin-bottom: 35rpx;

activityPages/activitySearch/activitySearch.vue

@@ -6,7 +6,7 @@
         <input type="text" placeholder="请输入关键字" placeholder-class="sea_ipt_placeholder" class="sea_ipt" v-model="searchTxt" focus="true" confirm-type="search" @confirm="searchHandle" />
         <icon type="search" size="15" class="sea_ico" />
         <view class="ipt-right">
-          <icon type="clear" size="16" color="#E0E0E0" v-show="searchTxt" @click.stop="clearIpt" />
+          <icon type="clear" size="16" color="#E0E0E0" @click="clearIpt" />
           <text class="line">|</text>
           <text @click="searchHandle" style="color: #3385ff">搜索</text>
         </view>
@@ -74,7 +74,7 @@
                     : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_group.png'
                 "
               ></image>
-              回放
+              {{ curVoiceId === item.ActivityId && !curAudioPaused ? "暂停" : "回放" }}
             </view>
           </view>
           <view class="item-li">
@@ -442,6 +442,9 @@ export default {
 }
 @import "../components/indexActivity.scss";
 .activity-search-content {
+  .ipt-right {
+    z-index: 11;
+  }
   .select-conyent {
     display: flex;
     // justify-content: flex-end;
@@ -480,6 +483,7 @@ export default {
       align-items: center;
       background-color: #3385ff;
       border-radius: 20rpx;
+      padding-left: 4rpx;
       .audio-img {
         width: 30rpx;
         height: 30rpx;

activityPages/playBack/playBack.vue

@@ -39,7 +39,7 @@
                   : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_group.png'
               "
             ></image>
-            回放
+              {{ curVoiceId === item.ActivityId && !curAudioPaused ? "暂停" : "回放" }}
           </view>
         </view>
         <view class="item-li">
@@ -257,6 +257,7 @@ export default {
       align-items: center;
       background-color: #3385ff;
       border-radius: 20rpx;
+      padding-left: 4rpx;
       .audio-img {
         width: 30rpx;
         height: 30rpx;

components/audioModule/index.vue

@@ -27,7 +27,6 @@
       </view>
     </view>
   </view>
-  <!-- </van-overlay> -->
 </template>
 
 <script>
@@ -56,6 +55,7 @@ export default {
       title: "", //当前音频标题
       activityTitle: "", //当前活动标题
       play: false,
+      isEnded: false,
     };
   },
   computed: {
@@ -102,9 +102,6 @@ export default {
       this.globalBgAudioManager.onPlay(async () => {
         this.play = true;
         this.$store.commit("audioBg/updateAudioPause", false);
-        const res = await activity.backAudioPlay({
-          ActivityId: this.$store.state.audioBg.activityId,
-        });
       });
       this.globalBgAudioManager.onPause(() => {
         console.log("音频暂停");
@@ -113,11 +110,13 @@ export default {
       });
       this.globalBgAudioManager.onStop(() => {
         console.log("音频停止");
-        this.$store.commit("audioBg/removeAudio");
+        this.play = false;
+        this.$store.commit("audioBg/updateAudioPause", true);
       });
       this.globalBgAudioManager.onEnded(() => {
         console.log("音频onEnded");
-        this.$store.commit("audioBg/removeAudio");
+        this.play = false;
+        this.$store.commit("audioBg/updateAudioPause", true);
       });
       this.globalBgAudioManager.onError((e) => {
         console.log("音频onError", e);
@@ -140,10 +139,14 @@ export default {
     },
     //音频点击暂停播放
     handleChangePlayStatus() {
-      if (!this.globalBgAudioManager.paused) {
-        this.globalBgAudioManager.pause();
+      if (this.globalBgAudioManager.src) {
+        if (!this.globalBgAudioManager.paused) {
+          this.globalBgAudioManager.pause();
+        } else {
+          this.globalBgAudioManager.play();
+        }
       } else {
-        this.globalBgAudioManager.play();
+        this.init();
       }
     },
   },
@@ -208,7 +211,7 @@ export default {
     }
     .card-title {
       color: #3385ff;
-      font-size: 26rpx;
+      font-size: 28rpx;
       padding: 0 66rpx;
       text-align: center;
       margin-bottom: 35rpx;

pageMy/mySchedulepage/mySchedulepage.vue

@@ -14,7 +14,7 @@
                   : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_group.png'
               "
             ></image>
-            回放
+            {{ curVoiceId === item.ActivityId && !curAudioPaused ? "暂停" : "回放" }}
           </view>
         </view>
         <view class="item-li">
@@ -230,6 +230,7 @@ export default {
       align-items: center;
       background-color: #3385ff;
       border-radius: 20rpx;
+      padding-left: 4rpx;
       .audio-img {
         width: 30rpx;
         height: 30rpx;

store/modules/audioBg.js

@@ -10,7 +10,6 @@ const audioModules = {
   },
   mutations: {
     addAudio(state, payload) {
-      console.log(payload, "asdas");
       state.list = payload.list;
       state.activityTitle = payload.activityTitle;
       state.activityId = payload.activityId || 0;