bding hai 1 ano
pai
achega
3523d63178

+ 1 - 1
activityPages/generationAsk/generationAsk.vue

@@ -44,7 +44,7 @@ export default {
       const res =
         this.roadshow && this.type == "文章"
           ? await Home.microRoadshowAdd({
-              Id: Number(this.id),
+              SourceId: Number(this.id),
               Content: this.advice_content,
               SourceType: Number(this.roadshow),
               Title: this.roadshowTitle,

+ 16 - 12
components/ItemComponent/roadshowItem.vue

@@ -19,10 +19,14 @@
         ></image>
       </block>
       <text class="time">{{ list.PublishTime }}</text>
-      <view :class="['identification', list.Type != 1 && 'identification-video']"> </view>
+      <view :class="['identification', list.Type != 1 && list.Type != 4 && 'identification-video']"> </view>
       <image
         class="identification-img"
-        :src="list.Type == 1 ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/video-iocn.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/audio-icon.png'"
+        :src="
+          list.Type == 1 || list.Type == 4
+            ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/video-iocn.png'
+            : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/audio-icon.png'
+        "
       ></image>
     </view>
     <view class="title-share">
@@ -91,17 +95,17 @@ export default {
     async handelPlay(item) {
       await this.$store.dispatch("showLoginModal");
       let content_item = null;
-      if (item.AudioActivityId) {
+      if (item.SourceId) {
         content_item = {
-          ActivityId: item.AudioActivityId,
-          PlaySeconds: item.AudioPlaySeconds,
-          ResourceUrl: item.AudioResourceUrl,
-          Title: item.AudioTitle,
-          Type: item.AudioType,
+          ActivityId: item.SourceId,
+          PlaySeconds: item.PlaySeconds,
+          ResourceUrl: item.ResourceUrl,
+          Title: item.Title,
+          Type: item.Type,
         };
       }
       if (item.AuthInfo.HasPermission == 1) {
-        item.Type == 1 || item.AudioType == 1 ? this.audioPlayBack(content_item ? content_item : item) : this.handelVideoPlay(item);
+        item.Type == 1 || item.AudioType == 1 || item.Type == 4 ? this.audioPlayBack(content_item ? content_item : item) : this.handelVideoPlay(item);
       } else {
         this.hasPermission = item.AuthInfo.HasPermission;
         this.jurisdictionList.ActivityId = item.Id;
@@ -151,14 +155,14 @@ export default {
     //音视频的图标
     classifyIcon(item) {
       let srcItem = MultimediaIcon.find((key) => key.name == (item.AudioChartPermissionName || item.ChartPermissionName));
-      let imgSrc = item.Type == 1 || item.AudioType == 1 ? srcItem.audio : srcItem.video;
+      let imgSrc = item.Type == 1 || item.AudioType == 1 || item.Type == 4 ? srcItem.audio : srcItem.video;
       return imgSrc;
     },
     // 微路演留言
     async myLeavingMessageHandler(item) {
       await this.$store.dispatch("showLoginModal");
       uni.navigateTo({
-        url: "/activityPages/generationAsk/generationAsk?id=" + (item.Type == 3 ? item.Id : item.ActivityId) + "&type=文章&roadshow=" + item.Type + "&roadshowTitle=" + item.Title,
+        url: "/activityPages/generationAsk/generationAsk?id=" + item.SourceId + "&type=文章&roadshow=" + item.Type + "&roadshowTitle=" + item.Title,
       });
     },
 
@@ -168,7 +172,7 @@ export default {
     },
     // 跳转
     goDetails() {
-      console.log(this.list);
+      if (this.list.Type == 4) return;
       if (this.list.Type == 3) {
         // 跳转产业资源包
         uni.navigateTo({ url: "/reportPages/IndustryReport/IndustryReport?id=" + this.list.IndustryId });

+ 1 - 1
components/audioModule/index.vue

@@ -274,7 +274,7 @@ export default {
       if ((this.$store.state.audioBg.activityId || this.$store.state.audioBg.indexId) && this.palyTime >= 0) {
         activity.backAudioPlay({
           SourceId: recordList.SourceId || recordList.ActivityId,
-          SourceType: recordList.SourceId ? recordList.Type : 1,
+          SourceType: recordList.Type ? recordList.Type : 1,
           PlaySeconds: this.palyTime,
           PageRouter: this.$store.state.pageRouterReport,
         });

+ 0 - 1
pages/material/material.vue

@@ -331,7 +331,6 @@ export default {
           CurrentIndex: this.pageNum,
           SourceId: this.shareSourceId,
           SourceType: this.shareSourceType,
-          Filter: this.mediumActive,
           ChartPermissionIds: this.chartPermissionIds,
           SearchType: this.mediumActive,
         });

+ 0 - 1
pages/reportForm/index.scss

@@ -1,6 +1,5 @@
 .reportForm-container {
   background-color: $uni-bg-color;
-  overflow: hidden;
   .index-fixed {
     width: 750rpx;
     position: fixed;