bd0716 2 лет назад
Родитель
Сommit
3af5e9b07c

+ 68 - 12
activityPages/activityDetail/activityDetail.vue

@@ -14,9 +14,6 @@
           <view v-if="detailData.ActivityName" class="dialog-title" :class="1 == 1 ? 'brackets-title' : ''">{{ detailData.ActivityName }}</view>
           <block v-if="detailData.FileType == 1">
             <view class="audio-card" v-if="detailData.VoiceList && detailData.VoiceList.Url">
-              <view class="card-title text_oneLine">
-                {{ detailData.VoiceList.Name }}
-              </view>
               <view class="slider-paly">
                 <view style="flex: 1; padding-top: 20rpx">
                   <slider
@@ -55,6 +52,14 @@
                 </block>
                 <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
               </view>
+              <view class="card-title text_twoLine">
+                {{ detailTitle(detailData.VoiceList.Name) }}
+                <view class="title-image">
+                  <image @click="myLeavingMessageHandler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
+                  <image @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png"></image>
+                  <!-- <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png"></image> -->
+                </view>
+              </view>
             </view>
           </block>
           <block v-if="detailData.FileType == 2">
@@ -72,7 +77,12 @@
                 @timeupdate="handleVideoTimeUpdate"
               ></video>
               <view class="title text_twoLine">
-                {{ detailData.VideoDetail.Title }}
+                {{ detailTitle(detailData.VideoDetail.Title) }}
+                <view class="title-image">
+                  <image @click="myLeavingMessageHandler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/leaving_message.png"></image>
+                  <image @click="isCollectionHandeler(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/not_collected.png"></image>
+                  <!-- <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/collected_icon.png"></image> -->
+                </view>
               </view>
             </view>
           </block>
