切换

components/ItemComponent/roadshowItem.vue

@@ -35,7 +35,7 @@
       ></image>
     </view> -->
     <view class="content-item-flex iten-buttom">
-      <view class="global_content_center">播放</view>
+      <view class="global_content_center" @click.stop="handelPlay(list)">{{ (list.Type == 1 || list.Type == 4) && curVoiceId === list.ActivityId && !curAudioPaused ? "暂停" : "播放" }}</view>
       <view v-if="list.Type == 1 || list.Type == 4" class="global_content_center" @click="joinPlaylist(list)">播放列表</view>
     </view>
     <view class="global_title" @click="goDetails">
@@ -210,6 +210,11 @@ export default {
       const playlist = this.$store.state.audioJoinPlaylist.playlist.some((key) => key.indexId === dataList.indexId);
       if (!playlist) {
         this.$store.commit("audioJoinPlaylist/addPlaylist", { dataList });
+        uni.showToast({
+          title: "已加入播放列表",
+          icon: "success",
+          duration: 2000,
+        });
       }
     },
     // 播放时长的转换

components/audioModule/index.vue

@@ -1,10 +1,7 @@
 <template>
-  <!-- v-if="showAudioPop" -->
   <view class="container global-audio-box" v-if="showAudioPop">
     <view class="bg-overlay" @click="isShowMaskHandler"></view>
-
     <view class="audio-box">
-      <view @click="showTabulation = true"> 最后不要忘了删除 </view>
       <view class="activity-title">
         {{ activityTitle }}
         <view class="icon-cross" @click.stop="isShowMaskHandler">
@@ -12,11 +9,9 @@
         </view>
       </view>
       <view class="audio-card">
-        <view class="card-title text_oneLine" @click="showTabulation = true">
-          {{ title }}
-        </view>
         <view class="slider-paly">
-          <view style="flex: 1; padding-top: 20rpx">
+          <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
+          <view style="flex: 1; margin: 0 20rpx 0 30rpx; padding-top: 20rpx">
             <slider
               activeColor="#376cbb"
               :max="audioTime"
@@ -32,23 +27,25 @@
               <text class="time">{{ audioTime | formatVoiceTime }}</text>
             </view>
           </view>
-          <view class="is-paly-card">
-            <image
-              @click.stop="handleChangePlayStatus"
-              :src="play ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/play_icon.gif' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/pause_icon.png'"
-            ></image>
-          </view>
+          <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
         </view>
         <view class="fast-reverse">
-          <view :style="{ color: PreviousNextSong == 0 ? '#f00' : '#333' }" @click="isPreviousNextSongHandler(PreviousNextSong == 0, '上')">上一首</view>
-          <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
           <block v-for="(item, index) in timesTheSpeed" :key="item.value">
-            <view class="speed-button" v-if="isTimes == item.value" @click="isTimesHandler(index)">
+            <view class="speed-button global_content_center" v-if="isTimes == item.value" @click="isTimesHandler(index)">
               {{ item.name }}
             </view>
           </block>
-          <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
-          <view :style="{ color: PreviousNextSong == playlistData.length - 1 ? '#f00' : '#333' }" @click="isPreviousNextSongHandler(PreviousNextSong == playlistData.length - 1, '下')">下一首</view>
+          <view :style="{ color: PreviousNextSong == 0 ? '#f00' : '#333' }" @click="isPreviousNextSongHandler(PreviousNextSong == 0, '上')"><van-icon name="arrow-left" size="28" /></view>
+          <view class="is-paly-card">
+            <van-icon v-if="play" name="play-circle" size="28" />
+            <van-icon v-else name="pause-circle" size="28" />
+          </view>
+          <view :style="{ color: PreviousNextSong == playlistData.length - 1 ? '#f00' : '#333' }" @click="isPreviousNextSongHandler(PreviousNextSong == playlistData.length - 1, '下')"
+            ><van-icon name="arrow" size="28"
+          /></view>
+          <view class="speed-button global_content_center play-list-content" @click="showTabulation = true">
+            <van-icon name="bars" size="28" />
+          </view>
         </view>
       </view>
     </view>
@@ -103,7 +100,7 @@ export default {
         { name: "2倍", value: 2 },
       ],
       isRecord: true, //是否记录播放
-      showTabulation: true,
+      showTabulation: false,
     };
   },
   computed: {
@@ -480,23 +477,25 @@ export default {
     .fast-reverse {
       display: flex;
       align-items: center;
-      justify-content: center;
+      justify-content: space-around;
       margin-top: 30rpx;
       .speed-button {
-        width: 96rpx;
-        height: 47rpx;
-        background: #eaeaea;
+        width: 88rpx;
+        height: 58rpx;
+        background: #e5efff;
         border-radius: 8rpx;
-        text-align: center;
-        line-height: 47rpx;
-        margin: 0 70rpx;
+        color: $uni-color-new;
+        font-size: 36rpx;
       }
-      .speed-img {
-        width: 50rpx;
-        height: 50rpx;
+      .play-list-content {
+        width: 64rpx;
       }
     }
   }
+  .speed-img {
+    width: 50rpx;
+    height: 50rpx;
+  }
   .play-ul {
     padding: 30rpx 20rpx;
     .play-li {

pages/material/material.vue

@@ -5,7 +5,7 @@
       <view class="top-tabs">
         <block v-for="item in topTabBars" :key="item.Id">
           <view v-if="item.IsShow" :class="['item', item.Id == topTabsActive && 'tabs-active']" @click="topTabsChange(item)">
-            {{ item.Name }}
+            {{ item.Name}}
             <block v-if="(item.Id === 3 || item.Name == '图表') && wholeShowListData.IsShowChart">
               <image class="limit-img tabs-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
             </block>
@@ -118,7 +118,7 @@ export default {
   data() {
     return {
       topTabBars: [],
-      topTabsActive: 4, //一级top的tabs
+      topTabsActive: 2, //一级top的tabs
       secondActive: "", //二级的tabs
       secondBars: [], //二级的tabs数组
       chartChildren: [], //二级的tabs下的标签
@@ -486,14 +486,8 @@ export default {
         PageRouter: this.$store.state.pageRouterReport,
       });
       if (res.Ret === 200) {
-        let index = this.roadshowPageList.findIndex((key) => key.SourceId == item.SourceId && key.Type == item.Type);
-        console.log(index);
-        // this.$nextTick(() => {
-
-        // });
-        res.Data.Status == 1 ? this.$set(this.roadshowPageList[index], "IsCollect", true) : this.$set(this.roadshowPageList[index], "IsCollect", false);
-        console.log(this.roadshowPageList[index]);
-
+        let index = this.roadshowPageList.findIndex((key) => key.Id == item.Id);
+        res.Data.Status == 1 ? (this.roadshowPageList[index].IsCollect = true) : (this.roadshowPageList[index].IsCollect = false);
         uni.showToast({
           title: res.Msg,
           duration: 2000,
@@ -761,7 +755,7 @@ export default {
     width: 160rpx;
     // margin-right: 20rpx;
     padding-right: 20rpx;
-    height: 64rpx;
+    height: 51rpx;
     border-radius: 26rpx;
     background: #f8f8fa;
   }