7.6 ok

activityPages/activityDetail/activityDetail.vue

@@ -240,7 +240,7 @@
     </view>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <view v-show="false">
-      <audioModule :showAudioPop="showAudioPop" />
+      <audioModule ref="childrenAudio" :showAudioPop="showAudioPop" />
     </view>
   </view>
 </template>
@@ -543,6 +543,8 @@ export default {
     handleAudioSliderChange(e) {
       const value = e.detail.value;
       this.globalBgAudioManager.seek(value);
+      console.log(this.$refs.childrenAudio);
+      this.$refs.childrenAudio.isRecord = false;
       setTimeout(() => {
         this.$store.commit("audioBg/setSlide", false);
       }, 300);
@@ -564,12 +566,14 @@ export default {
         this.$store.commit("audioBg/removeAudio");
         this.$store.commit("audioBg/addAudio", { list: this.detailData.VoiceList, activityId: this.detailData.ActivityId, activityTitle: this.detailData.ActivityName });
       }
+      this.$refs.childrenAudio.isRecord = false;
     },
     //快进 快退
     speedReverseHandler(type) {
       let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
       isTime = isTime <= 0 ? 0 : isTime >= this.detailData.VoiceList.PlaySeconds ? this.detailData.VoiceList.PlaySeconds - 1 : isTime;
       this.globalBgAudioManager.seek(isTime);
+     this.$refs.childrenAudio.isRecord = false;
     },
   },
   async onLoad(option) {

components/audioModule/index.vue

@@ -85,6 +85,7 @@ export default {
         { name: "1.5倍", value: 1.5 },
         { name: "2倍", value: 2 },
       ],
+      isRecord: true, //是否记录播放
     };
   },
   computed: {
@@ -154,14 +155,17 @@ export default {
     //音频播放事件
     listenAudio() {
       this.globalBgAudioManager.onPlay(async () => {
-        console.log("音频播放");
-        this.palyTime = 0;
-        this.backAudioPlay();
-        this.palyTimeout = setInterval(() => {
-          this.palyTime++;
-        }, 1000);
+        if (this.isRecord) {
+          console.log("音频播放");
+          this.palyTime = 0;
+          this.backAudioPlay();
+          this.palyTimeout = setInterval(() => {
+            this.palyTime++;
+          }, 1000);
+        }
         this.play = true;
         this.$store.commit("audioBg/updateAudioPause", false);
+        this.isRecord = true;
       });
 
       this.globalBgAudioManager.onPause(() => {
@@ -222,6 +226,7 @@ export default {
     handleAudioSliderChange(e) {
       const value = e.detail.value;
       this.globalBgAudioManager.seek(value);
+      this.isRecord = false;
       setTimeout(() => {
         this.$store.commit("audioBg/setSlide", false);
       }, 300);
@@ -243,12 +248,14 @@ export default {
       if (this.globalBgAudioManager.paused) {
         this.globalBgAudioManager.play();
       }
+      this.isRecord = false;
     },
     //快进 快退
     speedReverseHandler(type) {
       let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
       isTime = isTime <= 0 ? 0 : isTime >= this.audioTime ? this.audioTime - 1 : isTime;
       this.globalBgAudioManager.seek(isTime);
+      this.isRecord = false;
     },
     //播放了记录
     backAudioPlay() {

components/modalDialog.vue

@@ -354,7 +354,7 @@ export default {
     },
     showhasPermissionBtn() {
       User.applyTry({
-        TryType: this.jurisdictionList.isAudioVideo == 2 ? "MicroVideo" : "Activity",
+        TryType: this.jurisdictionList.isAudioVideo == 1 ? "MicroAudio" : this.jurisdictionList.isAudioVideo == 2 ? "MicroVideo" : "Activity",
         DetailId: this.jurisdictionList.ActivityId,
       }).then((res) => {
         this.showhasPermission = false;

pageMy/login/login.vue

@@ -190,6 +190,13 @@ export default {
               url: "/pageMy/transitionPages/transitionPages",
             });
           } else {
+            let pages = getCurrentPages();
+            let prevPage = pages[pages.length - 2];
+            let path = prevPage ? prevPage.$page.fullPath : "";
+            console.log(pages, prevPage, path, "----");
+            if (path.includes("/pages/index/index")) {
+              uni.$emit("updateAudioVideo");
+            }
             uni.navigateBack({
               delta: 1,
               fail: (err) => {

pageMy/search/search.vue

@@ -91,7 +91,7 @@
               <view class="title text_twoLine">{{ item.Title }}</view>
               <view class="share">
                 <view class="share-text" :style="[classifyColor(item.ChartPermissionName)]">
-                  <image :src="classifyIcon(item.ChartPermissionName)"></image>
+                  <image :src="classifyIcon(item)"></image>
                   {{ item.Type == 1 ? "音频" : "视频" }}｜{{ item.ChartPermissionName }}
                 </view>
                 <button class="share-icon" open-type="share" :data-item="item">
@@ -426,7 +426,7 @@ export default {
           item.Type == 1 ? this.audioPlayBack(item) : this.handelVideoPlay(item);
         } else {
           this.hasPermission = item.AuthInfo.HasPermission;
-          this.jurisdictionList.ActivityId = item.Type == 1 ? item.ActivityId : item.Id;
+          this.jurisdictionList.ActivityId =  item.Id;
           this.jurisdictionList.isAudioVideo = item.Type;
           if (this.hasPermission == 2) {
             this.jurisdictionList.SellerMobile = item.AuthInfo.SellerMobile;
@@ -448,7 +448,7 @@ export default {
       this.videoPlayTime = item.PlaySeconds;
       this.globalBgAudioManager.stop();
       setTimeout(() => {
-        this.videoContext = wx.createVideoContext(item.toString());
+        this.videoContext = wx.createVideoContext(item.Id.toString());
       }, 300);
       Home.microAideoHistoryAdd({ VideoId: item.Id });
     },
@@ -483,7 +483,9 @@ export default {
     },
     //音视频的图标
     classifyIcon(item) {
-      return MultimediaIcon.find((key) => key.name == item).audio;
+      let srcItem = MultimediaIcon.find((key) => key.name == item.ChartPermissionName);
+      let imgSrc = item.Type == 1 ? srcItem.audio : srcItem.video;
+      return imgSrc;
     },
   },
   onLoad(options) {
@@ -519,8 +521,9 @@ export default {
       let audio_id = item.Type == 1 ? item.Id : "";
       let video_id = item.Type == 2 ? item.Id : "";
       return {
-        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "您手边的弘则研究素材检索库",
+        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : item.Title,
         path: "/pages/index/index?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id,
+        imageUrl: item.ShareImg,
       };
     }
   },

pages/index/index.vue

@@ -8,13 +8,15 @@
         </view>
       </view>
       <view class="top-tabs">
-        <view :class="['item', item.val == topTabsActive && 'tabs-active']" v-for="(item, index) in topTabBars" :key="item.Id" @click="topTabsChange(item)">
-          {{ item.Name }}
-          <block v-if="index === 2 && isShowChart">
-            <image class="limit-img tabs-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
-          </block>
-          <view class="active" v-if="item.Id == topTabsActive"></view>
-        </view>
+        <block v-for="(item, index) in topTabBars" :key="item.Id">
+          <view v-if="item.IsShow" :class="['item', item.val == topTabsActive && 'tabs-active']" @click="topTabsChange(item)">
+            {{ item.Name }}
+            <block v-if="index === 2 && isShowChart">
+              <image class="limit-img tabs-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
+            </block>
+            <view class="active" v-if="item.Id == topTabsActive"></view>
+          </view>
+        </block>
       </view>
       <view class="tabs-content">
         <view class="second-tabs" v-if="topTabsActive == '2' || topTabsActive == '3'">
@@ -70,7 +72,7 @@
             <view class="title text_twoLine">{{ item.Title }}</view>
             <view class="share">
               <view class="share-text" :style="[classifyColor(item.ChartPermissionName)]">
-                <image :src="classifyIcon(item.ChartPermissionName)"></image>
+                <image :src="classifyIcon(item)"></image>
                 {{ item.Type == 1 ? "音频" : "视频" }}｜{{ item.ChartPermissionName }}
               </view>
               <button class="share-icon" open-type="share" :data-item="item">
@@ -96,13 +98,13 @@
                           : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_group_index.png'
                       "
                     ></image>
-                    <text class="time">{{ report.MicroAudio.AudioTitle }}</text>
+                    <text class="time">{{ report.MicroAudio.AudioPublishTime }}</text>
                   </view>
                   <view class="title-share">
                     <view class="title text_twoLine">{{ report.MicroAudio.AudioTitle }}</view>
                     <view class="share">
                       <view class="share-text" :style="[classifyColor(report.MicroAudio.AudioChartPermissionName)]">
-                        <image :src="classifyIcon(report.MicroAudio.AudioChartPermissionName)"></image>
+                        <image :src="classifyIcon(report.MicroAudio)"></image>
                         音频｜{{ report.MicroAudio.AudioChartPermissionName }}
                       </view>
                       <button class="share-icon" open-type="share" :data-item="report.MicroAudio">
@@ -161,13 +163,13 @@
                           : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_group_index.png'
                       "
                     ></image>
-                    <text class="time">{{ report.MicroAudio.AudioTitle }}</text>
+                    <text class="time">{{ report.MicroAudio.AudioPublishTime }}</text>
                   </view>
                   <view class="title-share">
                     <view class="title text_twoLine">{{ report.MicroAudio.AudioTitle }}</view>
                     <view class="share">
                       <view class="share-text" :style="[classifyColor(report.MicroAudio.AudioChartPermissionName)]">
-                        <image :src="classifyIcon(report.MicroAudio.AudioChartPermissionName)"></image>
+                        <image :src="classifyIcon(report.MicroAudio)"></image>
                         音频｜{{ report.MicroAudio.AudioChartPermissionName }}
                       </view>
                       <button class="share-icon" open-type="share" :data-item="report">
@@ -628,7 +630,7 @@ export default {
           item.Type == 1 || item.AudioType == 1 ? this.audioPlayBack(content_item ? content_item : item) : this.handelVideoPlay(item);
         } else {
           this.hasPermission = item.AuthInfo.HasPermission;
-          this.jurisdictionList.ActivityId = item.Type == 1 ? item.ActivityId : item.Id;
+          this.jurisdictionList.ActivityId = item.Id;
           this.jurisdictionList.isAudioVideo = item.Type;
           if (this.hasPermission == 2) {
             this.jurisdictionList.SellerMobile = item.AuthInfo.SellerMobile;
@@ -650,9 +652,9 @@ export default {
       this.videoPlayTime = item.PlaySeconds;
       this.globalBgAudioManager.stop();
       setTimeout(() => {
-        this.videoContext = wx.createVideoContext(item.toString());
+        this.videoContext = wx.createVideoContext(item.Id.toString());
       }, 300);
-      Home.microAideoHistoryAdd({ VideoId: item.Id });
+      Home.microAideoHistoryAdd({ VideoId: item.Id, PlaySeconds: 0 });
     },
     //音频的播放事件
     async audioPlayBack(item) {
@@ -685,7 +687,9 @@ export default {
     },
     //音视频的图标
     classifyIcon(item) {
-      return MultimediaIcon.find((key) => key.name == item).audio;
+      let srcItem = MultimediaIcon.find((key) => key.name == (item.AudioChartPermissionName || item.ChartPermissionName));
+      let imgSrc = item.Type == 1 || item.AudioType == 1 ? srcItem.audio : srcItem.video;
+      return imgSrc;
     },
     //获取顶部导航
     async getHeaderTab() {
@@ -699,6 +703,13 @@ export default {
     this.$store.commit("audioBg/parseIntAudio", false);
     this.curVideoId = 0;
   },
+  mounted() {
+    uni.$on("updateAudioVideo", (data) => {
+      console.log("执行了");
+      this.$store.dispatch("checkHandle", "noGO");
+      this.getReportList();
+    });
+  },
   /* 下拉刷新 */
   onPullDownRefresh: Throttle(function () {
     this.audioShareId = "";
@@ -722,9 +733,12 @@ export default {
       let item = target.dataset.item;
       let audio_id = item.Type == 1 || item.AudioType == 1 ? item.Id : "";
       let video_id = item.Type == 2 ? item.Id : "";
+      console.log(item);
+      let title_share = item.AudioTitle || item.Title;
       return {
-        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "您手边的弘则研究素材检索库",
+        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
         path: "/pages/index/index?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id,
+        imageUrl: item.AudioShareImg || item.ShareImg,
       };
     } else {
       return {