@@ -569,7 +579,6 @@ 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);
@@ -607,7 +616,6 @@ export default {
     loadedmetadataHandle() {
       this.videoContext = wx.createVideoContext(this.detailData.ActivityId.toString(), this);
       let curVideoTime = 0;
-      console.log(this.activityVideoId, this.detailData.ActivityId);
       if (this.activityVideoId == this.detailData.ActivityId) {
         curVideoTime = this.$store.state.videoPlay.palyCurrentTime;
       } else {
@@ -632,6 +640,12 @@ export default {
       }
       this.isVideoPlay = true;
     },
+    // 标题超出省略...
+    detailTitle(val) {
+      console.log(val.length);
+      let str = val.length > 41 ? val.slice(0, 41) + "..." : val;
+      return str;
+    },
   },
   async onLoad(option) {
     this.id = option.id || "";
@@ -912,9 +926,10 @@ export default {
 
   .audio-card {
     width: 100%;
-    height: 282rpx;
-    background: #f9f9f9;
-    border-radius: 16rpx;
+    height: 334rpx;
+    background: #fff;
+    box-shadow: 0px 3rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
+    border-radius: 8rpx;
     margin: 0 auto;
     padding: 30rpx;
     padding-left: 30rpx;
@@ -932,10 +947,12 @@ export default {
       padding-left: 20rpx;
     }
     .card-title {
+      margin-top: 20rpx;
       font-size: 28rpx;
-      padding: 0 40rpx;
-      text-align: center;
-      margin-bottom: 35rpx;
+      padding: 15rpx 0 0 15rpx;
+      line-height: 44rpx;
+      height: 100rpx;
+      position: relative;
     }
     .card-time {
       display: flex;
@@ -943,6 +960,20 @@ export default {
       color: #999999;
       font-size: 20rpx;
     }
+    .title-image {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      width: 150rpx;
+      height: 40rpx;
+      padding-left: 15rpx;
+      display: flex;
+      justify-content: space-between;
+      image {
+        width: 40rpx;
+        height: 40rpx;
+      }
+    }
     .is-paly-card {
       width: 70rpx;
       height: 70rpx;
@@ -990,6 +1021,31 @@ export default {
     }
     .title {
       padding: 15rpx 0 0 15rpx !important;
+      font-size: 28rpx;
+      line-height: 44rpx;
+      height: 100rpx;
+      position: relative;
+      .title-flat {
+        float: right;
+        width: 150rpx;
+        height: 40rpx;
+        margin-top: -36rpx;
+        background-color: #f00;
+      }
+      .title-image {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 150rpx;
+        height: 40rpx;
+        padding-left: 15rpx;
+        display: flex;
+        justify-content: space-between;
+        image {
+          width: 40rpx;
+          height: 40rpx;
+        }
+      }
     }
   }
 }

+ 2 - 0
activityPages/components/selectMixins.js

@@ -123,6 +123,7 @@ export default {
       item.IsChoose = !item.IsChoose;
       let val = this.obtainSelectId(this.activityMonthWeekList);
       this.dataActiveId = val;
+      this.getActivityList();
     },
 
     // 今日、明日、专家、分析师的筛选
@@ -133,6 +134,7 @@ export default {
       item.IsChoose = !item.IsChoose;
       let val = this.obtainSelectId(type == "类型" ? this.activityTypeList : this.activityTimeList);
       type == "类型" ? (this.selectActiveId = val) : (this.whichDay = val);
+      this.getActivityList();
     },
 
     // 获取筛选后的id

+ 20 - 6
activityPages/endActivity/endActivity.vue

@@ -23,32 +23,42 @@
             </van-dropdown-item>
           </van-dropdown-menu>
         </view>
-        <text @click="selectMultipleHandler(item,'类型')" v-for="item in activityTypeList" :key="item.Id" :class="['select-item-multiple', item.IsChoose && 'active']">{{ item.StatusName }}</text>
+        <text @click="selectMultipleHandler(item, '类型')" v-for="item in activityTypeList" :key="item.Id" :class="['select-item-multiple', item.IsChoose && 'active']">{{ item.StatusName }}</text>
       </view>
       <view class="screen-item screen-item-ul">
         <text @click="monthWeekHandler(item)" v-for="item in activityMonthWeekList" :key="item.Id" :class="['text-item', item.IsChoose && 'active']">{{ item.StatusName }}</text>
       </view>
     </view>
     <view class="content-ul">
-      <text @click="goThemeActivity(item)" class="item-text" v-for="item in dataList" :key="item">{{ item }}</text>
+      <text @click="goThemeActivity(item)" class="item-text" v-for="item in dataList" :key="item.ActivityId">{{ item.KeyWord }}</text>
     </view>
   </view>
 </template>
 
 <script>
 import selectMixins from "../components/selectMixins.js";
-
+import { activity } from "@/config/api";
 export default {
   mixins: [selectMixins],
   data() {
     return {
       dateType: "", //日期的类型
       selectMultipleType: "", // 筛选的类型
-      dataList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20],
+      dataList: [],
     };
   },
   methods: {
-    getActivityList() {},
+    async getActivityList() {
+      const res = await activity.activityOverActivityList({
+        WhichDay: this.dataActiveId,
+        TypeName: this.selectActiveId,
+        IsPower: this.isGetJurisdiction,
+      });
+      if (res.Ret === 200) {
+        this.dataList = res.Data.List || [];
+        console.log(res);
+      }
+    },
 
     // 跳转到主题详情
     goThemeActivity(item) {
@@ -58,10 +68,14 @@ export default {
         select_activeId: this.selectActiveId,
       };
       uni.navigateTo({
-        url: "/activityPages/themeActivity/themeActivity?title=" + "血液灌流器" + "&id=" + 1789 + "&endList=" + JSON.stringify(obj),
+        url: "/activityPages/themeActivity/themeActivity?title=" + item.KeyWord + "&id=" + item.ActivityId + "&endList=" + JSON.stringify(obj),
       });
     },
   },
+  onLoad() {
+    console.log(132321);
+    this.getActivityList();
+  },
 };
 </script>
 

+ 28 - 362
config/api.js

@@ -1,5 +1,12 @@
 import { baseUrl } from "./config.js";
 import { getHttp, postHttp } from "./request.js";
+import { Reports } from "./modules/Reports";
+import { activity } from "./modules/activity";
+import { Home } from "./modules/Home";
+import { User } from "./modules/User";
+import { Report } from "./modules/ReportArticle";
+
+export { Reports, activity, Home, User, Report };
 
 /* 上传 */
 export const uploadurl = baseUrl + "/resource/image/upload";
@@ -7,136 +14,7 @@ export const uploadurl = baseUrl + "/resource/image/upload";
 export const checkToken = (params) => {
   return getHttp("/user/check/status", params, 0);
 };
-/*  */
-export const Report = {
-  /* 报告详情  ArticleId */
-  reportDtl: (params) => {
-    return getHttp("/article/detail", params);
-  },
-  /* 报告详情  ArticleId */
-  reportDtlTwo: (params) => {
-    return getHttp("/tactics/detail", params);
-  },
-  /* 收藏 ArticleId*/
-  collectRpt: (params) => {
-    return postHttp("/article/collect", params, 0);
-  },
-  /* 申请访谈 ArticleId*/
-  applyRpt: (params) => {
-    return postHttp("/article/interview/apply", params, 0);
-  },
-  /* 新增文章带问接口 ArticleId*/
-  articleAskAdd: (params) => {
-    return postHttp("/article/askAdd", params, 0);
-  },
-  /* 下载PDF打水印接口*/
-  articlePdfwatermark: (params) => {
-    return getHttp("/article/pdfwatermark", params, 1);
-  },
-  /* 报告搜索、资源包搜索接口*/
-  getSearchReportAndResource: (params) => {
-    return getHttp("/report/searchReportAndResource", params, 1);
-  },
-};
-
-/* 用户 */
-export const User = {
-  /* 
-		微信登录  Code  
-  */
-  wechatLog: (params) => {
-    return getHttp("/wechat/login", params, 0);
-  },
-  /* 获取手机验证码  Mobile * AreaNum */
-  getPhoneCode: (params) => {
-    return getHttp("/wechat/getSmsCode", params);
-  },
-  /* 获取邮件验证码  Email */
-  getEmailCode: (params) => {
-    return getHttp("/wechat/getEmailCode", params);
-  },
-  /* 
-		传输uid   
-		"EncryptedData": "string",
-	   "Iv": "string",
-	   "RawData": "string",
-	   "Signature": "string"
-	 */
-  sendInfo: (params) => {
-    return postHttp("/wechat/getUserInfo", params, 0);
-  },
-  /* 获取手机号  "EncryptedData": "string","Iv": "string"*/
-  getPhoneNum: (params) => {
-    return postHttp("/wechat/getPhoneNumber", params);
-  },
-  /* 
-	登录 绑定手机号邮箱
-	"Email": "string",
-	 "LoginType": 0 1手机号 2邮箱,
-	 "Mobile": "string"
-	 */
-  Bind: (params) => {
-    return postHttp("/user/login", params);
-  },
-  /* 
-	 申请试用
-		 ApplyMethod:
-		 1:已付费客户申请试用,2:非客户申请试用 3未付费
-		 BusinessCardUrl
-		 CompanyName
-		 RealName
-	 */
-  applyTry: (params) => {
-    return postHttp("/user/apply/try", params, 0);
-  },
-  //获取是否需要填写区号接口
-  countryCcode: (params) => {
-    return getHttp("/user/countryCcode/isNeedAdd", params, 0);
-  },
-  //上传用户区号接口
-  countryCcodeAdd: (params) => {
-    return postHttp("/user/countryCcode/Add", params, 0);
-  },
-  //上传页面访问统计
-  pageHistory: (params) => {
-    return postHttp("/config/pageHistory", params, 0);
-  },
-  //我的提问
-  getAskList: (params) => {
-    return getHttp("/user/ask/list");
-  },
-  //更改用户微信头像
-  headimgurlUpdate: (params) => {
-    return postHttp("/user/headimgurl/update", params);
-  },
-};
 
-/* 首页 */
-export const Home = {
-  /* 
-	列表
-	PageSize * CurrentIndex * ChartPermissionId *品类id,最新传0
-	*/
-  getList: (params) => {
-    return getHttp("/home/artAndChart/list", params);
-  },
-  /* 获取品种 */
-  Tab: (params) => {
-    return getHttp("/permission/all", params, 0);
-  },
-  /* 首页-顶部导航 */
-  headerTab: (params) => {
-    return getHttp("/home/header_tab", params, 0);
-  },
-  /* 微路演列表 */
-  microRoadshowList: (params) => {
-    return getHttp("/micro_roadshow/list", params, 0);
-  },
-  /* 新增视频播放记录 */
-  microAideoHistoryAdd: (params) => {
-    return postHttp("/micro_roadshow/videoHistory/add", params, 0);
-  },
-};
 /* 个人中心 */
 export const Mine = {
   /* 我的收藏列表 PageSize CurrentIndex  */
@@ -179,222 +57,31 @@ export const Search = {
     return getHttp("/search/artAndChart/listPage", params, 0);
   },
 };
-
-/* 报告  */
-export const Reports = {
-  /* 获取报告一级分类 */
-  getClassify: (params) => {
-    return getHttp("/permission/reportallV7", params, 0);
-  },
-  /* 获取策略的分类 */
-  getstrategyAll: (params) => {
-    return getHttp("/permission/strategyAll", params);
-  },
-  /* 获取策略的文章 */
-  getTacticsList: (params) => {
-    return getHttp("/tactics/list", params);
-  },
-  /* 获取产业报告分类列表接口*/
-  getTradeList: (params) => {
-    return getHttp("/report/home/tradeList", params, 0);
-  },
-  /* 报告搜索接口*/
-  getReportSearchReport: (params) => {
-    return getHttp("/report/searchReport", params, 0);
-  },
-
-  /* 获取产业报告分类列表接口*/
-  getIndustryList: (params) => {
-    return getHttp("/report/home/industryList", params, 0);
-  },
-  /* 获取产业文章列表接口*/
-  getIndustryAndArticle: (params) => {
-    return getHttp("/report/searchResource", params, 0);
-  },
-  /* 是否置顶*/
-  postToptt: (params) => {
-    return postHttp("/report/top", params, 0);
-  },
-  /* 是否置顶*/
-  reportFllow: (params) => {
-    return postHttp("/report/fllow", params, 0);
-  },
-  /* 是否置顶*/
-  industryListByDepartment: (params) => {
-    return getHttp("/report/industryListByDepartment", params, 0);
-  },
-  /* 获取产业文章列表接口*/
-  industryReportList: (params) => {
-    return getHttp("/report/industry/reportList", params);
-  },
-  /* 关注作者/取消关注作者 接口*/
-  reportFllowDepartment: (params) => {
-    return postHttp("/report/fllowDepartment", params, 0);
-  },
-  /* 获取策略列表接口*/
-  getTactics: (params) => {
-    return getHttp("/tactics/list", params);
-  },
-  /* 产业下所关联的文章分类列表接口*/
-  toArticleCategoryList: (params) => {
-    return getHttp("/report/toArticleCategoryList", params);
-  }, //
-  /* 产业下所关联的文章分类列表接口*/
-  getArticleList: (params) => {
-    return getHttp("/report/industry/ArticleList", params);
-  },
-  /*上传文章阅读时间接口*/
-  addStopTime: (params) => {
-    return postHttp("/article/addStopTime", params, 0);
-  },
-  /* 获取研选最新主题关键词文章列表接口*/
-  reportListNew: (params) => {
-    return getHttp("/report/industry/reportListNew", params);
-  },
-  /* 获取是否展示绝密内参接口*/
-  reportIsShow: (params) => {
-    return getHttp("/report/isShow", params);
-  },
-  /* 获取报告精选、本周研究汇总、上周纪要汇总列表接口*/
-  reportListByType: (params) => {
-    return getHttp("/report/reportList/byType", params);
-  },
-  /* 获取报告精选详情接口*/
-  reportSelectionDetail: (params) => {
-    return getHttp("/report/reportSelection/detail", params);
-  },
-  /* 获取本周研究汇总详情接口*/
-  researchSummaryDetail: (params) => {
-    return getHttp("/report/researchSummary/detail", params);
-  },
-  /* 获取上周研究汇总详情接口*/
-  minutesSummaryDetail: (params) => {
-    return getHttp("/report/minutesSummary/detailv4", params);
-  },
-  /* 获取报告详情接口 /  路演精华*/
-  roadshowEssence: (params) => {
-    return getHttp("/report/roadshowEssence/detail", params);
-  },
-  /* 报告榜单table栏*/
-  getHotTableList: (params) => {
-    return getHttp("/report_billboard/table/list", params);
-  },
-  /* 获取产业关注榜接口*/
-  getIndustryFllowList: (params) => {
-    return getHttp("/report_billboard/industry/fllowList", params);
-  },
-  /* 获取阅读飙升榜/报告收藏榜接口 */
-  getIndustryReadList: (params) => {
-    return getHttp("/report_billboard/industry/readList", params);
-  },
-  /* 产业报告公司列表 */
-  getHomeStockName: (params) => {
-    return getHttp("/report/home/stockName", params);
-  },
-};
-/* 活动  */
-export const activity = {
-  /* 获取活动列表接口*/
-  getActivityList: (params) => {
-    return getHttp("/activity/list", params);
-  },
-  /* 获取活动列表接口*/
-  getActivityDetail: (params) => {
-    return getHttp("/activity/detail", params);
-  },
-  /* 获取活动详情接口*/
-  getUserSearchContent: (params) => {
-    return getHttp("/activity/getUserSearchContent", params);
-  },
-  /* 活动报名接口*/
-  signupAdd: (params) => {
-    return postHttp("/activity/signup/add", params);
-  },
-  /* 活动取消报名接口*/
-  signupCancel: (params) => {
-    return postHttp("/activity/signup/cancel", params);
-  },
-  /* 获取活动列表接口*/
-  getScheduleList: (params) => {
-    return getHttp("/activity/scheduleList", params);
-  },
-  /* 活动取消报名接口*/
-  meetingReminderAdd: (params) => {
-    return postHttp("/activity/meetingReminder/add", params);
-  },
-  /* 取消消息提醒接口*/
-  meetingReminderCancel: (params) => {
-    return postHttp("/activity/meetingReminder/cancel", params);
-  },
-  /* 获取敏捷搜索关键词的列表接口*/
-  fastSearchKeWord: (params) => {
-    return getHttp("/activity/labelMoreList", params);
-  },
-  /*用户修改外呼手机号以及区号接口*/
-  addOutboundMobile: (params) => {
-    return postHttp("/user/countryCcode/addOutboundMobile", params);
-  },
-  /*新增活动带问接口*/
-  activityAskAdd: (params) => {
-    return postHttp("/activity/askAdd", params);
-  },
-  /*获取研选说明接口*/
-  descriptionOfResearch: (params) => {
-    return getHttp("/config/descriptionOfResearch", params);
-  },
-  /*获取主题活动接口*/
-  getActivityListNew: (params) => {
-    return getHttp("/activity/listNew", params);
-  },
-  /*获取主题活动接口*/
-  getActivityListSearch: (params) => {
-    return getHttp("/activity/listSearch", params);
-  },
-  /*获取活动类型下的主题列表接口(4.3版本)*/
-  getActivityLabelTypeList: (params) => {
-    return getHttp("/activity/labelTypeListV5", params);
-  },
-  /* 校验活动带问是否有权限接口 */
-  checkAskActivity: (params) => {
-    return postHttp("/activity/checkAsk", params, 0);
-  },
-  /*获取专项产业调研列表接口*/
-  getSpecialList: (params) => {
-    return getHttp("/activity_special/list", params);
-  },
-  /*获取专项产业调研列表接口*/
-  getSpecialDetailList: (params) => {
-    return getHttp("/activity_special/detail", params);
-  },
-  /*感兴趣、不感兴趣接口*/
-  postSpecialSignupAdd: (params) => {
-    return postHttp("/activity/special/signup/add", params);
-  },
-  /*获取专项产业调研列表接口*/
-  postSpecialFollow: (params) => {
-    return postHttp("/activity/special/follow", params);
-  },
-  /*预约纪要接口*/
-  postAppointmentAdd: (params) => {
-    return postHttp("/activity/appointment/add", params);
+/* 图标 */
+export const Chart = {
+  /*图表标签分类接口*/
+  getChartPatg: (params) => {
+    return getHttp("/chart/patg", params);
   },
-  /*取消预约纪要接口*/
-  postAppointmentCancel: (params) => {
-    return postHttp("/activity/appointment/cancel", params);
+  /*我的收藏接口*/
+  getChartcollection: (params) => {
+    return getHttp("/chart/my/collection", params);
   },
-  //背景音频开始播放
-  backAudioPlay: (params) => {
-    return postHttp("/activity/voiceHistory/add", params, 0);
+  /*删除我的收藏接口*/
+  myChartCollect: (params) => {
+    return postHttp("/chart/collect", params);
   },
-  //专项产业报名取消报名接口
-  activityApecialAdd: (params) => {
-    return postHttp("/activity_special/add", params, 0);
+  /*图表的详情*/
+  myChartDetail: (params) => {
+    return getHttp("/chart/detail", params);
   },
-  //专项产业取消报名接口
-  activityApecialCancel: (params) => {
-    return postHttp("/activity_special/trip/cancel", params, 0);
+  /*图表的详情*/
+  myChartTop: (params) => {
+    return postHttp("/chart/top", params);
   },
 };
+
+/* 研选 */
 export const Research = {
   /* 近期更新主题列表接口 */
   researchNewList: (params) => {
@@ -425,6 +112,8 @@ export const Research = {
     return getHttp("/research/hotKeyWord", params, 0);
   },
 };
+
+/* 免费送月卡 */
 export const FreeButton = {
   /*获取是否展示免费试用按钮接口*/
   userIsShowFreeButton: (params) => {
@@ -447,26 +136,3 @@ export const FreeButton = {
     return postHttp("/wechat/shareImage", params, 0);
   },
 };
-
-export const Chart = {
-  /*图表标签分类接口*/
-  getChartPatg: (params) => {
-    return getHttp("/chart/patg", params);
-  },
-  /*我的收藏接口*/
-  getChartcollection: (params) => {
-    return getHttp("/chart/my/collection", params);
-  },
-  /*删除我的收藏接口*/
-  myChartCollect: (params) => {
-    return postHttp("/chart/collect", params);
-  },
-  /*图表的详情*/
-  myChartDetail: (params) => {
-    return getHttp("/chart/detail", params);
-  },
-  /*图表的详情*/
-  myChartTop: (params) => {
-    return postHttp("/chart/top", params);
-  },
-};

+ 29 - 0
config/modules/Home.js

@@ -0,0 +1,29 @@
+import { getHttp, postHttp } from "../request.js";
+
+
+/* 首页 */
+export const Home = {
+    /* 
+      列表
+      PageSize * CurrentIndex * ChartPermissionId *品类id,最新传0
+      */
+    getList: (params) => {
+      return getHttp("/home/artAndChart/list", params);
+    },
+    /* 获取品种 */
+    Tab: (params) => {
+      return getHttp("/permission/all", params, 0);
+    },
+    /* 首页-顶部导航 */
+    headerTab: (params) => {
+      return getHttp("/home/header_tab", params, 0);
+    },
+    /* 微路演列表 */
+    microRoadshowList: (params) => {
+      return getHttp("/micro_roadshow/list", params, 0);
+    },
+    /* 新增视频播放记录 */
+    microAideoHistoryAdd: (params) => {
+      return postHttp("/micro_roadshow/videoHistory/add", params, 0);
+    },
+  };

+ 33 - 0
config/modules/ReportArticle.js

@@ -0,0 +1,33 @@
+import { getHttp, postHttp } from "../request.js";
+
+/* 报告文章 */
+export const Report = {
+  /* 报告详情  ArticleId */
+  reportDtl: (params) => {
+    return getHttp("/article/detail", params);
+  },
+  /* 报告详情  ArticleId */
+  reportDtlTwo: (params) => {
+    return getHttp("/tactics/detail", params);
+  },
+  /* 收藏 ArticleId*/
+  collectRpt: (params) => {
+    return postHttp("/article/collect", params, 0);
+  },
+  /* 申请访谈 ArticleId*/
+  applyRpt: (params) => {
+    return postHttp("/article/interview/apply", params, 0);
+  },
+  /* 新增文章带问接口 ArticleId*/
+  articleAskAdd: (params) => {
+    return postHttp("/article/askAdd", params, 0);
+  },
+  /* 下载PDF打水印接口*/
+  articlePdfwatermark: (params) => {
+    return getHttp("/article/pdfwatermark", params, 1);
+  },
+  /* 报告搜索、资源包搜索接口*/
+  getSearchReportAndResource: (params) => {
+    return getHttp("/report/searchReportAndResource", params, 1);
+  },
+};

+ 115 - 0
config/modules/Reports.js

@@ -0,0 +1,115 @@
+import { getHttp, postHttp } from "../request.js";
+
+
+/* 报告  */
+export const Reports = {
+    /* 获取报告一级分类 */
+    getClassify: (params) => {
+      return getHttp("/permission/reportallV7", params, 0);
+    },
+    /* 获取策略的分类 */
+    getstrategyAll: (params) => {
+      return getHttp("/permission/strategyAll", params);
+    },
+    /* 获取策略的文章 */
+    getTacticsList: (params) => {
+      return getHttp("/tactics/list", params);
+    },
+    /* 获取产业报告分类列表接口*/
+    getTradeList: (params) => {
+      return getHttp("/report/home/tradeList", params, 0);
+    },
+    /* 报告搜索接口*/
+    getReportSearchReport: (params) => {
+      return getHttp("/report/searchReport", params, 0);
+    },
+  
+    /* 获取产业报告分类列表接口*/
+    getIndustryList: (params) => {
+      return getHttp("/report/home/industryList", params, 0);
+    },
+    /* 获取产业文章列表接口*/
+    getIndustryAndArticle: (params) => {
+      return getHttp("/report/searchResource", params, 0);
+    },
+    /* 是否置顶*/
+    postToptt: (params) => {
+      return postHttp("/report/top", params, 0);
+    },
+    /* 是否置顶*/
+    reportFllow: (params) => {
+      return postHttp("/report/fllow", params, 0);
+    },
+    /* 是否置顶*/
+    industryListByDepartment: (params) => {
+      return getHttp("/report/industryListByDepartment", params, 0);
+    },
+    /* 获取产业文章列表接口*/
+    industryReportList: (params) => {
+      return getHttp("/report/industry/reportList", params);
+    },
+    /* 关注作者/取消关注作者 接口*/
+    reportFllowDepartment: (params) => {
+      return postHttp("/report/fllowDepartment", params, 0);
+    },
+    /* 获取策略列表接口*/
+    getTactics: (params) => {
+      return getHttp("/tactics/list", params);
+    },
+    /* 产业下所关联的文章分类列表接口*/
+    toArticleCategoryList: (params) => {
+      return getHttp("/report/toArticleCategoryList", params);
+    }, //
+    /* 产业下所关联的文章分类列表接口*/
+    getArticleList: (params) => {
+      return getHttp("/report/industry/ArticleList", params);
+    },
+    /*上传文章阅读时间接口*/
+    addStopTime: (params) => {
+      return postHttp("/article/addStopTime", params, 0);
+    },
+    /* 获取研选最新主题关键词文章列表接口*/
+    reportListNew: (params) => {
+      return getHttp("/report/industry/reportListNew", params);
+    },
+    /* 获取是否展示绝密内参接口*/
+    reportIsShow: (params) => {
+      return getHttp("/report/isShow", params);
+    },
+    /* 获取报告精选、本周研究汇总、上周纪要汇总列表接口*/
+    reportListByType: (params) => {
+      return getHttp("/report/reportList/byType", params);
+    },
+    /* 获取报告精选详情接口*/
+    reportSelectionDetail: (params) => {
+      return getHttp("/report/reportSelection/detail", params);
+    },
+    /* 获取本周研究汇总详情接口*/
+    researchSummaryDetail: (params) => {
+      return getHttp("/report/researchSummary/detail", params);
+    },
+    /* 获取上周研究汇总详情接口*/
+    minutesSummaryDetail: (params) => {
+      return getHttp("/report/minutesSummary/detailv4", params);
+    },
+    /* 获取报告详情接口 /  路演精华*/
+    roadshowEssence: (params) => {
+      return getHttp("/report/roadshowEssence/detail", params);
+    },
+    /* 报告榜单table栏*/
+    getHotTableList: (params) => {
+      return getHttp("/report_billboard/table/list", params);
+    },
+    /* 获取产业关注榜接口*/
+    getIndustryFllowList: (params) => {
+      return getHttp("/report_billboard/industry/fllowList", params);
+    },
+    /* 获取阅读飙升榜/报告收藏榜接口 */
+    getIndustryReadList: (params) => {
+      return getHttp("/report_billboard/industry/readList", params);
+    },
+    /* 产业报告公司列表 */
+    getHomeStockName: (params) => {
+      return getHttp("/report/home/stockName", params);
+    },
+  };

+ 75 - 0
config/modules/User.js

@@ -0,0 +1,75 @@
+import { getHttp, postHttp } from "../request.js";
+
+
+/* 用户 */
+export const User = {
+    /* 
+          微信登录  Code  
+    */
+    wechatLog: (params) => {
+      return getHttp("/wechat/login", params, 0);
+    },
+    /* 获取手机验证码  Mobile * AreaNum */
+    getPhoneCode: (params) => {
+      return getHttp("/wechat/getSmsCode", params);
+    },
+    /* 获取邮件验证码  Email */
+    getEmailCode: (params) => {
+      return getHttp("/wechat/getEmailCode", params);
+    },
+    /* 
+          传输uid   
+          "EncryptedData": "string",
+         "Iv": "string",
+         "RawData": "string",
+         "Signature": "string"
+       */
+    sendInfo: (params) => {
+      return postHttp("/wechat/getUserInfo", params, 0);
+    },
+    /* 获取手机号  "EncryptedData": "string","Iv": "string"*/
+    getPhoneNum: (params) => {
+      return postHttp("/wechat/getPhoneNumber", params);
+    },
+    /* 
+      登录 绑定手机号邮箱
+      "Email": "string",
+       "LoginType": 0 1手机号 2邮箱,
+       "Mobile": "string"
+       */
+    Bind: (params) => {
+      return postHttp("/user/login", params);
+    },
+    /* 
+       申请试用
+           ApplyMethod:
+           1:已付费客户申请试用,2:非客户申请试用 3未付费
+           BusinessCardUrl
+           CompanyName
+           RealName
+       */
+    applyTry: (params) => {
+      return postHttp("/user/apply/try", params, 0);
+    },
+    //获取是否需要填写区号接口
+    countryCcode: (params) => {
+      return getHttp("/user/countryCcode/isNeedAdd", params, 0);
+    },
+    //上传用户区号接口
+    countryCcodeAdd: (params) => {
+      return postHttp("/user/countryCcode/Add", params, 0);
+    },
+    //上传页面访问统计
+    pageHistory: (params) => {
+      return postHttp("/config/pageHistory", params, 0);
+    },
+    //我的提问
+    getAskList: (params) => {
+      return getHttp("/user/ask/list");
+    },
+    //更改用户微信头像
+    headimgurlUpdate: (params) => {
+      return postHttp("/user/headimgurl/update", params);
+    },
+  };
+  

+ 110 - 0
config/modules/activity.js

@@ -0,0 +1,110 @@
+import { getHttp, postHttp } from "../request.js";
+
+/* 活动  */
+export const activity = {
+    /* 获取活动列表接口*/
+    getActivityList: (params) => {
+      return getHttp("/activity/list", params);
+    },
+    /* 获取活动列表接口*/
+    getActivityDetail: (params) => {
+      return getHttp("/activity/detail", params);
+    },
+    /* 获取活动详情接口*/
+    getUserSearchContent: (params) => {
+      return getHttp("/activity/getUserSearchContent", params);
+    },
+    /* 活动报名接口*/
+    signupAdd: (params) => {
+      return postHttp("/activity/signup/add", params);
+    },
+    /* 活动取消报名接口*/
+    signupCancel: (params) => {
+      return postHttp("/activity/signup/cancel", params);
+    },
+    /* 获取活动列表接口*/
+    getScheduleList: (params) => {
+      return getHttp("/activity/scheduleList", params);
+    },
+    /* 活动取消报名接口*/
+    meetingReminderAdd: (params) => {
+      return postHttp("/activity/meetingReminder/add", params);
+    },
+    /* 取消消息提醒接口*/
+    meetingReminderCancel: (params) => {
+      return postHttp("/activity/meetingReminder/cancel", params);
+    },
+    /* 获取敏捷搜索关键词的列表接口*/
+    fastSearchKeWord: (params) => {
+      return getHttp("/activity/labelMoreList", params);
+    },
+    /*用户修改外呼手机号以及区号接口*/
+    addOutboundMobile: (params) => {
+      return postHttp("/user/countryCcode/addOutboundMobile", params);
+    },
+    /*新增活动带问接口*/
+    activityAskAdd: (params) => {
+      return postHttp("/activity/askAdd", params);
+    },
+    /*获取研选说明接口*/
+    descriptionOfResearch: (params) => {
+      return getHttp("/config/descriptionOfResearch", params);
+    },
+    /*获取主题活动接口*/
+    getActivityListNew: (params) => {
+      return getHttp("/activity/listNew", params);
+    },
+    /*获取主题活动接口*/
+    getActivityListSearch: (params) => {
+      return getHttp("/activity/listSearch", params);
+    },
+    /*获取活动类型下的主题列表接口(4.3版本)*/
+    getActivityLabelTypeList: (params) => {
+      return getHttp("/activity/labelTypeListV5", params);
+    },
+    /* 校验活动带问是否有权限接口 */
+    checkAskActivity: (params) => {
+      return postHttp("/activity/checkAsk", params, 0);
+    },
+    /*获取专项产业调研列表接口*/
+    getSpecialList: (params) => {
+      return getHttp("/activity_special/list", params);
+    },
+    /*获取专项产业调研列表接口*/
+    getSpecialDetailList: (params) => {
+      return getHttp("/activity_special/detail", params);
+    },
+    /*感兴趣、不感兴趣接口*/
+    postSpecialSignupAdd: (params) => {
+      return postHttp("/activity/special/signup/add", params);
+    },
+    /*获取专项产业调研列表接口*/
+    postSpecialFollow: (params) => {
+      return postHttp("/activity/special/follow", params);
+    },
+    /*预约纪要接口*/
+    postAppointmentAdd: (params) => {
+      return postHttp("/activity/appointment/add", params);
+    },
+    /*取消预约纪要接口*/
+    postAppointmentCancel: (params) => {
+      return postHttp("/activity/appointment/cancel", params);
+    },
+    //背景音频开始播放
+    backAudioPlay: (params) => {
+      return postHttp("/activity/voiceHistory/add", params, 0);
+    },
+    //专项产业报名取消报名接口
+    activityApecialAdd: (params) => {
+      return postHttp("/activity_special/add", params, 0);
+    },
+    //专项产业取消报名接口
+    activityApecialCancel: (params) => {
+      return postHttp("/activity_special/trip/cancel", params, 0);
+    },
+    // 已结束活动列表
+    activityOverActivityList: (params) => {
+      return getHttp("/activity/overActivityList", params, 0);
+    },
+    
+  };

+ 107 - 8
pageMy/myCollection/myCollection.vue

@@ -8,9 +8,8 @@
     </view>
     <view class="collect-ul" v-if="haveData">
       <view class="audio-video-content" v-if="tabsActive == 2">
-        <view class="audio-item" v-for="item in videoAudioList" :key="item.Id">
+        <view class="audio-item" v-for="item in collectList" :key="item.Id">
           <view class="cover-item" :style="{ 'background-image': 'url(' + item.BackgroundImg + ')' }">
-            <!-- type:3 -- 产业视频 -->
             <block v-if="item.Type == 2 || item.Type == 3">
               <image class="img-bg" @click="handelPlay(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/play_icon_index.png"></image>
             </block>
@@ -80,12 +79,17 @@
       <text>暂时没有收藏的内容</text>
     </view>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
+    <view v-if="showAudioBox">
+      <audioModule :showAudioPop.sync="showAudioPop" />
+    </view>
+    <videoModule :showVideoPop="showVideoPop" :curVideoId="curVideoId" :videoPopList="videoPopList" />
   </view>
 </template>
 
 <script>
 import { Mine, Report, Home } from "@/config/api.js";
-import { Throttle } from "@/config/util.js";
+import videoModule from "@/components/videoModule/index";
+import audioModule from "@/components/audioModule/index";
 import freeCharge from "@/components/freeCharge";
 export default {
   data() {
@@ -108,6 +112,10 @@ export default {
         { name: "微路演", id: 2 },
       ],
       tabsActive: 1,
+      showAudioPop: false, //播放音频
+      curVideoId: 0, //音频Id
+      showVideoPop: false,
+      videoPopList: {},
     };
   },
   onLoad() {
@@ -115,6 +123,8 @@ export default {
   },
   components: {
     freeCharge,
+    audioModule,
+    videoModule,
   },
   methods: {
     /* 获取列表 */
@@ -190,20 +200,108 @@ export default {
       this.collectList = [];
       this.getCollectList();
     },
+
+    //播放的权限判断
+    handelPlay(item) {
+      let content_item = null;
+      if (item.AudioActivityId) {
+        content_item = {
+          ActivityId: item.AudioActivityId,
+          PlaySeconds: item.AudioPlaySeconds,
+          ResourceUrl: item.AudioResourceUrl,
+          Title: item.AudioTitle,
+          Type: item.AudioType,
+        };
+      }
+      if (!this.$store.state.isAuth && !this.$store.state.isBind) {
+        if (item.AuthInfo.HasPermission == 1) {
+          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.Id;
+          this.jurisdictionList.isAudioVideo = item.Type;
+          if (this.hasPermission == 2) {
+            this.jurisdictionList.SellerMobile = item.AuthInfo.SellerMobile;
+            this.jurisdictionList.SellerName = item.AuthInfo.SellerName;
+            this.jurisdictionList.PopupMsg = item.AuthInfo.PopupMsg;
+            this.isShowhasPermission = true;
+          } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
+            this.jurisdictionList.PopupMsg = item.AuthInfo.PopupMsg;
+            this.applyForIsShow = true;
+          }
+        }
+      } else {
+        this.$store.dispatch("checkHandle");
+      }
+    },
+
+    //视频的播放事件
+    handelVideoPlay(item) {
+      if (this.$store.state.videoPlay.playVideoId != item.Id) {
+        this.$store.commit("videoPlay/palyTimeUpdate", 0);
+        console.log(this.$store.state.videoPlay.palyCurrentTime);
+        this.$store.commit("videoPlay/playVideo", item.Id);
+      }
+      this.globalBgAudioManager.stop();
+      this.videoPopList = item;
+      this.showVideoPop = true;
+    },
+
+    //音频的播放事件
+    async audioPlayBack(item) {
+      this.curVideoId = 0;
+      this.$store.commit("audioBg/parseIntAudio", true);
+      // 判断是否为同一个音频
+      if (this.$store.state.audioBg.indexId == item.ActivityId) {
+        if (this.globalBgAudioManager.paused) {
+          this.globalBgAudioManager.play();
+        } else {
+          this.globalBgAudioManager.pause();
+        }
+      } else {
+        let VoiceList = {
+          Url: item.ResourceUrl,
+          Name: item.Title,
+          PlaySeconds: item.PlaySeconds,
+        };
+        this.$store.commit("audioBg/addAudio", { list: VoiceList, indexId: item.ActivityId, activityTitle: item.Title });
+      }
+      this.showAudioPop = true;
+    },
+  },
+  computed: {
+    curVoiceId() {
+      //当前正在播放的音频id
+      return this.$store.state.audioBg.indexId;
+    },
+    curAudioPaused() {
+      //当前音频是否暂停状态
+      return this.$store.state.audioBg.paused;
+    },
+    showAudioBox() {
+      return this.$store.state.audioBg.parseIntShow;
+    },
+  },
+  onShow() {
+    this.$store.commit("audioBg/parseIntAudio", true);
+  },
+  onHide() {
+    this.$store.commit("audioBg/parseIntAudio", false);
+    this.curVideoId = 0;
   },
   /* 触底 */
-  onReachBottom: Throttle(function () {
+  onReachBottom() {
     if (this.status === "nomore") return;
     this.status = "loading";
     this.page_no++;
     this.getCollectList();
-  }),
+  },
   /* 下拉刷新 */
-  onPullDownRefresh: Throttle(function () {
+  onPullDownRefresh() {
     this.page_no = 1;
     this.refresh = true;
     this.getCollectList();
-  }),
+  },
 };
 </script>
 
@@ -211,7 +309,7 @@ export default {
 .myCollection-container {
   background-color: #f7f7f7;
   .collect-ul {
-    padding: 4rpx 30rpx;
+    padding: 4rpx 30rpx 20rpx;
     .content-item {
       background-color: #fff;
       margin-top: 20rpx;
@@ -297,5 +395,6 @@ export default {
       font-weight: 500;
     }
   }
+  @import "@/components/audioVideo.scss";
 }
 </style>