ok

components/activity/indexActivity.js

@@ -62,6 +62,7 @@ export default {
       } else if (item.IsLimitPeople == 1 && item.ActivityTypeName == "公司调研电话会") {
         this.selectShow = true;
       } else {
+        this.activityIdAdd = "";
         this.signupIsAddOfCancel(item, 3);
       }
     },

components/audioModule/index.vue

@@ -281,7 +281,7 @@ export default {
   width: 100%;
   top: 0;
   left: 0;
-  z-index: 11;
+  z-index: 111;
   .bg-overlay {
     width: 100%;
     height: 100%;

manifest.json

@@ -73,7 +73,8 @@
         "uniStatistics" : {
             "enable" : false
         },
-        "requiredBackgroundModes" : [ "audio" ]
+        "requiredBackgroundModes" : [ "audio" ],
+        "lazyCodeLoading": "requiredComponents"
     },
     "mp-alipay" : {
         "usingComponents" : true,

mixin/index.js

@@ -37,7 +37,7 @@ export default {
       const res = await Reports.reportIsShow();
       if (res.Ret === 200) {
         this.wholeShowListData = res.Data
-        this.isShowFree = res.Data.IsShow;
+        this.isShowFree = res.Data.IsShowFreeButton;
         this.searchPlaceholderList = res.Data.SearchTxtList
       }
     },

pages-activity/activityDetail/activityDetail.vue

@@ -58,14 +58,17 @@
           <view class="city-box">
             <text v-if="detailData.ActivityTypeName">活动类型：</text>
             <view class="city">
-              <text style="color: #333">（{{ detailData.ChartPermissionName }}）{{ detailData.ActivityTypeName }}</text>
+              <text style="color: #333">
+                <block v-if="detailData.ChartPermissionName !== '买方研选'">（{{ detailData.ChartPermissionName }}）</block>
+                {{ detailData.ActivityTypeName }}
+              </text>
+              <view class="choose-limit" @click="strictSelection" v-if="detailData.IsShowSustainable">
+                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/purchaser.png" mode=""></image>
+                <image class="limit-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
+              </view>
               <image v-if="detailData.City" style="margin-left: 15rpx" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png" mode=""></image>
               <text v-if="detailData.City">{{ detailData.City }}</text>
             </view>
-            <view class="choose-limit" @click="strictSelection" v-if="detailData.IsShowSustainable">
-              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/purchaser.png" mode=""></image>
-              <image class="limit-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
-            </view>
           </view>
           <view v-if="detailData.Listndustrial.length" class="network dustrial-ui">
             <view class="network-left">产业标签：</view>
@@ -248,7 +251,7 @@
 <script>
 import { activity, User } from "@/config/api.js";
 import modalDialog from "@/components/modalDialog.vue";
-import areaCode from "@/pages-activity/components/areaCode.vue";
+import areaCode from "@/components/activity/areaCode.vue";
 import jurisdiction from "./jurisdiction/components.vue";
 import freeCharge from "@/components/freeCharge";
 import audioModule from "@/components/audioModule/index";
@@ -385,7 +388,7 @@ export default {
               let pages = getCurrentPages();
               let prevPage = pages[pages.length - 2];
               let path = prevPage ? prevPage.$page.fullPath : "";
-              if (path == "/pages/activity/activity" || path == "/pages-search/activitySearch/activitySearch") {
+              if (path == "/pages/activity/activity" || path == "/pages-search/indedxSearch/indedxSearch") {
                 const index = prevPage.$vm.collectList.findIndex((item) => item.ActivityId == this.id);
                 prevPage.$vm.collectList[index].IsSignup = this.detailData.IsSignup;
                 prevPage.$vm.collectList[index].SignupNum = this.detailData.SignupNum;
@@ -573,7 +576,7 @@ export default {
       let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
       isTime = isTime <= 0 ? 0 : isTime >= this.detailData.VoiceList.PlaySeconds ? this.detailData.VoiceList.PlaySeconds - 1 : isTime;
       this.globalBgAudioManager.seek(isTime);
-     this.$refs.childrenAudio.isRecord = false;
+      this.$refs.childrenAudio.isRecord = false;
     },
   },
   async onLoad(option) {
@@ -607,22 +610,6 @@ export default {
     height: 60rpx;
     width: 100%;
   }
-  .choose-limit {
-    position: relative;
-    display: flex;
-    align-items: center;
-    image {
-      width: 130rpx;
-      height: 38rpx;
-    }
-    .limit-img {
-      position: absolute;
-      top: -13rpx;
-      right: -30rpx;
-      width: 46rpx;
-      height: 26rpx;
-    }
-  }
   .content {
     padding: 34rpx 34rpx 0rpx;
     margin-bottom: -20rpx;
@@ -672,12 +659,28 @@ export default {
         display: flex;
         color: #2088ff;
         align-items: center;
-
         image {
           width: 27rpx;
           height: 32rpx;
           margin-right: 12rpx;
         }
+        .choose-limit {
+          position: relative;
+          display: flex;
+          align-items: center;
+          margin-right: 20rpx;
+          image {
+            width: 130rpx;
+            height: 38rpx;
+          }
+          .limit-img {
+            position: absolute;
+            top: -13rpx;
+            right: -30rpx;
+            width: 46rpx;
+            height: 26rpx;
+          }
+        }
       }
     }
   }

pages-activity/components/areaCode.vue

@@ -1,77 +0,0 @@
-<template>
-  <view class="select-box">
-    <u-popup v-model="areacodeShow" mode="bottom" @close="cancel">
-      <view class="box" style="color: #333333; font-size: 28rpxrpx">请选择您的国际区号</view>
-      <view class="box" style="color: #2c83ff" @click="areacode('86')">大陆+86</view>
-      <view class="box" style="color: #2c83ff" @click="areacode('852')">香港+852</view>
-      <view class="box" style="color: #2c83ff" @click="areacode('886')">台湾+886</view>
-      <view class="box" style="color: #2c83ff" @click="areacode('1')">美国+1</view>
-      <view class="box" style="color: #2c83ff" @click="areacode('65')">新加坡+65</view>
-      <view class="box box-bottom" style="color: #a9afb8" @click="cancel">取消</view>
-    </u-popup>
-  </view>
-</template>
-
-<script>
-import { User } from "@/config/api.js";
-export default {
-  watch: {
-    isAreaCode() {
-      this.areacodeShow = this.isAreaCode;
-    },
-    typesignup() {
-      this.signupType = this.typesignup;
-    },
-  },
-  data() {
-    return {
-      areacodeShow: false,
-    };
-  },
-  props: {
-    isAreaCode: {
-      type: Boolean,
-      default: false,
-    },
-    areaCode: {
-      type: Object,
-    },
-  },
-  methods: {
-    areacode(num) {
-      User.countryCcodeAdd({
-        CountryCode: num,
-      }).then((res) => {
-        if (res.Ret == 200) {
-          this.areacodeShow = false;
-          this.$parent.isAreaCode = false;
-          this.$parent.isNeedAddCountryCode = false;
-          this.$parent.signupAdd(this.areaCode.id, this.areaCode.type);
-        }
-      });
-    },
-    cancel() {
-      this.areacodeShow = false;
-      this.$parent.isAreaCode = false;
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.select-box {
-  width: 100%;
-
-  .box {
-    height: 95prx;
-    line-height: 95rpx;
-    text-align: center;
-    font-size: 32rpx;
-    border-bottom: 1rpx solid #ebebeb;
-  }
-
-  .box-bottom {
-    border-bottom: none !important;
-  }
-}
-</style>

pages-activity/components/index.js

@@ -1,206 +0,0 @@
-import { activity, User } from "@/config/api.js";
-let app = getApp();
-export default {
-  data() {
-    return {
-      listActivityStaus: [], //状态
-      listActivityType: [], //类型
-      listChartPermission: [], //分类
-      listChartPermissionInit: [],
-      activityTypeIds: "", //活动类型id 多个用 , 隔开
-      chartPermissionIds: "", //行业id 多个用 , 隔开
-      chartPermissionName: "所有行业",
-      activityTypeName: "所有类型",
-      selectShow: false,
-      isShowJurisdiction: false,
-      isGain: true,
-      isId: 0,
-      activityIdAdd: "",
-      // 历史搜索列表
-      historySearchList: [],
-      flag: false,
-      activityTimeList: [
-        { Id: 1, IsChoose: false, StatusName: "今日活动" },
-        { Id: 2, IsChoose: false, StatusName: "明日活动" },
-      ],
-      activityTimeStatus: "",
-      keyWord: "",
-      isNeedAddCountryCode: false, //判断是否需要区号
-      isAreaCode: false,
-      areaCode: {
-        id: "",
-        type: "",
-      },
-    };
-  },
-  methods: {
-    // 滑动状态下拉选择的收起
-    closeTheWindow(type) {
-      if (type == "statusstate") {
-        const state = this.activeState ? this.activeState.split(",").map(Number) : [];
-        this.listActivityStaus.forEach((item) => {
-          if (state.indexOf(item.Id) !== -1) {
-            item.IsChoose = true;
-          } else {
-            item.IsChoose = false;
-          }
-        });
-      } else if (type == "genre") {
-        const types = this.activityTypeIds ? this.activityTypeIds.split(",").map(Number) : [];
-        this.listActivityType.forEach((item) => {
-          if (types.includes(item.ActivityTypeId)) {
-            item.IsChoose = true;
-          } else {
-            item.IsChoose = false;
-          }
-        });
-      } else {
-        const chart = this.chartPermissionIds ? this.chartPermissionIds.split(",").map(Number) : [];
-        this.listChartPermission.forEach((item) => {
-          if (chart.includes(item.ChartPermissionId)) {
-            item.IsChoose = true;
-          } else {
-            item.IsChoose = false;
-          }
-        });
-      }
-    },
-    //是否展示有权限的行业
-    isJurisdiction() {
-      if (this.isShowJurisdiction) {
-        this.isId = 2;
-      } else {
-        this.isId = 1;
-      }
-      this.getUserSearchContent("traverse");
-    },
-    /* 新布局产业选项确定按钮 */
-    replacementConfirm(type) {
-      this.page_no = 1;
-      if (type == "statusstate") {
-        const arr = [];
-        const str = [];
-        this.listActivityStaus.forEach((key) => {
-          if (key.IsChoose) {
-            arr.push(key.Id);
-            str.push(key.StatusName);
-          }
-        });
-        this.activeState = arr.join(",");
-        const arrTwo = [];
-        const strTwo = [];
-        this.activityTimeList.forEach((key) => {
-          if (key.IsChoose) {
-            arrTwo.push(key.Id);
-            strTwo.push(key.StatusName);
-          }
-        });
-        this.activityTimeStatus = arrTwo.join(",");
-        if (strTwo.length > 0) {
-          this.activeStateName = strTwo.join(",");
-        } else {
-          if (str.length == this.listActivityStaus.length || str.length <= 0) {
-            this.activeStateName = "所有状态";
-          } else {
-            this.activeStateName = str.join(",");
-          }
-        }
-      } else if (type == "industry") {
-        const arr = [];
-        const str = [];
-        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(",");
-      } else {
-        const arr = [];
-        const str = [];
-        this.listActivityType.forEach((key) => {
-          if (key.IsChoose) {
-            arr.push(key.ActivityTypeId);
-            str.push(key.ActivityTypeName);
-          }
-        });
-        if (str.length == this.listActivityType.length || str.length <= 0) {
-          this.activityTypeName = "所有类型";
-        } else {
-          this.activityTypeName = str.join(",");
-        }
-        this.activityTypeIds = arr.join(",");
-      }
-      this.page_no = 1;
-      this.collectList = [];
-      this.dynamicList = [];
-      this.spanIndex = [];
-      this.keyWord = "";
-      this.fastSearchKeWord();
-      this.getList();
-      this.selectComponent(`#${type}`).toggle();
-    },
-    /* 新布局产业选项重置按钮 */
-    replacementBtn(type) {
-      if (type == "statusstate") {
-        this.listActivityStaus.forEach((item) => (item.IsChoose = false));
-        this.activityTimeList.forEach((key) => {
-          key.IsChoose = false;
-        });
-        this.listActivityStaus[0].IsChoose = true;
-        this.activeState = "1";
-        this.activityTimeStatus = "";
-        this.activeStateName = "未开始";
-      } else if (type == "industry") {
-        this.listChartPermission = this.listChartPermissionInit;
-        this.chartPermissionIds = "";
-        this.isShowJurisdiction = false;
-        this.isId = 2;
-        this.listChartPermission.map((item) => (item.IsChoose = false));
-        this.chartPermissionName = "所有行业";
-      } else {
-        this.listActivityType.forEach((item) => (item.IsChoose = false));
-        this.activityTypeIds = "";
-        this.activityTypeName = "所有类型";
-      }
-    },
-    //状态的下拉选择
-    overallBtn(type, item) {
-      this.listActivityStaus.forEach((key) => {
-        if (key.Id == item.Id) {
-          key.IsChoose = !key.IsChoose;
-        }
-      });
-    },
-    // 行业的下拉选择
-    overallClick(type, item) {
-      if (this.isShowJurisdiction) return;
-      this.listChartPermission.forEach((key) => {
-        if (key.ChartPermissionId == item.ChartPermissionId) {
-          key.IsChoose = !key.IsChoose;
-        }
-      });
-    },
-    //类型的下拉选择
-    overallActivity(type, item) {
-      this.listActivityType.forEach((key) => {
-        if (key.ActivityTypeId == item.ActivityTypeId) {
-          key.IsChoose = !key.IsChoose;
-        }
-      });
-    },
-    //今日，明日 活动的选择
-    timeListBtn(type, item) {
-      this.activityTimeList.forEach((key) => {
-        if (key.Id == item.Id) {
-          key.IsChoose = !key.IsChoose;
-        }
-      });
-    },
-  },
-};

pages-activity/components/indexActivity.js

@@ -1,359 +0,0 @@
-import { activity, User } from "@/config/api.js";
-let app = getApp();
-export default {
-  data() {
-    return {
-      page_no: 1,
-      pageSize: 10,
-      collectList: [],
-      status: "loadmore",
-      refresh: false, //正在下拉
-      loadText: {
-        loadmore: "上拉加载更多",
-        loading: "加载中",
-        nomore: "已经到底了",
-      },
-      isNeedAddCountryCode: false, //判断是否需要区号
-      isAreaCode: false,
-      areaCode: {
-        id: "",
-        type: "",
-      },
-      /**/
-      tabsActive: 0,
-      /**/
-      /*  共用的弹框  */
-      isShow: false, //弹框
-      signupType: "", //关注类型
-      goFollow: false, //是否关注公众号
-      signupStatus: "Success", //4个不同的类型提示文案
-      hasPermission: "", //是否有权限
-      jurisdictionList: {
-        SellerMobile: "",
-        PopupMsg: "",
-        OperationMode: "",
-        SellerName: "",
-        ActivityId: "",
-      },
-      editIsShow: false, //外呼莫泰框
-      isCancelShow: false,
-      idTypeCancel: {
-        id: "",
-        type: 1,
-        cutId: "",
-        state: "",
-        isNum: false,
-      },
-      countryCode: "", //外呼区号
-      mobileEdit: "", //外呼手机号
-      goOnNextStep: "", //设置外呼号后弹出哪个
-      isShowhasPermission: false, //拨打销售电话
-      applyForIsShow: false, //潜在用户
-      mailboxBinding: false, //是否绑定邮箱
-    };
-  },
-  methods: {
-    // 我要报名
-    wanttosignup(item) {
-      this.activityIdAdd = item.ActivityId;
-      if (item.YidongActivityId) {
-        this.goDetail(item);
-        return;
-      } else if (item.IsLimitPeople == 1 && item.ActivityTypeName == "公司调研电话会") {
-        this.selectShow = true;
-      } else {
-        this.signupIsAddOfCancel(item, 3);
-      }
-    },
-    //判断是否要绑定区号
-    countryCcode() {
-      User.countryCcode().then((res) => {
-        if (res.Ret == 200) {
-          this.isNeedAddCountryCode = res.Data.IsNeedAddCountryCode;
-        }
-      });
-    },
-    //报名/取消报名
-    signupIsAddOfCancel(item, type, valName = "") {
-      let id = this.activityIdAdd || item.ActivityId;
-      let itemData = item;
-      if (item && item.IsSignup == 1) {
-        const str = item.ActivityTime.replace(/-/g, "/");
-        const date = new Date(str);
-        const times = date.getTime();
-        const num = new Date().getTime();
-        if (times - num <= 3600000) {
-          uni.showModal({
-            confirmText: "知道了",
-            showCancel: false,
-            confirmColor: "#3385FF",
-            content: type == 1 ? "活动开始前1小时内无法取消预约外呼，请联系对口销售处理" : "活动开始前1小时内无法取消报名，请联系对口销售处理",
-          });
-          return;
-        }
-        uni.showModal({
-          content: type == 1 ? "您要取消此次活动预约外呼吗？" : "您要取消此次活动的报名吗？",
-          confirmColor: "#3385FF",
-          cancelColor: "#606266",
-          success: async (res) => {
-            if (res.confirm) {
-              const res = await activity.signupCancel({ ActivityId: item.ActivityId, SignupType: type });
-              if (res.Ret === 200) {
-                item.IsSignup = 0;
-                this.init();
-
-                type == 1
-                  ? uni.showToast({
-                      title: "预约外呼已取消",
-                      duration: 2000,
-                    })
-                  : uni.showToast({
-                      title: "已取消报名",
-                      duration: 2000,
-                    });
-                if (valName === "我的") {
-                  this.getActivityList();
-                }
-              }
-            }
-          },
-        });
-      } else {
-        let timer = null;
-        if (this.flag) return;
-        clearTimeout(timer);
-        this.flag = true;
-        this.selectShow = false;
-        if (this.isNeedAddCountryCode) {
-          this.isAreaCode = true;
-          this.areaCode = {
-            id,
-            type,
-          };
-        } else {
-          activity
-            .signupAdd({
-              ActivityId: id,
-              SignupType: type,
-            })
-            .then((res) => {
-              if (res.Ret == 200) {
-                this.hasPermission = res.Data.HasPermission;
-                this.jurisdictionList.ActivityId = res.Data.ActivityId;
-
-                if (this.hasPermission == 1) {
-                  const index = this.collectList.findIndex((key) => key.ActivityId == id);
-                  this.collectList[index].SignupType = type;
-                  this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
-                  this.signupStatus = res.Data.SignupStatus;
-                  this.countryCode = res.Data.CountryCode;
-                  this.mobileEdit = res.Data.Mobile;
-                  this.goOnNextStep = res.Data.GoFollow;
-                  this.idTypeCancel = {
-                    cutId: res.Data.ActivityId,
-                    state: 1,
-                  };
-                  if (res.Data.GoBindEmail) {
-                    this.mailboxBinding = true;
-                    return;
-                  }
-                  if (res.Data.SignupStatus !== "Success") {
-                    this.isShow = true;
-                  } else {
-                    if (res.Data.GoOutboundMobile) {
-                      this.editIsShow = true;
-                    } else if (res.Data.GoFollow) {
-                      this.goFollow = res.Data.GoFollow;
-                    } else if (res.Data.SignupStatus == "Success") {
-                      this.collectList.findIndex((key) => {
-                        if (key.ActivityId == id) {
-                          key.IsSignup = 1;
-                        }
-                      });
-                      this.isShow = true;
-                    }
-                  }
-                } else if (this.hasPermission == 2) {
-                  this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-                  this.jurisdictionList.SellerName = res.Data.SellerName;
-                  this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-                  this.isShowhasPermission = true;
-                } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-                  this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-                  this.applyForIsShow = true;
-                }
-              }
-            });
-        }
-        timer = setTimeout(() => {
-          this.flag = false;
-        }, 500);
-      }
-    },
-    // 弹框的初始化
-    init() {
-      this.signupType = "";
-      this.goFollow = false;
-      this.signupStatus = "";
-      this.isShow = false;
-      this.isCancelShow = false;
-    },
-    //添加消息提醒接口
-    meetingReminderAdd(id, type) {
-      if (type != 0) {
-        this.meetingReminderCancel(id);
-        return;
-      }
-      activity
-        .meetingReminderAdd({
-          ActivityId: id,
-        })
-        .then((res) => {
-          if (res.Ret == 200) {
-            this.hasPermission = res.Data.HasPermission;
-            this.jurisdictionList.ActivityId = res.Data.ActivityId;
-            if (this.hasPermission == 1) {
-              if ((res.Data.GoFollow && res.Data.SignupStatus !== "Success") || !res.Data.GoFollow) {
-                this.isShow = true;
-              } else {
-                this.goFollow = res.Data.GoFollow;
-              }
-              this.signupType = 999;
-              this.signupStatus = res.Data.SignupStatus;
-              this.idTypeCancel = {
-                cutId: res.Data.ActivityId,
-                state: 1,
-                name: "conference",
-              };
-              this.collectList.forEach((item) => {
-                if (id == item.ActivityId) {
-                  item.IsCancelMeetingReminder = 1;
-                }
-              });
-            } else if (this.hasPermission == 2) {
-              this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-              this.jurisdictionList.SellerName = res.Data.SellerName;
-              this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-              this.isShowhasPermission = true;
-            } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-              this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-              this.applyForIsShow = true;
-            }
-          }
-        });
-    },
-    //取消消息提醒接口
-    meetingReminderCancel(id) {
-      activity
-        .meetingReminderCancel({
-          ActivityId: id,
-        })
-        .then((res) => {
-          if (res.Ret == 200) {
-            uni.showModal({
-              confirmText: "知道了",
-              confirmColor: "#3385FF",
-              content: res.Msg,
-              showCancel: false,
-              success: (res) => {
-                if (this.isrefresh) return this.getActivityList();
-                if (res.confirm) {
-                  this.collectList.forEach((item) => {
-                    if (id == item.ActivityId) {
-                      item.IsCancelMeetingReminder = 0;
-                    }
-                  });
-                }
-              },
-            });
-          }
-        });
-    },
-
-    //帮我带问
-    async askingGo(item, type = "") {
-      const res = await activity.checkAskActivity({ ActivityId: item.ActivityId });
-      if (res.Ret == 200) {
-        this.hasPermission = res.Data.HasPermission;
-        this.jurisdictionList.ActivityId = res.Data.ActivityId;
-        if (this.hasPermission == 1) {
-          uni.navigateTo({
-            url: "/pages-activity/generationAsk/generationAsk?id=" + item.ActivityId + "&type=" + type,
-          });
-        } else if (this.hasPermission == 2) {
-          this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-          this.jurisdictionList.SellerName = res.Data.SellerName;
-          this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-          this.isShowhasPermission = true;
-        } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-          this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-          this.applyForIsShow = true;
-        }
-      }
-    },
-    // 弹框的初始化
-    init() {
-      this.signupType = "";
-      this.goFollow = false;
-      this.signupStatus = "";
-      this.isShow = false;
-      this.isCancelShow = false;
-    },
-    //预约纪要、取消预约纪要
-    async summaryIsHandel(item, type = "") {
-      if (item.IsAppointment == 0) {
-        const res = await activity.postAppointmentAdd({ ActivityId: item.ActivityId });
-        if (res.Ret == 200) {
-          this.hasPermission = res.Data.HasPermission;
-          this.jurisdictionList.ActivityId = res.Data.ActivityId;
-          if (this.hasPermission == 1) {
-            item.IsAppointment = 1;
-            this.signupType = "summaryIsHandel";
-            this.signupStatus = res.Data.SignupStatus;
-            this.goOnNextStep = res.Data.GoFollow;
-            if (res.Data.SignupStatus !== "Success") {
-              this.isShow = true;
-            } else {
-              if (res.Data.GoFollow) {
-                this.goFollow = res.Data.GoFollow;
-              } else if (res.Data.SignupStatus == "Success") {
-                this.isShow = true;
-              }
-            }
-          } else if (this.hasPermission == 2) {
-            this.jurisdictionList.SellerMobile = res.Data.SellerMobile;
-            this.jurisdictionList.SellerName = res.Data.SellerName;
-            this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-            this.isShowhasPermission = true;
-          } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-            this.jurisdictionList.PopupMsg = res.Data.PopupMsg;
-            this.applyForIsShow = true;
-          }
-        }
-      } else {
-        uni.showModal({
-          content: "确定要取消预约本场调研的纪要吗?",
-          confirmColor: "#3385FF",
-          cancelColor: "#606266",
-          success: async (res) => {
-            if (res.confirm) {
-              const res = await activity.postAppointmentCancel({ ActivityId: item.ActivityId });
-              if (res.Ret === 200) {
-                item.IsAppointment = 0;
-                this.init();
-                if (type === "我的") {
-                  this.getActivityList();
-                }
-              }
-            }
-          },
-        });
-      }
-    },
-    cancelEnsure() {},
-    //去往详情页面
-    goDetail(item) {
-      this.$store.dispatch("checkHandle", "/pages-activity/activityDetail/activityDetail?id=" + item.ActivityId);
-    },
-  },
-};

pages-activity/components/indexActivity.scss

@@ -1,168 +0,0 @@
-.collect-ul {
-    padding: 0 34rpx;
-  
-    .collect-ltem {
-      width: 682rpx;
-      height: 390rpx;
-      background: #ffffff;
-      box-shadow: 0rpx 3rpx 6rpx rgba(141, 141, 141, 0.16);
-      border-radius: 16rpx;
-      padding: 0 20rpx 20rpx;
-      margin-top: 30rpx;
-    }
-  
-    .title-date {
-      height: 90rpx;
-      display: flex;
-      align-items: center;
-      font-size: 28rpx;
-      color: #333;
-      border-bottom: 1px solid #e5e5e5;
-  
-      text {
-        background: linear-gradient(264deg, #01baff 0%, #0044ff 100%);
-        width: 95rpx;
-        height: 40rpx;
-        text-align: center;
-        margin-right: 20rpx;
-        font-size: 24rpx;
-        line-height: 40rpx;
-        color: #fff;
-        border-radius: 8rpx;
-      }
-  
-      .xianxia {
-        background: linear-gradient(264deg, #ff8801 0%, #ffb950 100%);
-      }
-    }
-  
-    .item-li {
-      display: flex;
-      padding: 20rpx 0 16rpx;
-      .item-img {
-        flex-shrink: 0;
-        width: 191rpx;
-        height: 254rpx;
-        border-radius: 8rpx;
-        overflow: hidden;
-        position: relative;
-        background: #efefef;
-        image {
-          width: 100%;
-          height: 100%;
-        }
-        .img-type {
-            position: absolute;
-            top: 0;
-            left: 0;
-            color: #fff;
-            height: 100%;
-            width: 100%;
-            image {
-                height: 100%;
-                width: 100%;
-            }
-          }
-        .img-status {
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 95rpx;
-          height: 40rpx;
-          background: #c9c9c9;
-          border-radius: 8rpx 0rpx 8rpx 0rpx;
-          font-size: 20rpx;
-          text-align: center;
-          line-height: 40rpx;
-          color: #fff;
-          z-index: 5;
-        }
-        .proceed {
-          background-color: #ffb54a;
-        }
-        .begin {
-          background-color: #01a7ff;
-        }
-      }
-  
-      .item {
-        width: 450rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        padding-left: 20rpx;
-        font-size: 28rpx;
-        color: #666666;
-        .item-text {
-          min-height: 200rpx;
-          .activity-title {
-            color: #333333;
-            font-weight: 700;
-            margin-bottom: 20rpx;
-          }
-        }
-      }
-      .real-time{
-        justify-content: flex-end !important;
-      }
-      .bottom-box {
-        display: flex;
-        justify-content:flex-end;
-        align-items: center;
-        color: #3385FF;
-        overflow: hidden;
-        overflow-x:auto;
-        text {
-          width: 113rpx;
-          height: 42rpx;
-          background: #ffffff;
-          border: 2rpx solid #3385ff;
-          border-radius: 4rpx;
-          text-align: center;
-          line-height: 40rpx;
-          font-size: 24rpx;
-          flex-shrink: 0;
-          margin-right: 20rpx;
-        }
-        text:last-child {
-          margin-right: 0rpx !important;
-        }
-        image {
-          width: 27rpx;
-          height: 32rpx;
-          margin-right: 12rpx;
-        }
-        .button {
-          background: #3385ff;
-          color: #fff;
-        }
-      }
-      .city {
-        justify-content: space-between !important;
-        .city-img {
-          display: flex;
-          align-items: center;
-          width:113rpx ;
-        }
-      }
-    }
-  }
-  .expert-item {
-    justify-content:flex-start !important;
-  }
-  .four-btn {
-    justify-content:space-between !important;
-    text:last-child {
-      margin-right: 20rpx !important;
-    }
-  }
-  .select-box {
-    width: 100%;
-    view {
-      height: 95prx;
-      line-height: 95rpx;
-      text-align: center;
-      font-size: 32rpx;
-      border-bottom: 1rpx solid #ebebeb;
-    }
-  }

pages-activity/editOutbound/editOutbound.vue

@@ -106,7 +106,7 @@ export default {
             if (this.identification == "邮箱") {
               let pages = getCurrentPages();
               let prevPage = pages[pages.length - 2];
-              if (prevPage.$page.fullPath == "/pages/activity/activity" || prevPage.$page.fullPath == "/pages-search/activitySearch/activitySearch") {
+              if (prevPage.$page.fullPath == "/pages/activity/activity" || prevPage.$page.fullPath == "/pages-search/indedxSearch/indedxSearch") {
                 const index = prevPage.$vm.collectList.findIndex((item) => item.ActivityId == this.id);
                 prevPage.$vm.collectList[index].IsSignup = 1;
               }

pages-activity/playBack/playBack.vue

@@ -391,7 +391,7 @@ export default {
       }
     }
   }
-  @import "../components/indexActivity.scss";
+  @import "@/components/activity/indexActivity.scss";
 }
 /deep/.van-dropdown-menu {
   background-color: #fff;

pages-activity/specialResearchPage/specialResearchPage.vue

@@ -244,5 +244,5 @@ export default {
     }
   }
 }
-@import "../components/indexActivity.scss";
+@import "@/components/activity/indexActivity.scss";
 </style>

pages-activity/themeActivity/themeActivity.vue

@@ -102,9 +102,9 @@
 import { activity, User } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
 import modalDialog from "@/components/modalDialog.vue";
-import myMixin from "../components/index.js";
-import myActivityMixin from "../components/indexActivity.js";
-import areaCode from "@/pages-activity/components/areaCode.vue";
+import myMixin from "@/components/activity/index.js";
+import myActivityMixin from "@/components/activity/indexActivity.js";
+import areaCode from "@/components/activity/areaCode.vue";
 import freeCharge from "@/components/freeCharge";
 export default {
   mixins: [myMixin, myActivityMixin],
@@ -248,5 +248,5 @@ export default {
     padding-top: 10rpx;
   }
 }
-@import "../components/indexActivity.scss";
+@import "@/components/activity/indexActivity.scss";
 </style>

pages-my/mySchedulepage/mySchedulepage.vue

@@ -56,7 +56,7 @@
                       <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-if="item.IsSignup !== 1" @click="wanttosignup(item)">我要报名</text>
                       <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
                     </block>
                   </block>
@@ -102,6 +102,14 @@
       :applyForIsShow="applyForIsShow"
       :mailboxBinding="mailboxBinding"
     />
+    <view class="select-box">
+      <u-popup v-model="selectShow" mode="bottom">
+        <view style="color: #333333; font-size: 28rpxrpx">请选择参会方式</view>
+        <view style="color: #2c83ff" @click="signupIsAddOfCancel('', 1)">预约外呼</view>
+        <view style="color: #2c83ff" @click="signupIsAddOfCancel('', 2)">自主拨入</view>
+        <view style="color: #a9afb8" @click="selectShow = false">取消</view>
+      </u-popup>
+    </view>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <view v-if="showAudioBox">
       <audioModule :showAudioPop.sync="showAudioPop" />
@@ -112,7 +120,7 @@
 <script>
 import { activity } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
-import myActivityMixin from "@/pages-activity/components/indexActivity.js";
+import myActivityMixin from "@/components/activity/indexActivity.js";
 import modalDialog from "@/components/modalDialog.vue";
 import freeCharge from "@/components/freeCharge";
 import audioModule from "@/components/audioModule/index";
@@ -138,6 +146,7 @@ export default {
       isrefresh: true,
       activityTypeId: "",
       showAudioPop: false,
+      selectShow: false,
     };
   },
   computed: {
@@ -284,5 +293,5 @@ export default {
     }
   }
 }
-@import "@/pages-activity/components/indexActivity.scss";
+@import "@/components/activity/indexActivity.scss";
 </style>

pages-my/reportPage/reportPage.vue

@@ -2,12 +2,12 @@
   <view class="container reportDetail-container">
     <block v-if="haveAuth === 1">
       <web-view :src="strategyUrl + '?url=' + linkurl" v-if="linkurl">
-        <cover-view bindtap="searchViewTap" class="search-view">
+        <!-- <cover-view bindtap="searchViewTap" class="search-view">
           <cover-view class="search-view-box" @click="btnSearch">
             <cover-image class="search-icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/search.png"></cover-image>
             <cover-view class="search-text">搜索您想要的纪要</cover-view>
           </cover-view>
-        </cover-view>
+        </cover-view> -->
         <cover-view class="footer-con">
           <cover-view class="handle-item" @click="applyHandle">
             <cover-image

pages-my/search/search.vue

@@ -1,810 +0,0 @@
-<template>
-  <view class="search-container container">
-    <view class="sticky-content">
-      <view class="searchTarget-header">
-        <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="radio-content">
-        <van-radio-group :value="radioSelect" @change="onChangeRadio" direction="horizontal">
-          <block v-for="item in radioSelectList" :key="item.Id">
-            <van-radio v-if="item.IsShow" :name="item.Id" icon-size="16">{{ item.Name }}</van-radio>
-          </block>
-        </van-radio-group>
-      </view>
-      <view class="tab-cont" v-if="radioSelect == 2 && isResult">
-        <view :class="['item', item.mode == orderColumn && 'tabs-active text_twoLine']" v-for="item in tabBars" :key="item.mode" @click.stop="toggleTab(item)">
-          {{ item.PermissionName }}
-          <view class="active" v-if="orderColumn === item.mode"></view>
-        </view>
-      </view>
-    </view>
-    <view class="search-cont" v-if="!isResult">
-      <view class="search-cont-top">
-        <view class="cont-tit">
-          <text>热搜关键词：</text>
-        </view>
-        <view class="targetList">
-          <view class="target-item" v-for="(item, index) in hotKeyWord" :key="index" @click="chooseTarget(item.KeyWord)"># {{ item.KeyWord }}</view>
-        </view>
-      </view>
-      <view class="search-cont-top">
-        <view class="cont-tit">
-          <text>推荐关键词：</text>
-        </view>
-        <view class="targetList">
-          <view class="target-item" v-for="(item, index) in keywordList" :key="index" @click="chooseTarget(item)"># {{ item }}</view>
-          <view class="chart-item" v-for="(item, index) in chartWordList" :key="index" @click="chooseTarget(item.KeyWord)"># {{ item.KeyWord }}</view>
-        </view>
-      </view>
-      <view class="search-cont-top" v-if="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">
-          <block v-for="(item, index) in historySearchList" :key="index">
-            <view v-if="index < 8" class="target-item" @click="chooseTarget(item)"># {{ item }}</view>
-          </block>
-        </view>
-      </view>
-    </view>
-    <!-- 内容地方 -->
-    <view class="search-cont" v-else>
-      <block v-if="haveResult">
-        <view class="audio-video-content" v-if="radioSelect == 4">
-          <view :class="item.Type == 1 ? 'audio-item' : 'video-item'" v-for="item in videoAudioList" :key="item.Id">
-            <view class="cover-item" :style="{ 'background-image': 'url(' + item.BackgroundImg + ')' }">
-              <block v-if="item.Type == 2">
-                <video
-                  :id="item.Id"
-                  :src="item.ResourceUrl"
-                  :poster="item.BackgroundImg"
-                  enable-play-gesture
-                  object-fit="contain"
-                  show-mute-btn
-                  autoplay
-                  @ended="handleVideoEnd"
-                  v-if="item.Id == curVideoId"
-                ></video>
-                <image v-else class="img-bg" @click="handelPlay(item)" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/play_icon_index.png"></image>
-              </block>
-              <block v-else>
-                <image
-                  class="img-bg"
-                  @click.stop="handelPlay(item)"
-                  :src="
-                    curVoiceId === item.ActivityId && !curAudioPaused
-                      ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_stop_index.png'
-                      : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_group_index.png'
-                  "
-                ></image>
-              </block>
-              <text class="time">{{ item.PublishTime }}</text>
-            </view>
-            <view class="title-share">
-              <view class="title text_twoLine">{{ item.Title }}</view>
-              <view class="share">
-                <view class="share-text" :style="[classifyColor(item.ChartPermissionName)]">
-                  <image :src="classifyIcon(item)"></image>
-                  {{ item.Type == 1 ? "音频" : "视频" }}｜{{ item.ChartPermissionName }}
-                </view>
-                <button class="share-icon" open-type="share" :data-item="item">
-                  <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/share-btn-icon.png"></image>
-                </button>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="result-data" v-else>
-          <view class="report-ul">
-            <view class="report-item" v-for="(report, index) in resultList" :key="index" v-if="index % 2 === 0" @click="goDetail(report)">
-              <view class="item-content-img" v-if="report.BodyHtml">
-                <image :src="report.BodyHtml" mode=""></image>
-              </view>
-              <view class="item-content" v-else><u-parse :html="report.Body[0] + '...'"></u-parse></view>
-              <view class="line"></view>
-              <view :class="['item-title', report.Source != 1 && 'chart-title text_twoLine']"><u-parse :html="report.Title"></u-parse></view>
-              <text class="item-createtime" v-if="report.Source == 1">{{ report.PublishDate }}</text>
-              <view class="item-createtime chart-tag" v-else>
-                <text class="tag-item" v-if="report.PtagName">{{ report.PtagName }}</text>
-                <text class="tag-item" v-if="report.CtagName">{{ report.CtagName }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="report-ul">
-            <view class="report-item" v-for="(report, index) in resultList" :key="index" v-if="index % 2 !== 0" @click="goDetail(report)">
-              <view class="item-content-img" v-if="report.BodyHtml">
-                <image :src="report.BodyHtml" mode=""></image>
-              </view>
-              <view class="item-content" v-else><u-parse :html="report.Body[0] + '...'"></u-parse></view>
-              <view class="line"></view>
-              <view :class="['item-title', report.Source != 1 && 'chart-title text_twoLine']"><u-parse :html="report.Title"></u-parse></view>
-              <text class="item-createtime" v-if="report.Source == 1">{{ report.PublishDate }}</text>
-              <view class="item-createtime chart-tag" v-else>
-                <text class="tag-item" v-if="report.PtagName">{{ report.PtagName }}</text>
-                <text class="tag-item" v-if="report.CtagName">{{ report.CtagName }}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="pageNum > 1" />
-      </block>
-      <view class="nodata" v-else>
-        <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/act_search.png" mode="" class="nodata_ico"></image>
-        <text>未找到您想搜索的内容</text>
-      </view>
-    </view>
-    <view v-if="showAudioBox">
-      <audioModule :showAudioPop.sync="showAudioPop" />
-    </view>
-    <modalDialog :isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :jurisdictionList="jurisdictionList" :hasPermission="hasPermission" />
-  </view>
-</template>
-
-<script>
-import { Search, Home } from "@/config/api.js";
-import { Debounce, Throttle } from "@/config/util.js";
-import { color_word_bg, MultimediaIcon } from "@/utils/styleClassify";
-import audioModule from "@/components/audioModule/index";
-import modalDialog from "@/components/modalDialog.vue";
-let app = getApp({ allowDefault: true });
-export default {
-  data() {
-    return {
-      searchTxt: "", //搜索关键字
-      isResult: false, //显示搜索结果
-      haveResult: true, //是否有搜索数据
-      // 历史搜索列表
-      historySearchList: [],
-      // 关键字列表
-      keywordList: [],
-      chartWordList: [],
-      // 搜索结果列表
-      resultList: [],
-      resultDataList: [],
-      indList: [],
-      pageNum: 1,
-      pageSize: 10,
-      totalPage: 0,
-      hotKeyWord: [],
-      radioSelect: 1,
-      radioSelectList: [], //搜索的tabs
-      tabBars: [
-        {
-          PermissionName: "匹配度排序",
-          mode: "Matching",
-        },
-        {
-          PermissionName: "综合排序",
-          mode: "Comprehensive",
-        },
-        {
-          PermissionName: "发布时间排序",
-          mode: "PublishDate",
-        },
-      ],
-      orderColumn: "Matching",
-      status: "loadmore",
-      loadText: {
-        loadmore: "上拉加载更多",
-        loading: "加载中",
-        nomore: "已经到底了",
-      },
-      videoContext: null,
-      showAudioPop: false, //播放音频
-      isShowhasPermission: false, //  联系销售的提交申请
-      applyForIsShow: false, // 提交申请
-      jurisdictionList: {},
-      hasPermission: "", //权限
-      audioShareId: "", //通过分享单个音频点进页面时使用
-      videoShareId: "", //通过分享单个视频点进页面时使用
-      videoAudioList: [], //音频  视频 list
-      curVideoId: 0, //音频Id
-      videoPlayTime: 0, //
-    };
-  },
-  components: { modalDialog, audioModule },
-  computed: {
-    curVoiceId() {
-      //当前正在播放的音频id
-      return this.$store.state.audioBg.indexId;
-    },
-    curAudioPaused() {
-      //当前音频是否暂停状态
-      return this.$store.state.audioBg.paused;
-    },
-    showAudioBox() {
-      return this.$store.state.audioBg.parseIntShow;
-    },
-  },
-  watch: {
-    searchTxt(newVal) {
-      if (newVal.length <= 0) {
-        this.isResult = false;
-        this.orderColumn = "Matching";
-      }
-    },
-  },
-  methods: {
-    //获取顶部导航
-    async getHeaderTab() {
-      const res = await Home.headerTab({
-        SearchPage: 1,
-      });
-      if (res.Ret === 200) {
-        this.radioSelectList = res.Data || [];
-      }
-    },
-    //获取热搜关键词的请求
-    async researchHotKeyWord() {
-      const res = await Search.getKeys();
-      if (res.Ret === 200) {
-        this.hotKeyWord = res.Data.ListHot || [];
-        this.chartWordList = res.Data.List || [];
-        this.keywordList = res.Data.Item ? res.Data.Item.ConfigValue.split(",") : [];
-      }
-    },
-    //点击了搜索的变化
-    onChangeRadio(value) {
-      this.radioSelect = value.detail;
-      this.orderColumn = "Matching";
-      let srt = this.searchTxt.replace(/^\s+|\s+$/g, "");
-      if (!srt) return this.$util.toast("请输入关键字");
-      this.dataInit();
-      this.getDataList();
-    },
-    /* 获取关键词 */
-    getKeyWord() {
-      Search.getKeys().then((res) => {
-        if (res.Ret === 200) {
-          this.keywordList = res.Data.Item.ConfigValue ? res.Data.Item.ConfigValue.split(",") : [];
-        }
-      });
-    },
-    // 选择历史搜索
-    chooseTarget(item) {
-      this.searchTxt = item;
-      this.SecName = item;
-      this.dataInit();
-      this.indList = [];
-      if (!this.historySearchList.includes(this.searchTxt)) {
-        this.historySearchList.unshift(this.searchTxt);
-        this.$db.set("historySearchList", JSON.stringify(this.historySearchList));
-      }
-      this.getDataList();
-    },
-    // 拼接
-    join(str, key) {
-      return str.replace(new RegExp(`${key}`, "g"), `%%${key}%%`).split("%%");
-    },
-    // 搜索数据
-    searchHandle: Debounce(function () {
-      if (this.searchTxt) {
-        //添加搜索记录
-        if (!this.historySearchList.includes(this.searchTxt)) {
-          this.historySearchList.unshift(this.searchTxt);
-          this.$db.set("historySearchList", JSON.stringify(this.historySearchList));
-        }
-        this.indList = [];
-        this.dataInit();
-        this.getDataList();
-      } else {
-        this.$util.toast("请输入关键字");
-      }
-    }),
-    // 查找数据
-    async getDataList() {
-      this.isResult = true;
-      if (this.radioSelect == 4) return this.getAudioVideoList();
-      const res = await Search.getArtAndChartList({
-        KeyWord: this.searchTxt.replace(/^\s+|\s+$/g, ""),
-        OrderColumn: this.radioSelect == 2 ? this.orderColumn : "",
-        ListType: this.radioSelect,
-      });
-      if (res.Ret === 200) {
-        this.totalPage = res.Data.Paging.Totals;
-        if (this.radioSelect == 1) {
-          if (!res.Data.List.length) {
-            this.resultDataList = res.Data.ChartList || [];
-          } else if (!res.Data.ChartList.length) {
-            this.resultDataList = res.Data.List || [];
-          } else {
-            this.resultDataList.push(res.Data.List.shift());
-            let newArr = [];
-            let newArrTwo = [];
-            for (let i = 0; i < res.Data.List.length; i += 2) {
-              newArr.push(res.Data.List.slice(i, i + 2));
-            }
-            for (let i = 0; i < res.Data.ChartList.length; i += 2) {
-              newArrTwo.push(res.Data.ChartList.slice(i, i + 2));
-            }
-            let arr = [];
-            newArr.forEach((item, index) => {
-              if (newArrTwo[index]) {
-                arr.push(newArrTwo[index], item);
-              } else {
-                arr.push(item);
-              }
-            });
-            this.resultDataList = this.resultDataList.concat(arr.flat(Infinity));
-          }
-          this.haveResult = this.resultDataList.length ? true : false;
-        } else if (this.radioSelect == 2) {
-          this.resultDataList = res.Data.List || [];
-          this.haveResult = this.resultDataList.length ? true : false;
-        } else {
-          this.resultDataList = res.Data.ChartList || [];
-          this.haveResult = this.resultDataList.length ? true : false;
-        }
-        this.resultList = this.haveResult ? this.resultDataList.slice((this.pageNum - 1) * this.pageSize, this.pageNum * this.pageSize) : [];
-      }
-    },
-    async getAudioVideoList() {
-      const res = await Home.microRoadshowList({
-        PageSize: this.pageSize,
-        CurrentIndex: this.pageNum,
-        KeyWord: this.searchTxt.replace(/^\s+|\s+$/g, ""),
-      });
-      if (res.Ret === 200) {
-        this.status = this.pageNum < res.Data.Paging.Pages ? "loadmore" : "nomore";
-        if (this.pageNum == 1) {
-          this.videoAudioList = res.Data.List || [];
-          this.haveResult = this.videoAudioList.length > 0 ? true : false;
-        } else {
-          this.videoAudioList = this.videoAudioList.concat(res.Data.List);
-        }
-      }
-    },
-    /* 表单清空 */
-    clearIpt() {
-      this.searchTxt = "";
-      this.dataInit();
-      this.isTabAct = false;
-    },
-    /* 进入详情 校验是否有该品种权限 */
-    goDetail(item) {
-      if (item.Source == 2) {
-        /* 无需授权且已绑定 检验是或否有权限 */
-        this.$store.dispatch("checkHandle", "/pages-my/chartPage/chartPage?id=" + item.ChartId);
-      } else {
-        /* 无需授权且已绑定 检验是或否有权限 */
-        this.$store.dispatch("checkHandle", "/pages-my/reportDetail/reportDetail?id=" + item.ArticleId);
-      }
-    },
-    /* 历史搜索清空 */
-    clearHistory() {
-      this.historySearchList = [];
-      this.$db.del("historySearchList");
-    },
-    //获取数据的初始值
-    dataInit() {
-      this.pageNum = 1;
-      this.resultList = [];
-      this.resultDataList = [];
-      this.videoAudioList = [];
-      this.status = "loadmore";
-      uni.pageScrollTo({
-        scrollTop: 0,
-        duration: 0,
-      });
-    },
-    //tabs切换事件
-    toggleTab(item) {
-      this.orderColumn = item.mode;
-      this.pageNum = 1;
-      uni.pageScrollTo({
-        scrollTop: 0,
-        duration: 0,
-      });
-      this.resultList = [];
-      this.getDataList();
-      uni.pageScrollTo({
-        scrollTop: 0,
-        duration: 0,
-      });
-    },
-    //视频播放结束
-    handleVideoEnd() {
-      // 此处因为如果不调用退出全屏方法 安卓和ios页面均会表现异常，安卓横屏不恢复竖屏，ios底部tabbar渲染异常
-      this.videoContext.exitFullScreen();
-      Home.microAideoHistoryAdd({ VideoId: this.curVideoId, PlaySeconds: Number(this.videoPlayTime) });
-      setTimeout(() => {
-        this.curVideoId = 0;
-        this.videoContext = null;
-      }, 200);
-    },
-    //播放的权限判断
-    handelPlay(item) {
-      if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-        if (item.AuthInfo.HasPermission == 1) {
-          item.Type == 1 ? this.audioPlayBack(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) {
-      this.curVideoId = item.Id;
-      this.videoPlayTime = item.PlaySeconds;
-      this.globalBgAudioManager.stop();
-      setTimeout(() => {
-        this.videoContext = wx.createVideoContext(item.Id.toString());
-      }, 300);
-      Home.microAideoHistoryAdd({ VideoId: item.Id });
-    },
-    //音频的播放事件
-    async audioPlayBack(item) {
-      this.curVideoId = 0;
-      this.videoContext && this.videoContext.stop;
-      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;
-    },
-    //音视频的背景色 文字颜色
-    classifyColor(item) {
-      let text_color = color_word_bg.color_word.find((key) => key.name == item).color;
-      let back_ground = color_word_bg.color_bg.find((key) => key.name == item).color;
-      let _isColor = { color: text_color, "background-color": back_ground };
-      return _isColor;
-    },
-    //音视频的图标
-    classifyIcon(item) {
-      let srcItem = MultimediaIcon.find((key) => key.name == item.ChartPermissionName);
-      let imgSrc = item.Type == 1 ? srcItem.audio : srcItem.video;
-      return imgSrc;
-    },
-  },
-  onLoad(options) {
-    wx.hideShareMenu({
-      menus: ["shareAppMessage", "shareTimeline"],
-    });
-    this.getHeaderTab();
-    if (options.text) {
-      this.searchTxt = options.text;
-      this.getDataList();
-    }
-    this.radioSelect = options.isType == 1 ? 2 : Number(options.isType);
-    // 获取历史搜索记录
-    if (this.$db.get("historySearchList")) {
-      let historyList = JSON.parse(this.$db.get("historySearchList"));
-      this.historySearchList = historyList;
-    }
-  },
-  onShow() {
-    this.$store.dispatch("statistics", { PageType: "SummarySearch" });
-    this.getKeyWord();
-    this.researchHotKeyWord();
-    this.$store.commit("audioBg/parseIntAudio", true);
-  },
-  onHide() {
-    this.$store.commit("audioBg/parseIntAudio", false);
-    this.curVideoId = 0;
-  },
-  /** 用户点击分享*/
-  onShareAppMessage: function ({ from, target }) {
-    if (from === "button") {
-      let item = target.dataset.item;
-      let audio_id = item.Type == 1 ? item.Id : "";
-      let video_id = item.Type == 2 ? item.Id : "";
-      return {
-        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : item.Title,
-        path: "/pages/index/index?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id,
-        imageUrl: item.ShareImg,
-      };
-    }
-  },
-  // 上拉加载this.resultList
-  onReachBottom: Throttle(function () {
-    if (!this.resultList.length && !this.videoAudioList.length) return;
-    if (this.status === "nomore") return;
-    this.status = "loading";
-    this.pageNum++;
-    if (this.radioSelect == 4) return this.getDataList();
-    this.resultList = this.resultList.concat(this.resultDataList.slice((this.pageNum - 1) * this.pageSize, this.pageNum * this.pageSize));
-    this.status = this.pageNum * 10 < this.totalPage ? "loadmore" : "nomore";
-  }),
-};
-</script>
-
-<style lang="scss">
-.search-container {
-  background-color: #fff;
-  padding-bottom: 30rpx;
-  .sticky-content {
-    position: sticky;
-    top: 0;
-    left: 0;
-    width: 100%;
-    z-index: 99;
-    padding-bottom: 10rpx;
-    background-color: #fff;
-  }
-  .searchTarget-header {
-    padding: 0 34rpx;
-    width: 100%;
-    position: relative;
-    padding: 30rpx 0;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    .sea_ipt_placeholder {
-      color: #8d8d8d;
-    }
-    .sea_ipt {
-      width: 682rpx;
-      height: 70rpx;
-      line-height: 70rpx;
-      box-sizing: border-box;
-      border: 1rpx solid #e5e5e5;
-      background-color: rgba(245, 245, 245, 0.2);
-      font-size: 26rpx;
-      color: #4a4a4a;
-      padding: 0 180rpx 0 78rpx;
-      border-radius: 70rpx;
-    }
-    .sea_ico {
-      width: 31rpx;
-      height: 31rpx;
-      position: absolute;
-      left: 68rpx;
-      top: 50%;
-      transform: translateY(-50%);
-    }
-    .ipt-right {
-      display: flex;
-      align-items: center;
-      position: absolute;
-      right: 59rpx;
-      top: 50%;
-      transform: translateY(-50%);
-      color: #3385ff;
-      .line {
-        margin: 0 21rpx;
-        color: #e0e0e0;
-      }
-    }
-  }
-  .radio-content {
-    width: 100%;
-    padding-left: 58rpx;
-    background-color: #fff;
-    display: flex;
-  }
-  .search-cont {
-    .search-cont-top {
-      padding: 0 34rpx 0;
-      margin-bottom: 10rpx;
-      padding-top: 20rpx;
-      &:last-child {
-        margin-bottom: 0;
-      }
-      .cont-tit {
-        font-size: 32rpx;
-        margin-bottom: 20rpx;
-        font-weight: 500;
-        display: flex;
-        justify-content: space-between;
-        .empty_ico {
-          width: 32rpx;
-          height: 33rpx;
-        }
-      }
-      .targetList {
-        display: flex;
-        flex-wrap: wrap;
-        font-size: 28rpx;
-        .target-item {
-          width: 50%;
-          margin-bottom: 20rpx;
-        }
-        .chart-item {
-          width: 100%;
-          margin-bottom: 20rpx;
-        }
-      }
-    }
-    .result-cont {
-      padding: 0 34rpx 0;
-      padding-left: 21rpx;
-      .result-list {
-        display: flex;
-        align-items: center;
-        color: #333;
-        padding-bottom: 30rpx;
-        border-bottom: 1rpx solid #ebedf0;
-        margin-bottom: 30rpx;
-        .result_ico {
-          width: 28rpx;
-          height: 28rpx;
-          margin-right: 20rpx;
-        }
-        text {
-          display: inline;
-        }
-        .highlight {
-          color: #3385ff;
-        }
-      }
-    }
-    .result-data {
-      min-height: calc(100vh - 130rpx);
-      padding: 20rpx 34rpx 40rpx;
-      display: flex;
-      background-color: #f7f7f7;
-      .report-ul {
-        width: 50%;
-        &:first-child {
-          margin-right: 10rpx;
-        }
-        .report-item {
-          padding: 20rpx 20rpx 24rpx 20rpx;
-          margin-bottom: 20rpx;
-          border-radius: 8rpx;
-          box-shadow: 0 3rpx 6rpx rgba($color: #000000, $alpha: 0.16);
-          background: #fff;
-          .item-content {
-            font-size: 24rpx;
-            line-height: 40rpx;
-            color: #7f7f7f;
-            display: -webkit-box;
-            word-break: break-all;
-            text {
-              display: inline;
-            }
-          }
-          .line {
-            margin: 18rpx 0;
-            content: "";
-            width: 100%;
-            height: 1px;
-            padding: 0 32rpx;
-            box-sizing: border-box;
-            background-color: #e5e5e5;
-            -webkit-transform: scale(1, 0.5);
-            transform: scale(1, 0.5);
-            -webkit-transform-origin: center bottom;
-            transform-origin: center bottom;
-          }
-          .item-title {
-            font-size: 28rpx;
-            color: #4a4a4a;
-            margin-bottom: 10rpx;
-            position: relative;
-            text-indent: 0.5em;
-            &::before {
-              content: "";
-              position: absolute;
-              top: 5rpx;
-              left: 0;
-              width: 6rpx;
-              height: 31rpx;
-              background-color: #3385ff;
-            }
-            text {
-              display: inline;
-            }
-          }
-          .chart-title {
-            height: 72rpx;
-            padding-bottom: 10rpx;
-            text-indent: 0em;
-            &::before {
-              display: none;
-            }
-          }
-          .item-abstract {
-            font-size: 26rpx;
-            color: #6a6a6a;
-            margin-bottom: 10rpx;
-            .report_ico {
-              width: 32rpx;
-              height: 26rpx;
-              margin-right: 20rpx;
-              display: inline-block;
-            }
-          }
-          .item-createtime {
-            color: #acacac;
-            font-size: 24rpx;
-          }
-        }
-      }
-      .chart-tag {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding-top: 1rpx;
-        height: 36rpx;
-        .tag-item {
-          width: 148rpx;
-          border-radius: 28rpx;
-          border: 2rpx solid rgba(49, 137, 255, 1);
-          overflow: hidden;
-          color: #3385ff;
-          text-align: center;
-          line-height: 32rpx;
-        }
-      }
-      .item-content-img {
-        display: flex;
-        align-items: center;
-        width: 330rpx;
-        margin-left: -15rpx;
-        margin-bottom: -20rpx;
-        image {
-          width: 100%;
-          height: 262rpx;
-          vertical-align: middle;
-        }
-      }
-    }
-  }
-  .tab-cont {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    padding: 20rpx 30rpx 0;
-    font-size: 32rpx;
-    &::-webkit-scrollbar {
-      width: 0;
-      height: 0;
-      display: none;
-    }
-    .item {
-      position: relative;
-      padding-bottom: 16rpx;
-      margin-right: 50rpx;
-      flex-shrink: 0;
-      .active {
-        position: absolute;
-        left: 0;
-        bottom: 0;
-        height: 4rpx;
-        width: 100%;
-        border-radius: 2rpx;
-
-        font-weight: 500;
-        background: linear-gradient(90deg, #2e85ff 0%, #7eeaf6 100%);
-      }
-    }
-    .tabs-active {
-      color: #3385ff;
-    }
-  }
-  @import "@/components/audioVideo.scss";
-}
-</style>

pages-search/activitySearch/activitySearch.vue

@@ -1,583 +0,0 @@
-<template>
-  <view class="container activity-content activity-search-content">
-    <view class="top-content">
-      <!-- 搜索 -->
-      <view class="searchTarget-header">
-        <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-if="searchTxt" @click="clearIpt" />
-          <text class="line">|</text>
-          <text @click="searchHandle" style="color: #3385ff">搜索</text>
-        </view>
-      </view>
-      <view class="search-cont" v-if="!isShowSearch">
-        <view class="search-cont-top">
-          <view class="cont-tit">
-            <text>热搜关键词：</text>
-          </view>
-          <view class="targetList">
-            <view class="target-item text_oneLine" v-for="(item, index) in hotKeyWord" :key="index" @click="chooseTarget(item.KeyWord)"># {{ item.KeyWord }}</view>
-          </view>
-        </view>
-        <view class="search-cont-top">
-          <view class="cont-tit">
-            <text>推荐关键词：</text>
-          </view>
-          <view class="targetList">
-            <view class="target-item text_oneLine" v-for="(item, index) in keywordList" :key="index" @click="chooseTarget(item)"># {{ item }}</view>
-          </view>
-        </view>
-        <view class="search-cont-top" v-if="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">
-            <block v-for="(item, index) in historySearchList" :key="index">
-              <view v-if="index < 8" class="target-item text_oneLine" @click="chooseTarget(item)"># {{ item }}</view>
-            </block>
-          </view>
-        </view>
-      </view>
-      <!-- 各种状态选择 -->
-      <view class="select-conyent" v-if="isShowSearch">
-        <text @click="handelState(item)" :class="['state-item', activeState == item.state && 'state-active-item']" v-for="item in activeStateOption" :key="item.name">{{ item.name }}</text>
-      </view>
-    </view>
-    <!-- 内容列表部分 -->
-    <!-- 活动列表 -->
-    <view v-if="haveData" class="activity-pages">
-      <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 class="audio-back" v-if="item.AudioLink" @click.stop="audioPlayBack(item)">
-              <image
-                class="audio-img"
-                :src="
-                  curVoiceId === item.ActivityId && !curAudioPaused
-                    ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_stop.png'
-                    : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/back_group.png'
-                "
-              ></image>
-              {{ curVoiceId === item.ActivityId && !curAudioPaused ? "暂停" : "回放" }}
-            </view>
-          </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 && 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 }}
-                  </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>
-                    <text v-if="item.IsShowDetails" @click="goDetail(item)" class="button">查看详情</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>
-    <view v-if="showAudioBox">
-      <audioModule :showAudioPop.sync="showAudioPop" />
-    </view>
-    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-  </view>
-</template>
-
-<script>
-import { activity, User, Search } from "@/config/api.js";
-import { Throttle } from "@/config/util.js";
-import modalDialog from "@/components/modalDialog.vue";
-import areaCode from "@/pages-activity/components/areaCode.vue";
-import myMixin from "@/pages-activity/components/index.js";
-import myActivityMixin from "@/pages-activity/components/indexActivity.js";
-import freeCharge from "@/components/freeCharge";
-import audioModule from "@/components/audioModule/index";
-
-let app = getApp({ allowDefault: true });
-export default {
-  data() {
-    return {
-      // 关键字列表
-      keywordList: [],
-      chartWordList: [],
-      searchTxt: "",
-      isShowSearch: false,
-      status: "loadmore",
-      totalPage: "",
-      haveData: true,
-      activeState: 0, //活动进行状态
-      activeStateOption: [
-        {
-          name: "全部",
-          state: 0,
-        },
-        {
-          name: "可回放",
-          state: 1,
-        },
-      ],
-      selectShow: false,
-      dynamicList: [],
-      hotKeyWord: [],
-      showAudioPop: false,
-    };
-  },
-  mixins: [myMixin, myActivityMixin],
-  components: {
-    modalDialog,
-    areaCode,
-    freeCharge,
-    audioModule,
-  },
-  methods: {
-    async researchHotKeyWord() {
-      const res = await Search.getKeys();
-      if (res.Ret === 200) {
-        this.hotKeyWord = res.Data.ListHot || [];
-        this.chartWordList = res.Data.List || [];
-        this.keywordList = res.Data.Item ? res.Data.Item.ConfigValue.split(",") : [];
-      }
-    },
-    //获取快捷主题
-    fastSearchKeWord() {
-      activity
-        .fastSearchKeWord({
-          ActiveState: this.activeState,
-          Label: "More",
-        })
-        .then((res) => {
-          if (res.Ret !== 200) return;
-          this.dynamicList = res.Data.List || [];
-        });
-    },
-    //清除了快捷主题
-    clearDynamicName() {
-      this.searchTxt = "";
-      this.collectList = [];
-      this.haveData = true;
-      this.isShowSearch = false;
-    },
-    //搜索记录进来
-    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;
-        this.getList();
-      } 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 = await activity.getActivityListNew({
-        PageSize: this.pageSize,
-        CurrentIndex: this.page_no,
-        KeyWord: this.searchTxt,
-        ActiveState: "1,2,3", //活动进行状态
-        PlayBack: this.activeState,
-      });
-      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);
-      }
-    },
-    /* 表单清空 */
-    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;
-        }
-      });
-    },
-    //全部 或者可回放的点击事件
-    handelState(item) {
-      this.activeState = item.state;
-      this.page_no = 1;
-      this.getList();
-    },
-    // //点击了回放
-    // audioPlayBack(item) {
-    //   this.$store.commit("audioBg/parseIntAudio", true);
-    //   // 判断是否为同一个音频
-    //   if (this.$store.state.audioBg.activityId == item.ActivityId) {
-    //     if (this.globalBgAudioManager.paused) {
-    //       this.globalBgAudioManager.play();
-    //     } else {
-    //       this.globalBgAudioManager.pause();
-    //     }
-    //   } else {
-    //     this.$store.commit("audioBg/addAudio", { list: item.VoiceList, activityId: item.ActivityId, activityTitle: item.ActivityName });
-    //   }
-    //   this.showAudioPop = true;
-    // },
-    //点击了回放
-    async audioPlayBack(item) {
-      if (!item.BackAudioPlay) {
-        const res = await activity.getActivityDetail({
-          ActivityId: item.ActivityId,
-        });
-        if (res.Ret === 200) {
-          item.BackAudioPlay = res.Data;
-        }
-      }
-      this.hasPermission = item.BackAudioPlay.HasPermission;
-      this.jurisdictionList.ActivityId = item.BackAudioPlay.ActivityId;
-      if (this.hasPermission == 1) {
-        this.$store.commit("audioBg/parseIntAudio", true);
-        // 判断是否为同一个音频
-        if (this.$store.state.audioBg.activityId == item.ActivityId) {
-          if (this.globalBgAudioManager.paused) {
-            this.globalBgAudioManager.play();
-          } else {
-            this.globalBgAudioManager.pause();
-          }
-        } else {
-          this.$store.commit("audioBg/addAudio", { list: item.VoiceList, activityId: item.ActivityId, activityTitle: item.ActivityName });
-        }
-        this.showAudioPop = true;
-      } else if (this.hasPermission == 2) {
-        this.jurisdictionList.SellerMobile = item.BackAudioPlay.SellerMobile;
-        this.jurisdictionList.SellerName = item.BackAudioPlay.SellerName;
-        this.jurisdictionList.PopupMsg = item.BackAudioPlay.PopupMsg;
-        this.isShowhasPermission = true;
-      } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-        this.jurisdictionList.PopupMsg = item.BackAudioPlay.PopupMsg;
-        this.applyForIsShow = true;
-      }
-    },
-  },
-  computed: {
-    curVoiceId() {
-      //当前正在播放的音频id
-      return this.$store.state.audioBg.activityId;
-    },
-    curAudioPaused() {
-      //当前音频是否暂停状态
-      return this.$store.state.audioBg.paused;
-    },
-    showAudioBox() {
-      return this.$store.state.audioBg.parseIntShow;
-    },
-  },
-  onShow() {
-    this.$store.commit("audioBg/parseIntAudio", true);
-    this.countryCcode(); //判断是否加区号
-    this.$store.dispatch("statistics", { PageType: "ActivitSearch" });
-  },
-  onHide() {
-    this.$store.commit("audioBg/parseIntAudio", false);
-  },
-  //load
-  onLoad(option) {
-    if (this.$db.get("historySearchListActivity")) {
-      let historyList = JSON.parse(this.$db.get("historySearchListActivity"));
-      this.historySearchList = historyList;
-    }
-    this.searchTxt = option.text || "";
-    this.activeState = option.statesId || 0;
-    if (option.text) {
-      this.searchHandle();
-    }
-    this.researchHotKeyWord();
-    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: "/pages-search/activitySearch/activitySearch?statesId=" + this.activeState + "&text=" + this.searchTxt,
-      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">
-.activity-pages {
-  padding-top: 190rpx;
-  padding-bottom: 30rpx;
-}
-@import "@/pages-activity/components/indexActivity.scss";
-.activity-search-content {
-  background-color: #f7f7f7;
-  .ipt-right {
-    z-index: 11;
-  }
-  .select-conyent {
-    display: flex;
-    float: right;
-    margin-bottom: 20rpx;
-    height: 51rpx;
-    width: 252rpx;
-    border-radius: 47rpx;
-    overflow: hidden;
-    margin-right: 30rpx;
-    .state-item {
-      width: 126rpx;
-      height: 51rpx;
-      text-align: center;
-      line-height: 51rpx;
-      color: #999999;
-      font-size: 24rpx;
-      background-color: #f8f8fa;
-    }
-    .state-active-item {
-      background: #3385ff;
-      color: #fff;
-      border-radius: 47rpx;
-    }
-  }
-  .title-date {
-    position: relative;
-    .audio-back {
-      position: absolute;
-      right: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      width: 99rpx;
-      height: 39rpx;
-      font-size: 24rpx;
-      color: #fff;
-      display: flex;
-      align-items: center;
-      background-color: #3385ff;
-      border-radius: 20rpx;
-      padding-left: 4rpx;
-      .audio-img {
-        width: 30rpx;
-        height: 30rpx;
-        margin: 0 5rpx;
-      }
-    }
-  }
-  .top-content {
-    width: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 99;
-    background-color: #fff;
-    .searchTarget-header {
-      position: relative;
-      width: 100%;
-      background-color: #fff;
-      padding: 20rpx 0;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      .sea_ipt_placeholder {
-        color: #8d8d8d;
-      }
-      .sea_ipt {
-        width: 682rpx;
-        height: 70rpx;
-        line-height: 70rpx;
-        box-sizing: border-box;
-        background: #F9F9F9;
-        font-size: 26rpx;
-        color: #4a4a4a;
-        padding: 0 180rpx 0 78rpx;
-        border-radius: 70rpx;
-      }
-      .sea_ico {
-        width: 31rpx;
-        height: 31rpx;
-        position: absolute;
-        left: 60rpx;
-        top: 50%;
-        transform: translateY(-50%);
-      }
-      .ipt-right {
-        display: flex;
-        align-items: center;
-        position: absolute;
-        right: 59rpx;
-        top: 50%;
-        transform: translateY(-50%);
-        color: #3385ff;
-        .line {
-          margin: 0 21rpx;
-          color: #e0e0e0;
-        }
-      }
-    }
-    .search-cont {
-      height: calc(100vh - 200rpx);
-      padding-bottom: 20rpx;
-      overflow: hidden;
-      overflow-y: auto;
-      background-color: #f7f7f7;
-      .search-cont-top {
-        padding: 0 34rpx 0;
-        margin-bottom: 10rpx;
-        padding-top: 20rpx;
-        &:last-child {
-          margin-bottom: 0;
-        }
-        .cont-tit {
-          font-size: 32rpx;
-          margin-bottom: 20rpx;
-          font-weight: 500;
-          display: flex;
-          justify-content: space-between;
-          .empty_ico {
-            width: 32rpx;
-            height: 33rpx;
-          }
-        }
-        .targetList {
-          display: flex;
-          flex-wrap: wrap;
-          font-size: 28rpx;
-          .target-item {
-            width: 50%;
-            margin-bottom: 20rpx;
-          }
-          .chart-item {
-            width: 100%;
-            margin-bottom: 20rpx;
-          }
-        }
-      }
-    }
-  }
-}
-</style>

pages-search/components/activityBack.vue

@@ -3,7 +3,7 @@
     <!-- 活动列表 -->
     <view :class="['activity-pages', tabsActiveSearch == 4 && 'content-padding']">
       <view class="collect-ul">
-        <view class="collect-ltem" v-for="(item, index) in collectLists" :key="index">
+        <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 }}
@@ -58,7 +58,7 @@
                         <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-if="item.IsSignup !== 1" @click="wanttosignup(item)">我要报名</text>
                         <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
                       </block>
                     </block>
