cygx7.3 提测

activityPages/activityDetail/activityDetail.vue

@@ -19,7 +19,7 @@
             <slider activeColor="#3385FF" :max="detailData.VoiceList.PlaySeconds" :value="curTime" @change="handleAudioSliderChange($event)" block-size="16" class="slider" />
             <view class="card-time">
               <text class="time">{{ curTime | formatVoiceTime }}</text>
-              <text class="time">{{ detailData.VoiceList.PlaySeconds| formatVoiceTime }}</text>
+              <text class="time">{{ detailData.VoiceList.PlaySeconds | formatVoiceTime }}</text>
             </view>
             <view class="is-paly-card">
               <image
@@ -270,7 +270,6 @@ export default {
       mobileEdit: "", //外呼手机号
       goOnNextStep: "", //设置外呼号后弹出哪个
       mailboxBinding: false, //是否绑定邮箱
-      curTime: 0,
       play: false,
     };
   },
@@ -283,13 +282,17 @@ export default {
       //当前音频是否暂停状态
       return this.$store.state.audioBg.paused;
     },
+      curTime() {
+      //当前音频的播放时间
+      return this.$store.state.audioBg.curTime;
+    },
   },
   components: {
     modalDialog,
     jurisdiction,
     areaCode,
     freeCharge,
-    audioModule
+    audioModule,
   },
   watch: {
     haveAuth: {
@@ -323,7 +326,6 @@ export default {
             this.sellerName = res.Data.SellerName;
             this.msgType = res.Data.MsgType;
             if (res.Data.HasPermission == 1) {
-              console.log(res.Data);
               this.detailData = res.Data.Detail;
               let pages = getCurrentPages();
               let prevPage = pages[pages.length - 2];
@@ -461,40 +463,6 @@ export default {
         this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId);
       }
     },
-    //音频播放事件
-    listenAudio() {
-      console.log("设置监听事件");
-      this.globalBgAudioManager.onPlay(() => {
-        console.log("开始播放");
-        this.play = true;
-        this.$store.commit("audioBg/updateAudioPause", false);
-      });
-      this.globalBgAudioManager.onPause(() => {
-        console.log("音频暂停");
-        this.play = false;
-        this.$store.commit("audioBg/updateAudioPause", true);
-      });
-      this.globalBgAudioManager.onStop(() => {
-        console.log("音频停止");
-        this.$store.commit("audioBg/removeAudio");
-      });
-      this.globalBgAudioManager.onEnded(() => {
-        console.log("音频onEnded");
-        this.$store.commit("audioBg/removeAudio");
-      });
-      this.globalBgAudioManager.onError((e) => {
-        console.log("音频onError", e);
-        this.$store.commit("audioBg/removeAudio");
-        uni.showToast({
-          title: "音频播放错误",
-          icon: "none",
-        });
-      });
-      this.globalBgAudioManager.onTimeUpdate(() => {
-        this.curTime = parseInt(this.globalBgAudioManager.currentTime);
-        this.$store.commit("audioBg/updateAudioTime", this.curTime);
-      });
-    },
     //音频点击暂停播放
     audioPlayBack() {
       if (this.$store.state.audioBg.activityId == this.detailData.ActivityId) {
@@ -509,17 +477,14 @@ export default {
     },
     //拖动进度条
     handleAudioSliderChange(e) {
-      console.log(e,'eeeeeeee');
       const value = e.detail.value;
       this.globalBgAudioManager.seek(value);
     },
   },
-  onLoad(option) {
+  async onLoad(option) {
     this.id = option.id || "";
-    this.listenAudio();
-  },
-  async onShow() {
     await this.$store.dispatch("checkHandle");
+    // this.listenAudio()
     if (!this.$store.state.isAuth && !this.$store.state.isBind) {
       //已授权已绑定
       this.countryCcode(); //判断是否加区号

activityPages/activitySearch/activitySearch.vue

@@ -95,7 +95,7 @@
                 <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
               </view>
               <block v-if="item.ActiveState == 1">
-                <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
+                <view :class="['bottom-box', item.ActivityTypeId == 1 && item.IsLimitPeople == 0 && 'expert-item', item.City && 'city']">
                   <view class="city-img" v-if="item.City">
                     <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                     {{ item.City }}

activityPages/activitySearch/index.vue

@@ -1,637 +0,0 @@
-<template>
-  <view class="container activity-content">
-    <view class="top-content">
-      <!-- 搜索 -->
-      <view class="searchTarget-header" v-if="!dynamicName">
-        <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="clearIpt" />
-          <text class="line">|</text>
-          <text @click="searchHandle" style="color: #3385ff">搜索</text>
-        </view>
-      </view>
-      <!-- 选中的气泡主题 -->
-      <view class="dynamic-name" v-if="dynamicName">
-        <text>{{ dynamicName }}</text>
-        <icon type="clear" size="16" color="#E0E0E0" @click="clearDynamicName" />
-      </view>
-      <!-- 搜索历史 -->
-      <view class="search-cont-top" v-if="!isShowSearch && historySearchList.length">
-        <view class="cont-tit">
-          <text>搜索历史</text>
-          <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/empty_ico.png" class="empty_ico" @click="clearHistory"></image>
-        </view>
-        <view class="targetList">
-          <view class="target-item" v-for="(item, index) in historySearchList" :key="index" @click="chooseTarget(item)">{{ item }}</view>
-        </view>
-      </view>
-      <!-- 气泡主题list -->
-      <view class="dynamic-content" v-if="!isShowSearch">
-        <view class="target-title"> 推荐关键词： </view>
-        <view class="target-item">
-          <view class="target-ul target-left">
-            <view class="target-text" v-for="(item, index) in dynamicList" :key="index" v-if="index % 2 === 0">
-              <text @click="changeTarget(item.KeyWord)">
-                {{ item.KeyWord }}
-              </text>
-            </view>
-            <view class="lucency" style="width: 65rpx">
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/broadside-ico.png" mode=""></image>
-            </view>
-          </view>
-          <view class="target-ul target-right">
-            <view class="target-text" v-for="(item, index) in dynamicList" :key="index" v-if="index % 2 !== 0">
-              <text @click="changeTarget(item.KeyWord)">
-                {{ item.KeyWord }}
-              </text>
-            </view>
-            <view class="lucency" style="width: 35rpx">
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/broadside-ico.png" mode=""></image>
-            </view>
-          </view>
-        </view>
-      </view>
-      <!-- 各种状态选择 -->
-      <view class="select-conyent" v-if="isShowSearch && !dynamicName">
-        <van-dropdown-menu active-color="#333333">
-          <van-dropdown-item id="statusstate" :title="activeStateName" @close="closeTheWindow('statusstate')">
-            <view class="menu-items">
-              <view class="menu-items-box" @click="overallBtn('statusstate', key)" v-for="key in listActivityStaus" :key="key.Id">
-                <view class="items-box">
-                  <u-icon v-if="key.IsChoose" name="checkbox-mark" color="#2C83FF" size="24"></u-icon>
-                </view>
-                <text>{{ key.StatusName }}</text>
-              </view>
-            </view>
-            <view style="background-color: #f8f8fa; width: 100%">
-              <view style="margin: 0 auto; width: 682rpx; border-bottom: 2rpx solid #e5e5e5"> </view>
-            </view>
-            <view class="menu-items">
-              <view class="menu-items-box" @click="timeListBtn('statusstate', key)" v-for="key in activityTimeList" :key="key.Id">
-                <view class="items-box">
-                  <u-icon v-if="key.IsChoose" name="checkbox-mark" color="#2C83FF" size="24"></u-icon>
-                </view>
-                <text>{{ key.StatusName }}</text>
-              </view>
-            </view>
-            <view class="replacement-box">
-              <view class="replacement">
-                <text @click="replacementBtn('statusstate')" class="replacement-box">重置</text>
-                <text @click="replacementConfirm('statusstate')">确定</text>
-              </view>
-            </view>
-          </van-dropdown-item>
-          <van-dropdown-item id="industry" :title="chartPermissionName" @close="closeTheWindow('industry')">
-            <view class="decide">
-              <view class="items-box">
-                <u-icon v-if="isShowJurisdiction" name="checkbox-mark" color="#2C83FF" size="24"> </u-icon>
-              </view>
-              <text @click="isJurisdiction">始终只展示有权限的行业</text>
-            </view>
-            <view style="background-color: #f8f8fa; width: 100%">
-              <view style="margin: 0 auto; width: 682rpx; border-bottom: 2rpx solid #e5e5e5"> </view>
-            </view>
-            <view class="menu-items">
-              <view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick('industry', item)">
-                <view class="items-box">
-                  <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#2C83FF'" size="24"></u-icon>
-                </view>
-                <text>{{ item.PermissionName }}</text>
-              </view>
-            </view>
-            <view class="replacement">
-              <text @click="replacementBtn('industry')" class="replacement-box">重置</text>
-              <text @click="replacementConfirm('industry')">确定</text>
-            </view>
-          </van-dropdown-item>
-          <van-dropdown-item id="genre" :title="activityTypeName" @close="closeTheWindow('genre')">
-            <view class="menu-items">
-              <view class="menu-items-box" @click="overallActivity('genre', item)" v-for="item in listActivityType" :key="item.ActivityTypeId">
-                <view class="items-box">
-                  <u-icon v-if="item.IsChoose" name="checkbox-mark" color="#2C83FF" size="24"> </u-icon>
-                </view>
-                <text>{{ item.ActivityTypeName }}</text>
-              </view>
-            </view>
-            <view class="replacement">
-              <text @click="replacementBtn('genre')" class="replacement-box">重置</text>
-              <text @click="replacementConfirm('genre')">确定</text>
-            </view>
-          </van-dropdown-item>
-        </van-dropdown-menu>
-      </view>
-    </view>
-    <!-- 内容列表部分 -->
-    <!-- 活动列表 -->
-    <view v-if="haveData" class="activity-pages" :class="dynamicName ? 'activity-page' : ''">
-      <view class="collect-ul">
-        <view class="collect-ltem" v-for="(item, index) in collectList" :key="index">
-          <view class="title-date" @click="goDetail(item)">
-            <text :class="item.ActivityType == 1 ? '' : 'xianxia'">{{ item.ActivityType == 1 ? "线上" : "线下" }}</text>
-            {{ item.ActivityTimeText }}
-          </view>
-          <view class="item-li">
-            <view class="item-img" @click="goDetail(item)">
-              <image :src="item.ImgUrl"> </image>
-              <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
-              <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-              <text v-else class="img-status">已结束</text>
-              <view class="img-type">
-                <image :src="item.ImgUrlText" mode=""></image>
-              </view>
-            </view>
-            <view class="item">
-              <view class="item-text" @click="goDetail(item)">
-                <text class="activity-title"> {{ item.ActivityName }} </text>
-                <text class="text_twoLine" v-if="item.Expert">专家背景：{{ item.Expert }} </text>
-                <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾：{{ item.DistinguishedGuest }} </text>
-                <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
-              </view>
-              <block v-if="item.ActiveState == 1">
-                <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
-                  <view class="city-img" v-if="item.City">
-                    <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
-                    {{ item.City }}
-                  </view>
-                  <view style="display: flex">
-                    <text v-if="item.IsShowOutboundCall && item.ActivityTypeId == 1" class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                    <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-                    <text v-if="item.IsShowMeetingReminder" @click="meetingReminderAdd(item.ActivityId, item.IsCancelMeetingReminder)">
-                      {{ item.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
-                    </text>
-                    <view v-if="item.IsShowHelpSsk" style="width: 130rpx">
-                      <text @click="askingGo(item)">帮我带问</text>
-                    </view>
-                    <text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1" class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                    <block v-if="item.IsShowSignup">
-                      <block v-if="item.IsCClassMeeting">
-                        <text class="button" @click="signupIsAddOfCancel(item, 3, 'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
-                      </block>
-                      <block v-else>
-                        <text class="button" v-if="item.IsSignup !== 1" @click="wanttosignup(item.ActivityId)">我要报名</text>
-                        <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
-                      </block>
-                    </block>
-                  </view>
-                </view>
-              </block>
-              <block v-else>
-                <view class="bottom-box city" v-if="item.City">
-                  <view class="city-img">
-                    <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png" />
-                    {{ item.City }}
-                  </view>
-                </view>
-                <view class="bottom-box real-time" v-if="item.ActiveState == 2 && item.ActivityTypeId == 1">
-                  <text class="button" @click="askingGo(item, '提问')">实时提问</text>
-                </view>
-              </block>
-            </view>
-          </view>
-        </view>
-        <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage > 1" />
-      </view>
-    </view>
-    <!-- 缺审部分 -->
-    <view class="nodata" v-else>
-      <image src="https://hzstatic.hzinsights.com/cygx/czbk/act_search.png" mode="" class="nodata_ico"></image>
-      <text>未找到搜索结果</text>
-    </view>
-    <!-- 各种自定义弹框 -->
-    <modalDialog
-      :isShow="isShow"
-      :signupType="signupType"
-      :goFollow="goFollow"
-      :signupStatus="signupStatus"
-      :hasPermission="hasPermission"
-      :jurisdictionList="jurisdictionList"
-      :editIsShow="editIsShow"
-      :isCancelShow="isCancelShow"
-      :idTypeCancel="idTypeCancel"
-      @cancelShowBtn="cancelEnsure"
-      :countryCode="countryCode"
-      :mobileEdit="mobileEdit"
-      :goOnNextStep="goOnNextStep"
-      :isShowhasPermission="isShowhasPermission"
-      :applyForIsShow="applyForIsShow"
-      :mailboxBinding="mailboxBinding"
-    />
-    <!-- 选择区号弹出层 -->
-    <areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
-    <!-- 参会方式弹出层 -->
-    <view class="select-box">
-      <u-popup v-model="selectShow" mode="bottom">
-        <view style="color: #333333; font-size: 28rpxrpx">请选择参会方式</view>
-        <view style="color: #2c83ff" @click="signupAdd('id', 1)">预约外呼</view>
-        <view style="color: #2c83ff" @click="signupAdd('id', 2)">自主拨入</view>
-        <view style="color: #a9afb8" @click="selectShow = false">取消</view>
-      </u-popup>
-    </view>
-
-    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-  </view>
-</template>
-
-<script>
-import { activity, User } from "@/config/api.js";
-import { Throttle } from "@/config/util.js";
-import modalDialog from "@/components/modalDialog.vue";
-import areaCode from "@/activityPages/components/areaCode.vue";
-import myMixin from "../components/index.js";
-import myActivityMixin from "../components/indexActivity.js";
-import freeCharge from "@/components/freeCharge";
-let app = getApp({ allowDefault: true });
-export default {
-  data() {
-    return {
-      searchTxt: "",
-      isShowSearch: false,
-      status: "loadmore",
-      totalPage: "",
-      haveData: true,
-      activeState: "1,2,3", //活动进行状态
-      activeStateName: "全部状态",
-      selectShow: false,
-      dynamicList: [],
-      dynamicName: "",
-    };
-  },
-  mixins: [myMixin, myActivityMixin],
-  components: {
-    modalDialog,
-    areaCode,
-    freeCharge,
-  },
-  methods: {
-    //获取快捷主题
-    fastSearchKeWord() {
-      activity
-        .fastSearchKeWord({
-          ActiveState: this.activeState,
-          ActivityTypeIds: this.activityTypeIds,
-          ChartPermissionIds: this.chartPermissionIds,
-          WhichDay: this.activityTimeStatus,
-          Label: "More",
-        })
-        .then((res) => {
-          if (res.Ret !== 200) return;
-          this.dynamicList = res.Data.List || [];
-        });
-    },
-    //主题的点击事件
-    //点击了快捷主题
-    changeTarget(val) {
-      if (val) {
-        this.dynamicName = val;
-      }
-      if (this.isGain) {
-        this.empty();
-        this.getList();
-      }
-      this.getUserSearchContent();
-      this.isShowSearch = true;
-    },
-    //清除主题的点击事件
-    //清除了快捷主题
-    clearDynamicName() {
-      this.dynamicName = "";
-      this.searchTxt = "";
-      this.collectList = [];
-      this.haveData = true;
-      this.isShowSearch = false;
-    },
-    // 遍历
-    preserve() {
-      const arr = [];
-      const str = [];
-      this.listActivityStaus.forEach((item) => {
-        if (item.IsChoose) {
-          arr.push(item.Id);
-          str.push(item.StatusName);
-        }
-      });
-      if (str.length == this.listActivityStaus.length || str.length <= 0) {
-        this.activeStateName = "所有状态";
-      } else {
-        this.activeStateName = str.join(",");
-      }
-      this.activeState = arr.join(",");
-      const arrTwo = [];
-      this.activityTimeList.forEach((key) => {
-        if (key.IsChoose) {
-          arrTwo.push(key.Id);
-        }
-      });
-      this.activityTimeStatus = arrTwo.join(",");
-      const hyArr = [];
-      const hyStr = [];
-      this.listChartPermission.forEach((key) => {
-        if (key.IsChoose) {
-          hyArr.push(key.ChartPermissionId);
-          hyStr.push(key.PermissionName);
-        }
-      });
-      if ((hyStr.length == 6 && this.listChartPermission.length == 6) || hyStr.length <= 0) {
-        this.chartPermissionName = "所有行业";
-      } else {
-        this.chartPermissionName = hyStr.join(",");
-      }
-      this.chartPermissionIds = hyArr.join(",");
-      const lxArr = [];
-      const lxStr = [];
-      this.listActivityType.forEach((key) => {
-        if (key.IsChoose) {
-          lxArr.push(key.ActivityTypeId);
-          lxStr.push(key.ActivityTypeName);
-        }
-      });
-      if (lxStr.length == this.listActivityType.length || lxStr.length <= 0) {
-        this.activityTypeName = "所有类型";
-      } else {
-        this.activityTypeName = lxStr.join(",");
-      }
-      this.activityTypeIds = lxArr.join(",");
-      this.getList();
-    },
-    // 通过分享进来的下拉选择的状态、关联
-    shareOption() {
-      const arr = this.activeState.split(",").map((item) => item - 0);
-      this.listActivityStaus.forEach((item) => {
-        if (arr.indexOf(item.Id) !== -1) {
-          item.IsChoose = true;
-        } else {
-          item.IsChoose = false;
-        }
-      });
-      const arrTwo = this.activityTimeStatus.split(",").map((item) => item - 0);
-      this.activityTimeList.forEach((item) => {
-        if (arrTwo.indexOf(item.Id) !== -1) {
-          item.IsChoose = true;
-        } else {
-          item.IsChoose = false;
-        }
-      });
-      const hyarr = this.chartPermissionIds.split(",").map((item) => item - 0);
-      this.listChartPermission.forEach((key) => {
-        if (hyarr.indexOf(key.ChartPermissionId) !== -1) {
-          key.IsChoose = true;
-        } else {
-          key.IsChoose = false;
-        }
-      });
-      const lxarr = this.activityTypeIds.split(",").map((item) => item - 0);
-      this.listActivityType.forEach((key) => {
-        if (lxarr.indexOf(key.ActivityTypeId) !== -1) {
-          key.IsChoose = true;
-        } else {
-          key.IsChoose = false;
-        }
-      });
-      this.preserve();
-    },
-    //搜索记录进来
-    searchHandle() {
-      if (this.searchTxt) {
-        this.page_no = 1;
-        //添加搜索记录
-        if (!this.historySearchList.includes(this.searchTxt)) {
-          this.historySearchList.unshift(this.searchTxt);
-          this.$db.set("historySearchListActivity", JSON.stringify(this.historySearchList));
-        }
-        this.isShowSearch = true;
-        if (this.isGain) {
-          this.empty();
-          this.getList();
-        }
-        this.getUserSearchContent();
-      } else {
-        this.$util.toast("请输入关键字");
-      }
-    },
-    // 选择历史搜索
-    chooseTarget(item) {
-      this.searchTxt = item;
-      this.collectList = [];
-      this.page_no = 1;
-      this.searchHandle();
-    },
-    /* 历史搜索清空 */
-    clearHistory() {
-      this.historySearchList = [];
-      this.$db.del("historySearchListActivity");
-    },
-    //获取列表
-    async getList() {
-      const res = this.dynamicName
-        ? await activity.getActivityListNew({
-            PageSize: this.pageSize,
-            CurrentIndex: this.page_no,
-            ActiveState: "2,3", //活动进行状态
-            Label: this.dynamicName,
-          })
-        : await activity.getActivityList({
-            PageSize: this.pageSize,
-            CurrentIndex: this.page_no,
-            ActiveState: this.activeState, //活动进行状态
-            ActivityTypeIds: this.activityTypeIds, //活动类型id 多个用 , 隔开
-            ChartPermissionIds: this.chartPermissionIds, //行业id 多个用 , 隔开
-            KeyWord: this.searchTxt,
-            WhichDay: this.activityTimeStatus,
-          });
-      if (res.Ret !== 200) return;
-      this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
-      this.totalPage = res.Data.Paging.Pages; //总页数
-      if (this.page_no === 1) {
-        this.collectList = res.Data.List || [];
-        this.haveData = this.collectList.length ? true : false;
-        if (this.refresh) {
-          uni.stopPullDownRefresh();
-          this.refresh = false;
-        }
-      } else {
-        this.collectList.push(...res.Data.List);
-      }
-    },
-    //获取活动详情接口
-    getUserSearchContent(name) {
-      activity
-        .getUserSearchContent({
-          IsShowJurisdiction: this.isId,
-        })
-        .then((res) => {
-          if (this.isGain) {
-            res.Data.ListActivityStaus.forEach((item) => {
-              item.IsChoose = true;
-            });
-          }
-          this.isShowJurisdiction = res.Data.IsShowJurisdiction;
-          this.listActivityStaus = res.Data.ListActivityStaus;
-          this.listActivityType = res.Data.ListActivityType;
-          this.listChartPermission = res.Data.ListChartPermission || [];
-          this.listChartPermissionInit = res.Data.ListChartPermission2;
-          if (this.isGain) {
-            // this.preserve()
-          } else {
-            this.shareOption();
-          }
-          if (name == "traverse") {
-            const hyArr = [];
-            this.listChartPermission.forEach((key) => {
-              if (key.IsChoose) {
-                hyArr.push(key.ChartPermissionId);
-              }
-            });
-
-            this.chartPermissionIds = hyArr.join(",");
-          }
-        });
-    },
-    //恢复下拉选择的初始状态
-    empty() {
-      this.listActivityStaus.forEach((item) => (item.IsChoose = true));
-      this.activeState = "1,2,3";
-      this.activeStateName = "全部状态";
-      this.chartPermissionIds = "";
-      this.activityTimeList.forEach((key) => {
-        key.IsChoose = false;
-      });
-      this.activityTimeStatus = "";
-      this.listChartPermission.forEach((item) => (item.IsChoose = false));
-      this.chartPermissionName = "所有行业";
-      this.listActivityType.forEach((item) => (item.IsChoose = false));
-      this.activityTypeIds = "";
-      this.activityTypeName = "所有类型";
-    },
-    /* 表单清空 */
-    clearIpt() {
-      this.searchTxt = "";
-      this.collectList = [];
-      this.haveData = true;
-      this.isShowSearch = false;
-    },
-    //获取是否需要填写区号接口
-    countryCcode() {
-      User.countryCcode().then((res) => {
-        if (res.Ret == 200) {
-          this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode;
-        }
-      });
-    },
-  },
-  onShow() {
-    this.countryCcode(); //判断是否加区号
-    this.$store.dispatch("statistics", { PageType: "ActivitSearch" });
-  },
-  //load
-  onLoad(option) {
-    if (this.$db.get("historySearchListActivity")) {
-      let historyList = JSON.parse(this.$db.get("historySearchListActivity"));
-      this.historySearchList = historyList;
-    }
-    if (option.text || option.dycName) {
-      this.activeState = option.statesId; //活动进行状态
-      this.activityTypeIds = option.typeIds; //活动类型id 多个用 , 隔开
-      this.chartPermissionIds = option.chartIds; //行业id 多个用 , 隔开
-      this.activeStateName = option.stateName;
-      this.chartPermissionName = option.chartName;
-      this.activityTypeName = option.typeName;
-      this.searchTxt = option.text;
-      this.dynamicName = option.dycName || "";
-      this.activityTimeStatus = option.timeStatus;
-      this.isGain = false;
-      this.isShowSearch = true;
-    } else {
-      this.isGain = true;
-    }
-    if (option.text) {
-      this.searchHandle();
-    } else if (option.dycName) {
-      this.changeTarget();
-    }
-    this.fastSearchKeWord();
-  },
-  /* 触底 */
-  onReachBottom: Throttle(function () {
-    if (this.status === "nomore") return;
-    this.status = "loading";
-    this.page_no++;
-    this.getList();
-  }),
-  /* 用户点击分享  */
-  onShareAppMessage: function (res) {
-    return {
-      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "活动搜索",
-      path:
-        "/activityPages/activitySearch/activitySearch?statesId=" +
-        this.activeState +
-        "&typeIds=" +
-        this.activityTypeIds +
-        "&chartIds=" +
-        this.chartPermissionIds +
-        "&stateName=" +
-        this.activeStateName +
-        "&chartName=" +
-        this.chartPermissionName +
-        "&typeName=" +
-        this.activityTypeName +
-        "&text=" +
-        this.searchTxt +
-        "&timeStatus=" +
-        this.activityTimeStatus +
-        "&dycName=" +
-        this.dynamicName,
-      success: (res) => {},
-      fail: (err) => {},
-    };
-  },
-  /* 下拉刷新 */
-  onPullDownRefresh: Throttle(function () {
-    this.page_no = 1;
-    this.refresh = true;
-    if (this.tabsActive == 0) {
-      this.getList();
-    } else {
-      this.getScheduleList();
-    }
-  }),
-};
-</script>
-
-<style scoped lang="scss">
-@import "../components/index.scss";
-.dynamic-content {
-  padding: 0 0 0 0 !important;
-  .target-title {
-    color: #333333 !important;
-    font-size: 28rpx !important;
-  }
-}
-.dynamic-name {
-  display: flex;
-  align-items: center;
-  padding: 36rpx 10rpx 20rpx !important;
-  color: #3385ff;
-  font-size: 28rpx;
-  text {
-    max-width: 100%;
-    padding-right: 40rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  icon {
-    width: 32rpx;
-    height: 32rpx;
-  }
-}
-
-.activity-pages {
-  padding-top: 200rpx;
-  padding-bottom: 30rpx;
-}
-.activity-page {
-  padding-top: 100rpx !important;
-}
-@import "../components/indexActivity.scss";
-</style>

activityPages/themeActivity/themeActivity.vue

@@ -30,7 +30,7 @@
                 <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
               </view>
               <block v-if="item.ActiveState == 1">
-                <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
+                <view :class="['bottom-box', item.ActivityTypeId == 1 && item.IsLimitPeople == 0 && 'expert-item', item.City && 'city']">
                   <view class="city-img" v-if="item.City">
                     <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                     {{ item.City }}

components/audioModule/index.vue

@@ -4,7 +4,6 @@
     <view class="audio-box">
       <view class="activity-title text_oneLine">
         {{ activityTitle }}
-        哈哈哈
         <view class="icon-cross" @click.stop="isShowMaskHandler">
           <van-icon name="cross" font-size="32" />
         </view>
@@ -32,6 +31,7 @@
 </template>
 
 <script>
+import { activity } from "@/config/api";
 export default {
   name: "",
   filters: {
@@ -68,7 +68,6 @@ export default {
   watch: {
     audioInit: {
       handler(nval) {
-        console.log(nval, "audioInitaudioInitaudioInitaudioInit");
         this.init();
       },
       immediate: true,
@@ -80,10 +79,11 @@ export default {
     this.init();
   },
   methods: {
+    //点击隐藏事件
     isShowMaskHandler() {
-      console.log(123);
       this.$emit("update:showAudioPop", false);
     },
+    //数据初次加载
     init() {
       const curAudio = this.$store.state.audioBg.list;
       if (this.globalBgAudioManager.src != curAudio.Url) {
@@ -99,11 +99,12 @@ export default {
     },
     //音频播放事件
     listenAudio() {
-      console.log("设置监听事件");
-      this.globalBgAudioManager.onPlay(() => {
-        console.log("开始播放");
+      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("音频暂停");
@@ -126,6 +127,7 @@ export default {
           icon: "none",
         });
       });
+      //音频的播放时间更新
       this.globalBgAudioManager.onTimeUpdate(() => {
         this.curTime = parseInt(this.globalBgAudioManager.currentTime);
         this.$store.commit("audioBg/updateAudioTime", this.curTime);
@@ -133,7 +135,6 @@ export default {
     },
     //拖动进度条
     handleAudioSliderChange(e) {
-      console.log(  e,'èasdasdas');
       const value = e.detail.value;
       this.globalBgAudioManager.seek(value);
     },
@@ -172,6 +173,7 @@ export default {
     font-weight: 500;
     margin-bottom: 35rpx;
     text-align: center;
+    padding-right: 30rpx;
     .icon-cross {
       position: absolute;
       right: 0;

config/api.js

@@ -359,6 +359,10 @@ export const activity = {
   postAppointmentCancel: (params) => {
     return postHttp("/activity/appointment/cancel", params);
   },
+  //背景音频开始播放
+  backAudioPlay: (params) => {
+    return postHttp("/activity/voiceHistory/add", params);
+  },
 };
 export const Research = {
   /* 近期更新主题列表接口 */

pageMy/browseHistory/browseHistory.vue

@@ -10,7 +10,7 @@
           <text style="display: inline" @click="goDetailReport(item)">
             {{ item.Title }}
           </text>
-          <text class="item-industry" v-if="item.IndustryName" @click="themeDetails(item)">&nbsp;&nbsp;&nbsp;#{{ item.IndustryName }}</text>
+          <text @click="themeDetails(item,val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
         </view>
         <view class="item-more">
           <text>{{ item.PublishDate }}</text>
@@ -92,13 +92,13 @@ export default {
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
     //去往主题详情
-    themeDetails(item) {
+    themeDetails(item,val) {
       if (item.Source === 1) {
         //非严选
-        this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId);
+        this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + val.IndustrialManagementId);
       } else {
         //严选
-        this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId);
+        this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId);
       }
     },
   },

pageMy/myCollection/myCollection.vue

@@ -10,7 +10,7 @@
           <text style="display: inline" @click="goDetailReport(item)">
             {{ item.Title }}
           </text>
-          <text class="item-industry" v-if="item.IndustryName" @click="themeDetails(item)">&nbsp;&nbsp;&nbsp;#{{ item.IndustryName }}</text>
+          <text @click="themeDetails(item,val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
         </view>
         <view class="item-more">
           <text>{{ item.PublishDate }}</text>
@@ -92,13 +92,13 @@ export default {
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
     //去往主题详情
-    themeDetails(item) {
+    themeDetails(item, val) {
       if (item.Source === 1) {
         //非严选
-        this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId);
+        this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + val.IndustrialManagementId);
       } else {
         //严选
-        this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId);
+        this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId);
       }
     },
   },

pageMy/mySchedulepage/mySchedulepage.vue

@@ -35,7 +35,7 @@
               <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
             </view>
             <block v-if="item.ActiveState == 1">
-              <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
+              <view :class="['bottom-box', item.ActivityTypeId == 1 && item.IsLimitPeople == 0 && 'expert-item', item.City && 'city']">
                 <view class="city-img" v-if="item.City">
                   <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                   {{ item.City }}

pages/activity/index.vue

@@ -1,708 +0,0 @@
-<template>
-  <view class="container activity-content">
-    <!--  活动、日程 -->
-    <view class="top-content" id="idtop">
-      <view class="tab">
-        <view class="tab-item" v-for="(item, index) in tabs" :key="item.id">
-          <view class="scroll-tab-item" :class="{ active: tabsActive == index }" @click="toggleTab(item, index)">
-            {{ item.name }}
-            <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/border_act.png" class="border_act" v-if="tabsActive == index" mode=""> </image>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 筛选状态 -->
-    <view class="screen-item" v-if="tabsActive == 0">
-      <text :class="isShowJurisdiction ? 'active' : ''" @click="permissioActivity">有权限行业</text>
-      <!-- 各种状态选择 -->
-      <view class="select-conyent">
-        <van-dropdown-menu active-color="#333333">
-          <van-dropdown-item id="industry" :title="chartPermissionName">
-            <view class="menu-items">
-              <view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick(item)">
-                <view class="items-box">
-                  <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="isShowJurisdiction ? '#ccc' : '#2C83FF'" size="24"></u-icon>
-                </view>
-                <text>{{ item.PermissionName }}</text>
-              </view>
-            </view>
-            <view class="replacement">
-              <text @click="replacementBtn" class="replacement-box">重置</text>
-              <text @click="replacementConfirm">确定</text>
-            </view>
-          </van-dropdown-item>
-        </van-dropdown-menu>
-      </view>
-      <text v-for="item in activityTimeList" :key="item.Id" :class="item.IsChoose ? 'active' : ''" @click="isActivityDate(item.Id)">{{ item.StatusName }}</text>
-    </view>
-    <!-- 活动列表 -->
-    <view class="collect-activity" v-if="haveData && tabsActive == 0">
-      <view class="content-list">
-        <view class="half">
-          <view class="activity-ltem" v-for="(item, index) in collectTypeList" :key="index" v-if="item.Position == 1">
-            <image class="zindex-one" :src="item.ImgUrl"></image>
-            <!-- <image class="zindex-two" :src="item.ImgUrlBg"></image> -->
-            <view class="content">
-              <view class="item-img" @click="goDetails(item)">
-                {{ item.ActivityTypeName }}
-              </view>
-              <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
-                <view class="activity-li" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
-                  <image class="item-image" lazy-load :src="val.ImgUrlBg"></image>
-                  <text class="text_oneLine"> {{ val.KeyWord }}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="half">
-          <view class="activity-ltem" v-for="(item, index) in collectTypeList" :key="index" v-if="item.Position == 2">
-            <image class="zindex-one" :src="item.ImgUrl"></image>
-            <!-- <image class="zindex-two" :src="item.ImgUrlBg"></image> -->
-            <view class="content">
-              <view class="item-img" @click="goDetails(item)">
-                {{ item.ActivityTypeName }}
-              </view>
-              <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
-                <view class="activity-li" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
-                  <image class="item-image" lazy-load :src="val.ImgUrlBg"></image>
-                  <text class="text_oneLine"> {{ val.KeyWord }}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage > 1" />
-    </view>
-    <view class="collect-ul" v-else-if="haveData && tabsActive !== 0">
-      <view class="collect-ltem" v-for="(item, index) in collectList" :key="index">
-        <view class="title-date" @click="goDetail(item)">
-          <text :class="item.ActivityType == 1 ? '' : 'xianxia'">{{ item.ActivityType == 1 ? "线上" : "线下" }}</text>
-          {{ item.ActivityTimeText }}
-        </view>
-        <view class="item-li">
-          <view class="item-img" @click="goDetail(item)">
-            <image :src="item.ImgUrl"></image>
-            <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
-            <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-            <text v-else class="img-status">已结束</text>
-            <view class="img-type">
-              <image :src="item.ImgUrlText" mode=""></image>
-            </view>
-          </view>
-          <view class="item">
-            <view class="item-text" @click="goDetail(item)">
-              <text class="activity-title"> {{ item.ActivityName }} </text>
-              <text class="text_twoLine" v-if="item.Expert">专家背景：{{ item.Expert }} </text>
-              <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾：{{ item.DistinguishedGuest }} </text>
-              <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
-            </view>
-            <block v-if="item.ActiveState == 1">
-              <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
-                <view class="city-img" v-if="item.City">
-                  <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
-                  {{ item.City }}
-                </view>
-                <view style="display: flex">
-                  <text v-if="item.IsShowOutboundCall && item.ActivityTypeId == 1" class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-                  <text v-if="item.IsShowMeetingReminder" @click="meetingReminderAdd(item.ActivityId, item.IsCancelMeetingReminder)">
-                    {{ item.IsCancelMeetingReminder == 0 ? "会议提醒" : "取消提醒" }}
-                  </text>
-                  <view v-if="item.IsShowHelpSsk" style="width: 130rpx">
-                    <text @click="askingGo(item)">帮我带问</text>
-                  </view>
-                  <text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1" class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                  <block v-if="item.IsShowSignup">
-                    <block v-if="item.IsCClassMeeting">
-                      <text class="button" @click="signupIsAddOfCancel(item, 3, 'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
-                    </block>
-                    <block v-else>
-                      <text class="button" v-if="item.IsSignup !== 1" @click="wanttosignup(item.ActivityId)">我要报名</text>
-                      <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
-                    </block>
-                  </block>
-                </view>
-              </view>
-            </block>
-            <block v-else>
-              <view class="bottom-box city" v-if="item.City">
-                <view class="city-img">
-                  <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
-                  {{ item.City }}
-                </view>
-              </view>
-              <view class="bottom-box real-time" v-if="item.ActiveState == 2 && item.ActivityTypeId == 1">
-                <text class="button" @click="askingGo(item, '提问')">实时提问</text>
-              </view>
-            </block>
-          </view>
-        </view>
-      </view>
-      <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage > 1" />
-    </view>
-    <view class="nodata" v-if="!haveData">
-      <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/act_search.png" mode="" class="nodata_ico"></image>
-      <text>{{ tabsActive == 0 ? "暂时没有符合条件的活动" : "暂无我的日程" }}</text>
-    </view>
-    <view class="more" v-if="tabsActive == 0" @click="goSearch">更多进行中和已结束的主题>></view>
-    <!-- 所有自定义弹框 -->
-    <modalDialog
-      :isShow="isShow"
-      :signupType="signupType"
-      :goFollow="goFollow"
-      :signupStatus="signupStatus"
-      :hasPermission="hasPermission"
-      :jurisdictionList="jurisdictionList"
-      :editIsShow="editIsShow"
-      :isCancelShow="isCancelShow"
-      :idTypeCancel="idTypeCancel"
-      @cancelShowBtn="cancelEnsure"
-      :countryCode="countryCode"
-      :mobileEdit="mobileEdit"
-      :goOnNextStep="goOnNextStep"
-      :isShowhasPermission="isShowhasPermission"
-      :applyForIsShow="applyForIsShow"
-      :mailboxBinding="mailboxBinding"
-    />
-    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-  </view>
-</template>
-
-<script>
-import { activity } from "@/config/api.js";
-import { Throttle } from "@/config/util.js";
-import myActivityMixin from "@/activityPages/components/indexActivity.js";
-import modalDialog from "@/components/modalDialog.vue";
-import freeCharge from "@/components/freeCharge";
-let app = getApp();
-export default {
-  mixins: [myActivityMixin],
-  components: {
-    modalDialog,
-    freeCharge,
-  },
-  data() {
-    return {
-      tabs: [
-        {
-          name: "全部活动",
-          id: 1,
-        },
-        {
-          name: "我的日程",
-          id: 2,
-        },
-      ],
-      collectTypeList: [],
-      chartPermissionName: "所有行业",
-      haveData: true,
-      activityTimeList: [
-        { Id: 1, IsChoose: false, StatusName: "今日活动" },
-        { Id: 2, IsChoose: false, StatusName: "明日活动" },
-      ],
-      whichDay: "",
-      listChartPermission: [],
-      listChartPermissionInit: [],
-      chartPermissionIds: "",
-      isShowJurisdiction: false, //
-      isGetJurisdiction: 0,
-      isrefresh: true,
-      activityTypeId: "",
-    };
-  },
-  computed: {
-    messageTitle() {
-      let arr = this.whichDay ? this.whichDay.split(",") : [];
-      let whichData = arr.length == 2 ? "今日活动,明日活动" : arr == "1" ? "今日活动" : arr == "2" ? "明日活动" : "";
-      let title = whichData ? whichData + "," + this.chartPermissionName : this.chartPermissionName !== "所有行业" ? this.chartPermissionName : "";
-      return title || "近期所有行业活动预告";
-    },
-  },
-  methods: {
-    async getUserSearchContent() {
-      const res = await activity.getUserSearchContent({
-        IsShowJurisdiction: this.isGetJurisdiction,
-      });
-      if (res.Ret === 200) {
-        this.isShowJurisdiction = res.Data.IsShowJurisdiction;
-        this.listChartPermission = res.Data.ListChartPermission;
-        this.listChartPermissionInit = res.Data.ListChartPermission2;
-        this.clickPermission();
-        if (this.chartPermissionIds) {
-          this.closeTheWindow();
-        }
-      }
-    },
-    async getActivityLabelTypeList() {
-      const res = await activity.getActivityLabelTypeList({
-        ChartPermissionIds: this.chartPermissionIds,
-        IsShowJurisdiction: this.isGetJurisdiction,
-        ActiveState: "1",
-        WhichDay: this.whichDay,
-        IsPower: this.isGetJurisdiction,
-      });
-      if (res.Ret === 200) {
-        this.collectTypeList = res.Data.List || [];
-        this.haveData = this.collectTypeList.length ? true : false;
-        if (this.refresh) {
-          uni.stopPullDownRefresh();
-          this.refresh = false;
-        }
-      }
-    },
-    async getActivityList() {
-      const res = await activity.getScheduleList({ PageSize: this.pageSize, CurrentIndex: this.page_no });
-      if (res.Ret === 200) {
-        this.contentImg = res.Data.ImgUrl;
-        this.contentLabel = res.Data.Label;
-        this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
-        if (this.page_no === 1) {
-          this.collectList = res.Data.List || [];
-          this.haveData = this.collectList.length ? true : false;
-          if (this.refresh) {
-            uni.stopPullDownRefresh();
-            this.refresh = false;
-          }
-        } else {
-          this.collectList = this.collectList.concat(res.Data.List);
-        }
-      }
-    },
-    //头部tabs切换
-    toggleTab(item, index) {
-      if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-        //已授权已绑定
-        if (index != this.tabsActive) {
-          this.tabsActive = index;
-          this.page_no = 1;
-          this.collectTypeList = [];
-          this.collectList = [];
-          this.tabsActive == 0 ? this.getActivityLabelTypeList() : this.getActivityList();
-          if (this.tabsActive !== 0) {
-            this.selectComponent("#industry").toggle(false);
-          }
-        }
-      } else {
-        //已授权未绑定
-        uni.navigateTo({
-          url: "/pageMy/login/login",
-        });
-      }
-    },
-    // 下拉的选择的关闭事件
-    closeTheWindow() {
-      const types = this.chartPermissionIds ? this.chartPermissionIds.split(",").map(Number) : [];
-      if (types.length > 0) {
-        const str = [];
-        this.listChartPermission.forEach((item) => {
-          if (types.includes(item.ChartPermissionId)) {
-            item.IsChoose = true;
-            str.push(item.PermissionName);
-          } else {
-            item.IsChoose = false;
-          }
-        });
-        this.chartPermissionName = str.length == 6 ? "所有行业" : str.join(",");
-      }
-    },
-    // 下拉的选择的选中事件
-    overallClick(item) {
-      if (this.isShowJurisdiction) return;
-      this.listChartPermission.forEach((key) => {
-        if (key.ChartPermissionId == item.ChartPermissionId) {
-          key.IsChoose = !key.IsChoose;
-        }
-      });
-    },
-    // 下拉的选择的重置事件
-    replacementBtn() {
-      this.listChartPermission = this.listChartPermissionInit;
-      this.chartPermissionIds = "";
-      this.isShowJurisdiction = false;
-      this.listChartPermission.map((item) => (item.IsChoose = false));
-      this.chartPermissionName = "所有行业";
-      this.getActivityLabelTypeList();
-    },
-    //下拉选择的确定事件
-    replacementConfirm() {
-      const arr = [];
-      const str = [];
-      this.listChartPermission &&
-        this.listChartPermission.forEach((key) => {
-          if (key.IsChoose) {
-            arr.push(key.ChartPermissionId);
-            str.push(key.PermissionName);
-          }
-        });
-      if ((str.length == 6 && this.listChartPermission.length == 6) || str.length <= 0) {
-        this.chartPermissionName = "所有行业";
-      } else {
-        this.chartPermissionName = str.join(",");
-      }
-      this.chartPermissionIds = arr.join(",");
-      this.getActivityLabelTypeList();
-      this.selectComponent("#industry").toggle(false);
-    },
-    //今日明日的点击事件
-    isActivityDate(id) {
-      this.selectComponent("#industry").toggle(false);
-      this.activityTimeList.forEach((item) => {
-        if (item.Id == id) item.IsChoose = !item.IsChoose;
-      });
-      const arr = [];
-      this.activityTimeList.forEach((item) => item.IsChoose && arr.push(item.Id));
-      this.whichDay = arr.join(",");
-      this.getActivityLabelTypeList();
-    },
-    //是否有权限的点击事件
-    async permissioActivity() {
-      if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-        this.selectComponent("#industry").toggle(false);
-        this.isShowJurisdiction = !this.isShowJurisdiction;
-        this.isGetJurisdiction = this.isShowJurisdiction ? 1 : 2;
-        await this.getUserSearchContent();
-        this.selectComponent("#industry").toggle(false);
-        if (this.isShowJurisdiction) {
-          this.getActivityLabelTypeList();
-        } else {
-          this.replacementBtn();
-        }
-      } else {
-        //已授权未绑定
-        uni.navigateTo({
-          url: "/pageMy/login/login",
-        });
-      }
-    },
-    //点击后有权限的
-    clickPermission() {
-      if (this.isShowJurisdiction) {
-        const arr = [];
-        this.listChartPermission &&
-          this.listChartPermission.forEach((key) => {
-            if (key.IsChoose) {
-              arr.push(key.ChartPermissionId);
-            }
-          });
-        this.chartPermissionIds = arr.join(",");
-      }
-    },
-    loadShare(option) {
-      if (option && Object.keys(option).length !== 0) {
-        this.whichDay = option.whichDay || "";
-        this.chartPermissionIds = option.chartPermissionIds || "";
-        this.isGetJurisdiction = option.isGetJurisdiction;
-        this.$nextTick(() => {
-          let day = this.whichDay ? this.whichDay.split(",").map(Number) : [];
-          this.activityTimeList.forEach((item) => {
-            if (day.includes(item.Id)) {
-              item.IsChoose = true;
-            }
-          });
-        });
-      }
-    },
-    goDetails(item, key) {
-      if (item.Resource === 1 || key === 1) {
-        let type = item.ActivityTypeName || "";
-        let key = item.ActivityTypeId || item.KeyWord;
-        this.$store.dispatch("checkHandle", "/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&permissionIds=" + this.chartPermissionIds + "&whichDay=" + this.whichDay);
-      } else {
-        if (key) {
-          this.$store.dispatch("checkHandle", "/activityPages/specialDetail/specialDetail?id=" + item.ActivityId);
-        } else {
-          this.$store.dispatch("checkHandle", "/activityPages/specialResearchPage/specialResearchPage");
-        }
-      }
-    },
-    //去往搜索事件
-    goSearch() {
-      this.$store.dispatch("checkHandle", "/activityPages/activitySearch/activitySearch");
-    },
-  },
-  //load
-  onLoad(option) {
-    this.loadShare(option);
-    this.getUserSearchContent();
-    this.getActivityLabelTypeList();
-  },
-  async onShow() {
-    await this.$store.dispatch("checkHandle", "noGO");
-  },
-  /** 用户点击分享 */
-  onShareAppMessage: function (res) {
-    return {
-      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : this.messageTitle,
-      path: "/pages/activity/activity?whichDay=" + this.whichDay + "&chartPermissionIds=" + this.chartPermissionIds + "&isGetJurisdiction=" + this.isGetJurisdiction,
-    };
-  },
-  /* 触底 */
-  onReachBottom: Throttle(function () {
-    if (this.status === "nomore") return;
-    this.status = "loading";
-    this.page_no++;
-    this.tabsActive == 1 && this.getActivityList();
-  }),
-  /* 下拉刷新 */
-  onPullDownRefresh: Throttle(function () {
-    this.page_no = 1;
-    this.refresh = true;
-    this.tabsActive == 0 ? this.getActivityLabelTypeList() : this.getActivityList();
-  }),
-  // 页面滚动事件
-  onPageScroll() {},
-};
-</script>
-
-<style scoped lang="scss">
-// image{will-change: transform}
-.activity-content {
-  background-color: #f7f7f7;
-  padding-bottom: 90rpx;
-  position: relative;
-  .top-content {
-    position: sticky;
-    top: 0;
-    left: 0;
-    z-index: 99;
-    padding-bottom: 2rpx;
-    background-color: #fff;
-    .tab {
-      display: flex;
-      font-size: 32rpx;
-      color: #707070;
-      .tab-item {
-        flex: 1;
-        text-align: center;
-        .scroll-tab-item {
-          height: 78rpx;
-          line-height: 48rpx;
-          position: relative;
-          .border_act {
-            position: absolute;
-            height: 6rpx;
-            width: 340rpx;
-            left: 0;
-            bottom: 0rpx;
-          }
-        }
-        .active {
-          color: #3385ff;
-          font-weight: bold;
-          font-size: 34rpx;
-        }
-      }
-    }
-    .index-fixed {
-      margin-top: 40rpx;
-      width: 100%;
-      display: flex;
-      align-items: center;
-      height: 70rpx;
-      background: #f6f6f6;
-      border: 1rpx solid #e5e5e5;
-      opacity: 1;
-      border-radius: 35rpx;
-      padding-left: 34rpx;
-      color: #8d8d8d;
-      font-size: 28rpx;
-      .search_ico {
-        padding-right: 16rpx;
-      }
-    }
-  }
-  .screen-item {
-    position: sticky;
-    top: 78rpx;
-    left: 0;
-    z-index: 99;
-    background-color: #fff;
-    height: 111rpx;
-    padding: 0 34rpx;
-    font-size: 24rpx;
-    color: #333;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    text {
-      width: 150rpx;
-      text-align: center;
-      line-height: 51rpx;
-      background-color: #f8f8fa;
-      box-sizing: border-box;
-      border-radius: 26rpx;
-    }
-    .active {
-      background-color: #3385ff;
-      color: #fff;
-    }
-  }
-  .select-conyent {
-    .decide {
-      background-color: #f8f8fa;
-      display: flex;
-      align-items: center;
-      margin: 0 auto;
-      height: 110rpx;
-      width: 100%;
-      padding-left: 30rpx;
-    }
-    .items-box {
-      width: 40rpx;
-    }
-    .menu-items {
-      background-color: #f8f8fa;
-      width: 100%;
-      display: flex;
-      flex-wrap: wrap;
-      padding: 30rpx 30rpx 0;
-      .menu-items-box {
-        display: flex;
-        width: 50%;
-        font-size: 28rpx;
-        font-weight: 400;
-        margin-bottom: 40rpx;
-      }
-      text {
-        text-align: left;
-      }
-    }
-    .replacement {
-      margin: 0rpx 30rpx 20rpx;
-      display: flex;
-      background-color: #2c83ff;
-      height: 60rpx;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #ffffff;
-      border-radius: 30rpx;
-      box-sizing: border-box;
-      text {
-        flex: 1;
-        line-height: 58rpx;
-        background-color: #2c83ff;
-      }
-      .replacement-box {
-        border: 1rpx solid #2c83ff;
-        color: #2c83ff;
-        background: #ffffff;
-        border-radius: 28rpx 0rpx 28rpx 28rpx;
-      }
-    }
-  }
-  .nodata_ico {
-    width: 374rpx;
-    height: 288rpx;
-  }
-  .content-list {
-    display: flex;
-    padding: 34rpx;
-  }
-  .half {
-    width: 50%;
-  }
-  .activity-ltem {
-    width: 331rpx;
-    position: relative;
-    margin-bottom: 30rpx;
-    .zindex-one {
-      position: absolute;
-      top: 0;
-      left: 0;
-      height: 250rpx;
-      width: 100%;
-      z-index: 1;
-    }
-    .zindex-two {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      z-index: 2;
-    }
-    .content {
-      position: sticky;
-      top: 0;
-      left: 0;
-      width: 100%;
-      // padding-bottom: 30rpx;
-      border-radius:15rpx;
-      overflow: hidden;
-      z-index: 3;
-    }
-    .item-img {
-      width: 100%;
-      height: 147rpx;
-      margin-bottom: 30rpx;
-      font-size: 34rpx;
-      color: #fff;
-      padding: 30rpx 0 0 20rpx;
-    }
-    .activity-li {
-      width: 100%;
-      height: 86rpx;
-      position: relative;
-      .item-image {
-        width: 100%;
-        height: 100%;
-      }
-      .text_oneLine {
-        position: absolute;
-        width: 100%;
-        height: 50rpx;
-        padding: 0 30rpx;
-        text-align: center;
-        font-size: 28rpx;
-        top: 15rpx;
-        color: #fff;
-      }
-      // &::before {
-      //   content: "";
-      //   width: 0;
-      //   height: 0;
-      //   border-top: 8rpx solid transparent;
-      //   border-left: 17rpx solid #fff;
-      //   border-bottom: 8rpx solid transparent;
-      //   margin-right: 10rpx;
-      // }
-    }
-  }
-  .more {
-    width: 100%;
-    text-align: center;
-    font-size: 34rpx;
-    color: #3385ff;
-    margin-top: 90rpx;
-  }
-  .activity-ui {
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-  }
-}
-/deep/.van-dropdown-menu {
-  background-color: #fff;
-  box-shadow: none !important;
-  align-items: center !important;
-}
-/deep/.van-dropdown-menu__item {
-  box-sizing: border-box;
-  width: 166rpx;
-  padding-right: 20rpx;
-  height: 51rpx;
-  border-radius: 26rpx;
-  background: #f8f8fa;
-}
-/deep/.van-dropdown-item {
-  margin-top: -10rpx;
-}
-/deep/[data-index="2"] {
-  margin-right: 0rpx;
-}
-/deep/ .van-ellipsis {
-  font-size: 24rpx;
-}
-@import "@/activityPages/components/indexActivity.scss";
-</style>

reportPages/IndustryReport/IndustryReport.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container industry-content">
-    <view v-if="layoutTime">
+    <view v-if="haveData">
       <view class="content-top">
         <view class="top-bg">产业赛道布局于{{ layoutTime }}</view>
         <view class="top-box">
@@ -61,7 +61,6 @@ export default {
       categoryId: "",
       collectList: [],
       isShow: false,
-      haveDatas: true,
       haveData: true,
       status: "loadmore",
       loadText: {
@@ -123,8 +122,6 @@ export default {
           if (res.Data.List) {
             this.tabAct_id = res.Data.List[0].CategoryId;
             this.tabBars = res.Data.List;
-          } else {
-            this.haveDatas = false;
           }
         }
       });

reportPages/hotList/hotList.vue

@@ -149,7 +149,7 @@ export default {
     },
     //去往主题详情
     themeDetails(item) {
-      this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId+"&source=2");
+      this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId);
     },
     //计算遍历的颜色
     serialBackground(index) {