@@ -105,11 +105,11 @@
     <!-- 参会方式弹出层 -->
     <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 style="color: #333333; font-size: 28rpxrpx">请选择参会方式</view>
+          <view style="color: #2c83ff" @click="signupIsAddOfCancel('', 1)">预约外呼</view>
+          <view style="color: #2c83ff" @click="signupIsAddOfCancel('', 2)">自主拨入</view>
+          <view style="color: #a9afb8" @click="selectShow = false">取消</view>
+        </u-popup>
     </view>
     <view v-if="showAudioBox">
       <audioModule :showAudioPop.sync="showAudioPop" />
@@ -125,7 +125,7 @@ import myMixin from "@/components/activity/index.js";
 import myActivityMixin from "@/components/activity/indexActivity.js";
 import freeCharge from "@/components/freeCharge";
 import audioModule from "@/components/audioModule/index";
-
+import { activity } from "@/config/api";
 export default {
   props: {
     collectLists: {
@@ -164,6 +164,15 @@ export default {
     freeCharge,
     audioModule,
   },
+  watch: {
+    collectLists: {
+      handler(newVal) {
+        this.collectList = newVal;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   methods: {
     //获取是否需要填写区号接口
     countryCcode() {
@@ -309,7 +318,7 @@ export default {
         height: 70rpx;
         line-height: 70rpx;
         box-sizing: border-box;
-        background: #F9F9F9;
+        background: #f9f9f9;
         font-size: 26rpx;
         color: #4a4a4a;
         padding: 0 180rpx 0 78rpx;

pages-search/components/summaryChart.vue

@@ -1,36 +1,36 @@
 <template>
-    <view :class="['result-data-search-summary', 'content-padding']">
-      <view class="report-ul">
-        <view class="report-item" v-for="(report, index) in resultList" :key="index" v-if="index % 2 === 0" @click="goDetail(report)">
-          <view class="item-content-img" v-if="report.BodyHtml">
-            <image :src="report.BodyHtml" mode=""></image>
-          </view>
-          <view class="item-content" v-else><u-parse :html="report.Body[0] + '...'"></u-parse></view>
-          <view class="line"></view>
-          <view :class="['item-title', report.Source != 1 && 'chart-title text_twoLine']"><u-parse :html="report.Title"></u-parse></view>
-          <text class="item-createtime" v-if="report.Source == 1">{{ report.PublishDate }}</text>
-          <view class="item-createtime chart-tag" v-else>
-            <text class="tag-item" v-if="report.PtagName">{{ report.PtagName }}</text>
-            <text class="tag-item" v-if="report.CtagName">{{ report.CtagName }}</text>
-          </view>
+  <view :class="['result-data-search-summary', 'content-padding']">
+    <view class="report-ul">
+      <view class="report-item" v-for="(report, index) in resultList" :key="index" v-if="index % 2 === 0" @click="goDetail(report)">
+        <view class="item-content-img" v-if="report.BodyHtml">
+          <image :src="report.BodyHtml" mode=""></image>
+        </view>
+        <view class="item-content" v-else><u-parse :html="report.Body[0] + '...'"></u-parse></view>
+        <view class="line"></view>
+        <view :class="['item-title', report.Source != 1 && 'chart-title text_twoLine']"><u-parse :html="report.Title"></u-parse></view>
+        <text class="item-createtime" v-if="report.Source == 1">{{ report.PublishDate }}</text>
+        <view class="item-createtime chart-tag" v-else>
+          <text class="tag-item" v-if="report.PtagName">{{ report.PtagName }}</text>
+          <text class="tag-item" v-if="report.CtagName">{{ report.CtagName }}</text>
         </view>
       </view>
-      <view class="report-ul">
-        <view class="report-item" v-for="(report, index) in resultList" :key="index" v-if="index % 2 !== 0" @click="goDetail(report)">
-          <view class="item-content-img" v-if="report.BodyHtml">
-            <image :src="report.BodyHtml" mode=""></image>
-          </view>
-          <view class="item-content" v-else><u-parse :html="report.Body[0] + '...'"></u-parse></view>
-          <view class="line"></view>
-          <view :class="['item-title', report.Source != 1 && 'chart-title text_twoLine']"><u-parse :html="report.Title"></u-parse></view>
-          <text class="item-createtime" v-if="report.Source == 1">{{ report.PublishDate }}</text>
-          <view class="item-createtime chart-tag" v-else>
-            <text class="tag-item" v-if="report.PtagName">{{ report.PtagName }}</text>
-            <text class="tag-item" v-if="report.CtagName">{{ report.CtagName }}</text>
-          </view>
+    </view>
+    <view class="report-ul">
+      <view class="report-item" v-for="(report, index) in resultList" :key="index" v-if="index % 2 !== 0" @click="goDetail(report)">
+        <view class="item-content-img" v-if="report.BodyHtml">
+          <image :src="report.BodyHtml" mode=""></image>
+        </view>
+        <view class="item-content" v-else><u-parse :html="report.Body[0] + '...'"></u-parse></view>
+        <view class="line"></view>
+        <view :class="['item-title', report.Source != 1 && 'chart-title text_twoLine']"><u-parse :html="report.Title"></u-parse></view>
+        <text class="item-createtime" v-if="report.Source == 1">{{ report.PublishDate }}</text>
+        <view class="item-createtime chart-tag" v-else>
+          <text class="tag-item" v-if="report.PtagName">{{ report.PtagName }}</text>
+          <text class="tag-item" v-if="report.CtagName">{{ report.CtagName }}</text>
         </view>
       </view>
     </view>
+  </view>
 </template>
 
 <script>
@@ -40,11 +40,27 @@ export default {
       type: Array,
       default: [],
     },
+    tabsActiveChild: {
+      type: Number,
+    },
   },
   data() {
-    return {};
+    return {
+    };
+  },
+
+  methods: {
+    /* 进入详情 校验是否有该品种权限 */
+    goDetail(item) {
+      if (item.Source == 2) {
+        /* 无需授权且已绑定 检验是或否有权限 */
+        this.$store.dispatch("checkHandle", "/pages-my/chartPage/chartPage?id=" + item.ChartId);
+      } else {
+        /* 无需授权且已绑定 检验是或否有权限 */
+        this.$store.dispatch("checkHandle", "/pages-my/reportDetail/reportDetail?id=" + item.ArticleId);
+      }
+    },
   },
-  methods: {},
 };
 </script>
 

pages-search/indedxSearch/indedxSearch.vue

@@ -19,14 +19,14 @@
           <text @click="searchHandle" style="color: #3385ff">搜索</text>
         </view>
       </view>
-      <view class="search-tabs" v-if="searchTxt">
+      <view class="search-tabs" v-if="isResult">
         <view :class="['tabs-item', tabsActive === item.id && 'active']" v-for="item in tabsList" :key="item.id" @click="tabsHandel(item)">
           {{ item.title }}
           <view class="item-act" v-if="tabsActive === item.id"></view>
         </view>
       </view>
-      <block v-if="searchTxt">
-        <view class="more-summary more-box" v-if="tabsActive === 1 || tabsActive === 2">
+      <block v-if="isResult">
+        <view class="more-summary more-box" v-if="(tabsActive === 1 || tabsActive === 2) && haveResultSummary">
           <view>
             <text class="more-text" v-if="tabsActive === 1"> 纪要/图表 </text>
           </view>
@@ -50,27 +50,29 @@
       </block>
     </view>
 
-    <view class="search-cont" v-if="!searchTxt">
-      <view class="history" v-for="key in keywordList" :key="key.title">
-        <view class="history-title title">
-          <text>{{ key.title }}</text>
-          <image v-if="key.imgShown" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/empty_ico.png" class="empty_ico"></image>
-        </view>
-        <view class="history-item">
-          <block v-for="(item, index) in relyOn(key.title)" :key="item">
-            <block v-if="key.title == '搜索历史'">
-              <view v-if="index < 8" class="item" @click="chooseTarget(item)">{{ item }}</view>
+    <view class="search-cont" v-if="!isResult">
+      <block v-for="key in keywordList" :key="key.title">
+        <view class="history" v-if="key.title !== '搜索历史' || (key.title == '搜索历史' && historySearchList.length)">
+          <view class="history-title title">
+            <text>{{ key.title }}</text>
+            <image v-if="key.imgShown" @click="clearHistory" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/empty_ico.png" class="empty_ico"></image>
+          </view>
+          <view class="history-item">
+            <block v-for="(item, index) in relyOn(key.title)" :key="item">
+              <block v-if="key.title == '搜索历史'">
+                <view v-if="index < 8" class="item" @click="chooseTarget(item)">{{ item }}</view>
+              </block>
+              <view v-else class="item" @click="chooseTarget(item)">{{ item }}</view>
             </block>
-            <view v-else class="item" @click="chooseTarget(item)">{{ item }}</view>
-          </block>
+          </view>
         </view>
-      </view>
+      </block>
     </view>
     <view v-else class="content">
       <block v-if="haveResult">
         <view>
-          <summary-chart :resultList="resultList" v-if="resultList.length && (tabsActive == 2 || tabsActive == 1)" />
-          <view class="more-report more-box" v-if="tabsActive === 1">
+          <summary-chart :resultList="tabsActive == 1 ? resultList.slice(0, 10) : resultList" :tabsActiveChild="tabsActive" v-if="resultList.length && (tabsActive == 2 || tabsActive == 1)" />
+          <view class="more-report more-box" v-if="tabsActive === 1 && haveResultReport">
             <text class="more-text"> 资源包/报告 </text>
             <view>
               <view class="more-rivet" @click="tabsActiveMore(3)"> 更多 <u-icon name="arrow-right" color="#3385FF" size="28"></u-icon> </view>
@@ -78,8 +80,8 @@
           </view>
           <reportPage :reportPageData="reportPageData" v-if="Object.keys(reportPageData).length && (tabsActive == 3 || tabsActive == 1)" />
 
-          <view class="more-activity more-box" v-if="tabsActive === 1">
-            <text class="more-text"> 活动 </text>
+          <view class="more-activity more-box" v-if="tabsActive === 1 && haveResultActivity">
+            <text class="more-text"> 活动/回放 </text>
             <view>
               <view class="more-rivet" @click="tabsActiveMore(4)"> 更多 <u-icon name="arrow-right" color="#3385FF" size="28"></u-icon> </view>
             </view>
@@ -108,6 +110,7 @@ export default {
   data() {
     return {
       searchTxt: "",
+      isResult: false,
       historySearchList: [], //历史搜索
       hotKeyWord: [], //热搜关键词
       wordList: [], //推荐关键词
@@ -116,7 +119,10 @@ export default {
       resultDataList: [], ////纪要与图表
       collectList: [], //活动的数据
       reportPageData: {}, //报告的数据
-      haveResult: true, //是否有搜索数据
+      // haveResult: true, //是否有搜索数据
+      haveResultSummary: true, //是否有搜索数据
+      haveResultActivity: true, //是否有搜索数据
+      haveResultReport: true, //是否有搜索数据
       summarySelectActive: "Matching",
       activitySelectActive: "0",
       refresh: false, //正在下拉
@@ -144,12 +150,15 @@ export default {
     activitySelect() {
       return ActivitySelect;
     },
+    haveResult() {
+      let all = this.haveResultSummary || this.haveResultActivity || this.haveResultReport;
+      return this.tabsActive == 1 ? all : this.tabsActive == 2 ? this.haveResultSummary : this.tabsActive == 3 ? this.haveResultReport : this.haveResultActivity;
+    },
   },
   watch: {
     tabsActive: {
       handler(val) {
         val == 1 ? (this.pageSize = 5) : (this.pageSize = 10);
-        console.log(val, this.pageSize);
       },
       deep: true,
       immediate: true,
@@ -158,9 +167,9 @@ export default {
   methods: {
     //搜索事件
     searchHandle() {
-      if (this.tabsActive) {
-        if (!this.historySearchList.includes(this.tabsActive)) {
-          this.historySearchList.unshift(this.tabsActive);
+      if (this.searchTxt) {
+        if (!this.historySearchList.includes(this.searchTxt)) {
+          this.historySearchList.unshift(this.searchTxt);
           this.$db.set("historySearchList", JSON.stringify(this.historySearchList));
         }
         this.getListInit();
@@ -173,6 +182,7 @@ export default {
     clearIpt() {
       this.searchTxt = "";
       this.tabsActive = 1;
+      this.isResult = false;
       this.getListInit();
     },
     //关键词 遍历的依赖
@@ -205,6 +215,7 @@ export default {
     },
     //搜索
     getDataList() {
+      this.isResult = true;
       if (this.tabsActive == 1) {
         this.synthesiz();
         this.getReportList();
@@ -222,17 +233,19 @@ export default {
       const res = await Search.getArtAndChartList({
         KeyWord: this.searchTxt.replace(/^\s+|\s+$/g, ""),
         OrderColumn: this.summarySelectActive,
-        PageSize: this.pageSize,
+        PageSize: 10,
         CurrentIndex: this.pageNum,
         ListType: 1,
       });
       if (res.Ret === 200) {
         this.status = this.pageNum < res.Data.Paging.Pages ? "loadmore" : "nomore";
         this.totalPage = res.Data.Paging.Totals;
+        if (this.pageNum == 1) {
+          this.haveResultSummary = res.Data.List.length || res.Data.ChartList.length ? true : false;
+        }
         if (res.Data.List.length && res.Data.ChartList.length) {
           if (this.pageNum == 1) {
             this.resultDataList.push(res.Data.List.shift());
-            this.haveResult = this.resultDataList.length ? true : false;
             if (this.refresh) {
               uni.stopPullDownRefresh();
               this.refresh = false;
@@ -277,8 +290,7 @@ export default {
       this.totalPage = res.Data.Paging.Pages; //总页数
       if (this.pageNum === 1) {
         this.collectList = res.Data.List || [];
-        this.haveResult = this.collectList.length ? true : false;
-        console.log(this.haveResult);
+        this.haveResultActivity = this.collectList.length ? true : false;
         if (this.refresh) {
           uni.stopPullDownRefresh();
           this.refresh = false;
@@ -299,7 +311,11 @@ export default {
           this.refresh = false;
         }
         this.reportPageData = res.Data || {};
-        this.haveResult = Object.keys(this.reportPageData).length ? true : false;
+        if (res.Data.ListHzReport.length || res.Data.ListHzResource.length || res.Data.ListYxReport.length || res.Data.ListYxResource.length) {
+          this.haveResultReport = true;
+        } else {
+          this.haveResultReport = false;
+        }
       }
     },
     //点击了更多
@@ -322,6 +338,11 @@ export default {
         this.getActivityBackList();
       }
     },
+    /* 历史搜索清空 */
+    clearHistory() {
+      this.historySearchList = [];
+      this.$db.del("historySearchList");
+    },
     getListInit() {
       uni.pageScrollTo({
         scrollTop: 0,
@@ -494,7 +515,6 @@ export default {
   }
   .content {
     width: 100%;
-    height: 100vh;
     background-color: #f5f6fa;
   }
   .nodata {
@@ -576,10 +596,12 @@ export default {
     top: 184rpx;
   }
   .more-report {
-    top: 272rpx;
+    top: 184rpx;
+    z-index: 100;
   }
   .more-activity {
-    top: 360rpx;
+    top: 184rpx;
+    z-index: 101;
   }
 }
 </style>

pages-search/reportSearch/reportSearch.vue

@@ -1,655 +0,0 @@
-<template>
-  <view class="searchTarget-container container">
-    <view class="searchTarget-header">
-      <input
-        type="text"
-        :placeholder="radioSelect == 1 ? '请输入报告标题/报告内容' : '请输入产业名/公司名'"
-        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="radio-content">
-      <van-radio-group :value="radioSelect" @change="onChangeRadio" direction="horizontal">
-        <van-radio icon-size="16" name="1">搜报告</van-radio>
-        <van-radio icon-size="16" name="2">搜资源包</van-radio>
-      </van-radio-group>
-    </view>
-    <view class="search-cont">
-      <template v-if="!isResult">
-        <view class="search-cont-top">
-          <view class="cont-tit">
-            <text>热搜关键词：</text>
-          </view>
-          <view class="targetList">
-            <view class="target-item" v-for="(item, index) in hotKeyWord" :key="index" @click="chooseTarget(item.KeyWord)"># {{ item.KeyWord }}</view>
-          </view>
-        </view>
-        <view class="search-cont-top">
-          <view class="cont-tit">
-            <text>推荐关键词：</text>
-          </view>
-          <view class="targetList">
-            <view class="target-item" v-for="(item, index) in keywordList" :key="index" @click="chooseTarget(item)"># {{ item }}</view>
-          </view>
-        </view>
-        <view class="search-cont-top" v-if="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">
-            <block v-for="(item, index) in historySearchList" :key="index">
-              <view v-if="index < 8" class="target-item" @click="chooseTarget(item)"># {{ item }}</view>
-            </block>
-          </view>
-        </view>
-      </template>
-      <template v-else>
-        <block v-if="haveResult">
-          <view class="content-list" v-if="radioSelect == '2'">
-            <block v-if="ListHz.length">
-              <view class="resource">
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/zybico.jpg"></image>
-                <text>弘则资源包</text>
-              </view>
-              <text style="height: 1rpx; background: #ececec"></text>
-              <view class="list-ui" v-for="item in ListHz" :key="item.IndustrialManagementId" @click="themeDetails(item)">
-                <view class="item-title">
-                  <text>
-                    {{ item.IndustryName }}
-                  </text>
-                  <view class="publish">
-                    {{ item.PublishDate }}更新
-                    <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
-                  </view>
-                </view>
-                <view class="read-more" v-if="item.IndustrialSubjectList">
-                  <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
-                    {{ val.SubjectName }}
-                  </text>
-                </view>
-              </view>
-            </block>
-            <block v-if="ListYx.length">
-              <view class="resource">
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/zybico.jpg"></image>
-                <text>买方研选主题</text>
-              </view>
-              <text style="height: 1rpx; background: #ececec"></text>
-              <view class="list-ui" v-for="item in ListYx" :key="item.IndustrialManagementId" @click="themeDetails(item)">
-                <view class="item-title">
-                  <text>
-                    {{ item.IndustryName }}
-                  </text>
-                  <view class="publish">
-                    {{ item.PublishDate }}更新
-                    <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
-                  </view>
-                </view>
-                <view class="read-more" @click="themeDetails(item)" v-if="item.IndustrialSubjectList">
-                  <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
-                    {{ val.SubjectName }}
-                  </text>
-                </view>
-              </view>
-            </block>
-          </view>
-          <view class="content-report" v-if="radioSelect == '1'">
-            <block v-if="ListYx.length">
-              <view class="resource">
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Yx.png"></image>
-                <text>买方研选报告</text>
-              </view>
-              <text style="height: 1rpx; background: #ececec"></text>
-              <view class="content-item" v-for="item in ListYx" :key="item.ArticleId">
-                <view class="item-user">
-                  <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
-                  <text> {{ item.NickName }}</text>
-                </view>
-                <view class="item-title">
-                  <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>
-                </view>
-                <view class="item-more">
-                  <text>{{ item.PublishDate }}</text>
-                  <view class="pv-ollect">
-                    <view>
-                      <image class="pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
-                      {{ item.Pv }}
-                    </view>
-                    <view @click="collectClick(item)">
-                      <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png"></image>
-                      <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png"></image>
-                      {{ item.CollectNum }}人收藏
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </block>
-            <block v-if="ListHz.length">
-              <text style="height: 10rpx; background: #ececec"></text>
-              <view class="resource">
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Hz.png"></image>
-                <text>弘则报告</text>
-              </view>
-              <text style="height: 1rpx; background: #ececec"></text>
-              <view class="content-item" v-for="item in ListHz" :key="item.ArticleId">
-                <view class="item-title">
-                  <text style="display: inline" @click="goDetailReport(item)">
-                    {{ item.Title }}
-                  </text>
-                  <text class="item-industry" @click="themeDetails(item)" v-if="item.IndustryName">&nbsp;&nbsp;&nbsp;#{{ item.IndustryName }}</text>
-                </view>
-                <view class="item-more">
-                  <text>{{ item.PublishDate }}</text>
-                </view>
-              </view>
-            </block>
-          </view>
-        </block>
-        <view class="nodata" v-else>
-          <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/act_search.png" mode="" class="nodata_img"></image>
-          <text>未找到您想搜索的内容</text>
-          <text> 正式客户可联系销售免费发起新调研主题 </text>
-        </view>
-      </template>
-    </view>
-    <u-modal
-      v-model="goFollowShow"
-      :content-style="{ fontSize: '32rpx' }"
-      @confirm="goFollowShowBtn"
-      :show-cancel-button="isCancelBtn"
-      :confirm-text="confirmText"
-      @cancel="isCancelBtn = false"
-      :show-title="false"
-      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-      :confirm-style="{ fontWeight: '700' }"
-    >
-      <view class="slot-content">
-        <rich-text :nodes="accounts"></rich-text>
-      </view>
-    </u-modal>
-    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-  </view>
-</template>
-
-<script>
-import { Search, Reports, Research, Report } from "@/config/api.js";
-import { Debounce, Throttle } from "@/config/util.js";
-import freeCharge from "@/components/freeCharge";
-let app = getApp({ allowDefault: true });
-export default {
-  data() {
-    return {
-      searchTxt: "", //搜索关键字
-      isResult: false, //显示搜索结果
-      haveResult: true, //是否有搜索数据
-      // 历史搜索列表
-      historySearchList: [],
-      // 关键字列表
-      keywordList: [],
-      targetList: [], //所有指标列表
-      // 搜索结果列表
-      resultList: [],
-      indList: [],
-      hotKeyWord: [],
-      radioSelect: "",
-      ListHz: [],
-      ListYx: [],
-      goFollowShow: false,
-      confirmText: "知道了",
-      isCancelBtn: false,
-      accounts: "",
-    };
-  },
-  watch: {
-    searchTxt(newVal) {
-      if (newVal.length <= 0) {
-        this.isResult = false;
-      }
-    },
-  },
-  components: {
-    freeCharge,
-  },
-  methods: {
-    async researchHotKeyWord() {
-      const res = await Research.researchHotKeyWord();
-      if (res.Ret === 200) {
-        this.hotKeyWord = res.Data.List || [];
-      }
-    },
-    onChangeRadio(value) {
-      this.radioSelect = value.detail;
-      let srt = this.searchTxt.replace(/^\s+|\s+$/g, "");
-      if (!srt) return this.$util.toast(this.radioSelect == 1 ? "请输入报告标题/报告内容" : "请输入产业名/公司名");
-      this.dataInit();
-      this.getDataList();
-    },
-    /* 获取关键词 */
-    getKeyWord() {
-      Search.getKeys().then((res) => {
-        if (res.Ret === 200) {
-          this.keywordList = res.Data.Item.ConfigValue ? res.Data.Item.ConfigValue.split(",") : [];
-        }
-      });
-    },
-    // 选择历史搜索
-    chooseTarget(item) {
-      this.searchTxt = item;
-      this.SecName = item;
-      this.resultList = [];
-      this.indList = [];
-      if (!this.historySearchList.includes(this.searchTxt)) {
-        this.historySearchList.unshift(this.searchTxt);
-        this.$db.set("historySearchListReport", JSON.stringify(this.historySearchList));
-      }
-      this.getDataList();
-    },
-    // 键盘输入过程中
-    searchDoing() {
-      this.isResult = false;
-      //全部指标列表
-      let arr = JSON.parse(JSON.stringify(this.targetList));
-      let filterArr = [];
-      // // 过滤出符合搜索条件的值
-      arr.forEach((item, index) => {
-        if (item.SecName.includes(this.searchTxt)) {
-          item.SecName = this.join(item.SecName, this.searchTxt);
-          filterArr.unshift(item);
-        }
-      });
-      this.keywordList = filterArr;
-    },
-    // 拼接
-    join(str, key) {
-      return str.replace(new RegExp(`${key}`, "g"), `%%${key}%%`).split("%%");
-    },
-    // 搜索数据
-    searchHandle: Debounce(function () {
-      if (this.searchTxt) {
-        //添加搜索记录
-        if (!this.historySearchList.includes(this.searchTxt)) {
-          this.historySearchList.unshift(this.searchTxt);
-          this.$db.set("historySearchListReport", JSON.stringify(this.historySearchList));
-        }
-        this.resultList = [];
-        this.indList = [];
-        this.getDataList();
-      } else {
-        this.$util.toast(this.radioSelect == 1 ? "请输入报告标题/报告内容" : "请输入产业名/公司名");
-      }
-    }),
-    // 查找数据
-    async getDataList() {
-      this.isResult = true;
-      const res =
-        this.radioSelect == 2
-          ? await Reports.getIndustryAndArticle({
-              KeyWord: this.searchTxt.replace(/^\s+|\s+$/g, ""),
-            })
-          : await Reports.getReportSearchReport({
-              KeyWord: this.searchTxt.replace(/^\s+|\s+$/g, ""),
-            });
-      if (res.Ret === 200) {
-        this.ListHz = res.Data.ListHz || [];
-        this.ListYx = res.Data.ListYx || [];
-        this.haveResult = this.ListHz.length > 0 || this.ListYx.length > 0;
-      }
-    },
-    // 点击数据列表修改数据
-    itemClick(item) {
-      let data = encodeURIComponent(JSON.stringify(item));
-      uni.navigateTo({
-        url: "/pages/recordData/recordData?data=" + data,
-      });
-    },
-    /* 表单清空 */
-    clearIpt() {
-      this.searchTxt = "";
-      this.isTabAct = false;
-    },
-    /* 历史搜索清空 */
-    clearHistory() {
-      this.historySearchList = [];
-      this.$db.del("historySearchListReport");
-    },
-    //去往文章详情页面
-    goDetailReport(item) {
-      this.$store.dispatch("checkHandle", "/pages-my/reportDetail/reportDetail?id=" + item.ArticleId);
-    },
-    /* 进入详情 校验是否有该品种权限 */
-    goDetail(item) {
-      uni.navigateTo({
-        url: "/pages-report/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId,
-      });
-    },
-    goDetailIndust(id) {
-      this.$store.dispatch("checkHandle", "/pages-my/reportDetail/reportDetail?id=" + id);
-    },
-    //去往主题详情
-    themeDetails(item) {
-      if (item.Source === 1) {
-        //非严选
-        this.$store.dispatch("checkHandle", "/pages-report/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId);
-      } else {
-        //严选
-        this.$store.dispatch("checkHandle", "/pages-report/researchTheme/researchTheme?id=" + item.IndustrialManagementId);
-      }
-    },
-    //收藏
-    async collectClick(item) {
-      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
-      if (res.Ret === 200) {
-        item.IsCollect = !item.IsCollect;
-        item.IsCollect
-          ? (item.CollectNum += 1) &&
-            uni.showToast({
-              title: "收藏成功",
-              icon: "none",
-              duration: 2000,
-            })
-          : (item.CollectNum -= 1);
-        !item.IsCollect &&
-          uni.showToast({
-            title: "已取消收藏",
-            icon: "none",
-            duration: 2000,
-          });
-      }
-    },
-    //获取数据的初始值
-    dataInit() {
-      this.ListHz = [];
-      this.ListYx = [];
-      uni.pageScrollTo({
-        scrollTop: 0,
-        duration: 0,
-      });
-    },
-    //点击了去关注
-    goFollowShowBtn() {
-      if (this.confirmText == "去关注") {
-        uni.navigateTo({
-          url: "/pages-activity/accountsOfficial/accountsOfficial",
-        });
-      }
-      this.goFollowShow = false;
-    },
-  },
-  onLoad(options) {
-    this.radioSelect = options.id == "研选" ? "1" : "2";
-    if (options.text) {
-      this.searchTxt = options.text;
-      this.getDataList();
-    }
-    // 获取历史搜索记录
-    if (this.$db.get("historySearchListReport")) {
-      let historyList = JSON.parse(this.$db.get("historySearchListReport"));
-      this.historySearchList = historyList;
-    }
-  },
-  onShow() {
-    this.$store.dispatch("statistics", { PageType: "ReportSearch" });
-    this.getKeyWord();
-    this.researchHotKeyWord();
-  },
-  /**
-   * 用户点击分享
-   */
-  onShareAppMessage: function (res) {
-    return {
-      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "报告",
-      path: "/pages-search/reportSearch/reportSearch?text=" + this.searchTxt,
-      success: (res) => {},
-      fail: (err) => {},
-    };
-  },
-};
-</script>
-
-<style lang="scss">
-.searchTarget-container {
-  background-color: #f7f7f7;
-  padding-bottom: 30rpx;
-  .searchTarget-header {
-    padding: 0 34rpx;
-    width: 100%;
-    background-color: #fff;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 99;
-    padding: 30rpx 0;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    .sea_ipt_placeholder {
-      color: #8d8d8d;
-    }
-    .sea_ipt {
-      width: 682rpx;
-      height: 70rpx;
-      line-height: 70rpx;
-      box-sizing: border-box;
-      background: #F9F9F9;
-      font-size: 26rpx;
-      color: #4a4a4a;
-      padding: 0 180rpx 0 78rpx;
-      border-radius: 70rpx;
-    }
-    .sea_ico {
-      width: 31rpx;
-      height: 31rpx;
-      position: absolute;
-      left: 68rpx;
-      top: 50%;
-      transform: translateY(-50%);
-    }
-    .ipt-right {
-      display: flex;
-      align-items: center;
-      position: absolute;
-      right: 59rpx;
-      top: 50%;
-      transform: translateY(-50%);
-      color: #3385ff;
-      .line {
-        margin: 0 21rpx;
-        color: #e0e0e0;
-      }
-    }
-  }
-  .radio-content {
-    width: 100%;
-    padding-left: 58rpx;
-    background-color: #fff;
-    position: fixed;
-    height: 70rpx;
-    top: 128rpx;
-    left: 0;
-    z-index: 99;
-    display: flex;
-  }
-  .resource {
-    padding: 0 30rpx;
-    background-color: #fff;
-    margin-top: 4rpx;
-    height: 91rpx;
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #333333;
-    font-size: 30rpx;
-    image {
-      width: 34rpx;
-      height: 36rpx;
-      margin-right: 10rpx;
-    }
-  }
-  .content-list {
-    .list-ui {
-      background-color: #fff;
-      margin-top: 2rpx;
-      margin-bottom: 10rpx;
-    }
-    .item-title {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 100rpx;
-      border-bottom: 1px solid #f6f6f6;
-      padding: 0 30rpx;
-      background-color: #fff;
-      .publish {
-        display: flex;
-        align-items: center;
-        color: #999999;
-        font-style: 26rpx;
-      }
-    }
-    .read-more {
-      margin-top: 20rpx;
-      display: flex;
-      flex-wrap: wrap;
-      margin-left: 30rpx;
-      .text-box {
-        margin-bottom: 27rpx;
-        margin-right: 15rpx;
-        padding: 0;
-        font-size: 24rpx;
-        color: #408fff;
-        width: 216rpx;
-        height: 46rpx;
-        line-height: 46rpx;
-        text-align: center !important;
-        background: url(~@/static/img/report_bg.png) no-repeat;
-        background-size: 100% 100%;
-        text-indent: 0em;
-      }
-    }
-  }
-  .search-cont {
-    padding-top: 180rpx;
-    .search-cont-top {
-      padding: 0 34rpx 0;
-      margin-bottom: 10rpx;
-      padding-top: 20rpx;
-      &:last-child {
-        margin-bottom: 0;
-      }
-      .cont-tit {
-        font-size: 32rpx;
-        margin-bottom: 20rpx;
-        font-weight: 500;
-        display: flex;
-        justify-content: space-between;
-        .empty_ico {
-          width: 32rpx;
-          height: 33rpx;
-        }
-      }
-      .targetList {
-        display: flex;
-        flex-wrap: wrap;
-        font-size: 28rpx;
-        .target-item {
-          width: 50%;
-          margin-bottom: 20rpx;
-        }
-      }
-    }
-    .result-cont {
-      padding: 0 34rpx 0;
-      padding-left: 21rpx;
-      .result-list {
-        display: flex;
-        align-items: center;
-        color: #333;
-        padding-bottom: 30rpx;
-        border-bottom: 1rpx solid #ebedf0;
-        margin-bottom: 30rpx;
-        .result_ico {
-          width: 28rpx;
-          height: 28rpx;
-          margin-right: 20rpx;
-        }
-        text {
-          display: inline;
-        }
-        .highlight {
-          color: #3385ff;
-        }
-      }
-    }
-    .result-data {
-      // margin-top: 80rpx;
-      min-height: calc(100vh - 130rpx);
-      padding: 20rpx 34rpx 40rpx;
-      display: flex;
-      background-color: #f7f7f7;
-    }
-  }
-  .content-report {
-    .content-item {
-      background-color: #fff;
-      padding: 35rpx 20rpx 0;
-      .item-title {
-        font-weight: 500;
-        .item-industry {
-          margin-left: 10rpx;
-          color: #3385ff;
-          display: inline-block;
-        }
-      }
-      .item-user {
-        display: flex;
-        align-items: center;
-        color: #999999;
-        font-size: 28rpx;
-        margin-bottom: 20rpx;
-        image {
-          width: 23rpx;
-          height: 26rpx;
-          margin-right: 20rpx;
-        }
-      }
-      .item-more {
-        display: flex;
-        justify-content: space-between;
-        color: #cecece;
-        margin: 20rpx 0 0;
-        padding-bottom: 30rpx;
-        border-bottom: 1rpx solid #ececec;
-        .pv-ollect {
-          display: flex;
-          align-items: center;
-          width: 40%;
-          justify-content: space-between;
-          image {
-            width: 22rpx;
-            height: 21rpx;
-            margin-right: 10rpx;
-          }
-          .pv {
-            height: 16rpx;
-          }
-        }
-      }
-    }
-  }
-}
-</style>

pages.json

@@ -198,12 +198,6 @@
     {
       "root": "pages-my",
       "pages": [
-        {
-          "path": "search/search",
-          "style": {
-            "navigationBarTitleText": "搜索"
-          }
-        },
         {
           "path": "downloadFile/downloadFile",
           "style": {
@@ -325,19 +319,6 @@
             "navigationBarTitleText": "搜索",
             "enablePullDownRefresh": false
           }
-        },
-        {
-          "path": "activitySearch/activitySearch",
-          "style": {
-            "navigationBarTitleText": "搜索",
-            "enablePullDownRefresh": false
-          }
-        },
-        {
-          "path": "reportSearch/reportSearch",
-          "style": {
-            "navigationBarTitleText": "搜索"
-          }
         }
       ]
     }

pages/activity/activity.vue

@@ -9,7 +9,7 @@
           </view>
           <view class="activity-search" @click="goSearch">
             <icon type="search" size="15" class="search_ico" style="margin-right: 10rpx" />
-            {{ searchPlaceholderList.ActivitySearch }}
+            {{ searchPlaceholderList.ActivitySearch || "" }}
           </view>
         </view>
       </view>
@@ -85,7 +85,7 @@
 <script>
 import { activity } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
-import myActivityMixin from "@/pages-activity/components/indexActivity.js";
+import myActivityMixin from "@/components/activity/indexActivity.js";
 import freeCharge from "@/components/freeCharge";
 let app = getApp();
 export default {
@@ -294,7 +294,7 @@ export default {
     },
     //去往搜索事件
     goSearch() {
-      this.$store.dispatch("checkHandle", "/pages-search/activitySearch/activitySearch");
+      this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch");
     },
     //去往 活动回放activityPlayBack
     activityPlayBack() {
@@ -365,7 +365,7 @@ export default {
           margin-left: 20rpx;
           width: 46%;
           height: 62rpx;
-          color: #8D8D8D;
+          color: #8d8d8d;
           font-size: 30rpx;
           display: flex;
           align-items: center;
@@ -558,5 +558,5 @@ export default {
 /deep/ .van-ellipsis {
   font-size: 24rpx;
 }
-@import "@/pages-activity/components/indexActivity.scss";
+@import "@/components/activity/indexActivity.scss";
 </style>

pages/index/index.vue

@@ -4,14 +4,14 @@
       <view class="nav-bar-wrap" :style="{ height: navBarStyle.height, paddingTop: navBarStyle.paddingTop, paddingBottom: navBarStyle.paddingBottom }">
         <view class="content" @click="goSearch">
           <icon type="search" size="15" class="search_ico" />
-          <text class="sea_ipt">{{ searchPlaceholderList.SummarySearch }}</text>
+          <text class="sea_ipt">{{ searchPlaceholderList.SummarySearch || "" }}</text>
         </view>
       </view>
       <view class="top-tabs">
-        <block v-for="(item, index) in topTabBars" :key="item.Id">
+        <block v-for="item in topTabBars" :key="item.Id">
           <view v-if="item.IsShow" :class="['item', item.val == topTabsActive && 'tabs-active']" @click="topTabsChange(item)">
             {{ item.Name }}
-            <block v-if="index === 2 && isShowChart">
+            <block v-if="(item.Id === 3||item.Name == '图表') && wholeShowListData.IsShowChart">
               <image class="limit-img tabs-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
             </block>
             <view class="active" v-if="item.Id == topTabsActive"></view>

pages/pcWebViev/pcWebViev.vue

@@ -54,7 +54,6 @@ export default {
         "themeActivity",
         "activityDetail",
         "reportDetail",
-        "IndustryReport",
         "reportSecretDetail",
         "roadEssence",
         "chartPage",

pages/purchaser/purchaser.vue

@@ -3,7 +3,7 @@
     <view class="nav-bar-wrap" :style="{ height: navBarStyle.height, paddingTop: navBarStyle.paddingTop, paddingBottom: navBarStyle.paddingBottom }">
       <view class="content" @click="goSearch">
         <icon type="search" size="15" class="search_ico" />
-        <text class="sea_ipt"> {{ searchPlaceholderList.YanXuanSearch }}</text>
+        <text class="sea_ipt"> {{ searchPlaceholderList.YanXuanSearch || "" }}</text>
       </view>
     </view>
     <view class="notice-content" v-if="wholeShowListData.YanXuan_Explain">
@@ -299,7 +299,7 @@ export default {
     },
     /* 搜索 */
     async goSearch() {
-      await this.$store.dispatch("checkHandle", "/pages-search/reportSearch/reportSearch?id=研选");
+      await this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?id=研选");
     },
   },
   onLoad() {

pages/reportForm/reportForm.vue

@@ -8,7 +8,7 @@
         </view>
         <view class="search-box" @click="goSearch">
           <icon type="search" size="15" class="search_ico" />
-          <text class="sea_ipt">{{ searchPlaceholderList.ReportSearch }}</text>
+          <text class="sea_ipt">{{ searchPlaceholderList.ReportSearch || "" }}</text>
         </view>
       </view>
       <view class="second-tabs">
@@ -373,7 +373,7 @@ export default {
     },
     /* 搜索 */
     async goSearch() {
-      await this.$store.dispatch("checkHandle", "/pages-search/reportSearch/reportSearch?id=报告");
+      await this.$store.dispatch("checkHandle", "/pages-search/indedxSearch/indedxSearch?id=报告");
     },
     /* 初始 */
     initList() {