Merge branch '10.7'

activityPages/activityDetail/activityDetail.vue

@@ -13,7 +13,11 @@
           </view>
           <!-- 内容部分 -->
           <view class="content">
-            <view v-if="detailData.ActivityName" class="dialog-title brackets-title">{{ detailData.ActivityName }}</view>
+            <view v-if="detailData.ActivityName" class="dialog-title brackets-title">
+              <image style="width:83rpx;height:33rpx"  v-if="detailData.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
+              <image v-if="!detailData.IsResearchPoints && detailData.IsExternalLabel" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
+              {{ detailData.ActivityName }}
+            </view>
             <block v-if="detailData.FileType == 1">
               <view class="audio-card" v-if="detailData.VoiceList && detailData.VoiceList.Url">
                 <view class="slider-paly">
@@ -180,8 +184,11 @@
               <view class="network-left">链接参会：</view>
               <view class="network-right network-zoom" style="color: #2c83ff">
                 <view>
-                  <text class="default text_zoom">{{ detailData.LinkParticipants }}</text>
-                  <view> 点击<text class="default copy-link copy-zoom" @click="copyLink(1)">复制链接</text>在手机浏览器打开，并输入会议密码 </view>
+                  <view class="default text_zoom" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司调研电话会' && detailData.IsLimitPeople">请报名获取 </view>
+                  <blcok v-else>
+                    <text class="default text_zoom">{{ detailData.LinkParticipants }}</text>
+                    <view> 点击<text class="default copy-link copy-zoom" @click="copyLink(1)">复制链接</text>在手机浏览器打开，并输入会议密码 </view>
+                  </blcok>
                 </view>
               </view>
             </view>
@@ -314,6 +321,8 @@
           </view>
         </view>
       </van-popup>
+      <!-- 各种弹框部分 -->
+      <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
     </view>
     <not-have-login v-else />
   </block>
@@ -330,6 +339,7 @@ import IsTrackFollow from "@/components/isTrackFollow.vue";
 import SelectPopup from "@/components/activity/selectPopup";
 import NotHaveLogin from "@/components/notHaveLogin.vue";
 import suspenButton from "@/components/suspen_button.vue";
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
 let app = getApp({ allowDefault: true });
 export default {
   filters: {
@@ -378,6 +388,8 @@ export default {
       isSendWx: "",
       isDlgImg: false,
       showSingInImg: false,
+      isResearchModalShow: false,
+      checkResearchList: {},
     };
   },
   mixins: [manageMixin],
@@ -421,6 +433,7 @@ export default {
     SelectPopup,
     NotHaveLogin,
     suspenButton,
+    ShowResearchDlg,
   },
   watch: {
     haveAuth: {
@@ -819,6 +832,12 @@ export default {
       font-weight: bold;
       margin-bottom: 15rpx;
       color: #000;
+      image {
+        width: 83rpx;
+        height: 33rpx;
+        vertical-align: middle;
+        margin-right: 5rpx;
+      }
     }
     .brackets-title {
       padding-left: 20rpx;

activityPages/activityDetail/manageMixin.js

@@ -1,4 +1,5 @@
 import { activity, User } from "@/config/api.js";
+import { isTimeGreaterThanCurrent, isWithinOneHour } from "@/config/util.js";
 let app = getApp();
 export default {
   methods: {
@@ -6,11 +7,18 @@ export default {
     signupIsAddOfCancel(type, valName = "") {
       type = type ? type : valName;
       if (this.detailData.IsSignup == 1) {
-        const str = this.detailData.ActivityTime.replace(/-/g, "/");
-        const date = new Date(str);
-        const times = date.getTime();
-        const num = new Date().getTime();
-        if (times - num <= 3600000) {
+        if (this.detailData.IsResearchPoints) {
+          if (isTimeGreaterThanCurrent(this.detailData.SiginupDeadline)) {
+            uni.showModal({
+              confirmText: "知道了",
+              showCancel: false,
+              confirmColor: "#3385FF",
+              content: "报名名单已提交举办方，若想取消，请联系对口销售",
+            });
+            return;
+          }
+        }
+        if (isWithinOneHour(this.detailData.ActivityTime, 3600000)) {
           uni.showModal({
             confirmText: "知道了",
             showCancel: false,
@@ -47,44 +55,16 @@ export default {
         clearTimeout(timer);
         this.flag = true;
         this.selectShow = false;
-        activity
-          .signupAdd({
-            ActivityId: this.detailData.ActivityId,
-            SignupType: type,
-            PageRouter: this.$store.state.pageRouterActivity,
-          })
-          .then((res) => {
-            if (res.Ret == 200) {
-              this.hasPermission = res.Data.HasPermission;
-              this.jurisdictionList = res.Data;
-              this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
-              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.SignupStatus !== "Success") {
-                this.isShow = true;
-              } else {
-                this.detailData.IsSignup = 1;
-                this.detailData.SignupNum += 1;
-                this.detailData.SignupType = type;
-                this.synchronization();
-                if (res.Data.GoBindEmail) this.mailboxBinding = true;
-                if (res.Data.GoOutboundMobile) this.editIsShow = true;
-                else if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
-                else if (res.Data.SignupStatus == "Success") this.isShow = true;
-              }
-            }
-          });
+        if (this.detailData.IsResearchPoints) {
+          this.researchPointsHandler(this.detailData.ActivityId, type, this.detailData);
+        } else {
+          this.myIsApplyHandler(this.detailData.ActivityId, type, valName);
+        }
         timer = setTimeout(() => {
           this.flag = false;
         }, 500);
       }
     },
-
     // 预约/取消
     async summaryIsHandel() {
       if (this.detailData.IsAppointment == 0) {
@@ -173,8 +153,9 @@ export default {
     // 我要报名
     wanttosignup() {
       if (
-        (!this.detailData.IsYidongConduct && this.detailData.IsLimitPeople && [1, 2, 3].includes(this.detailData.ActivityTypeId)) ||
-        (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall)
+        (!this.detailData.IsResearchPoints && this.detailData.ActivityTypeId == 3 && !this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1) ||
+        (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall) ||
+        (!this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1 && [1, 2].includes(this.detailData.ActivityTypeId))
       ) {
         this.selectShow = true;
         this.selectYdong = this.detailData.IsYidongConduct;
@@ -188,5 +169,55 @@ export default {
         url: "/activityPages/generationAsk/generationAsk?id=" + this.id + "&type=" + type,
       });
     },
+
+    // 研选扣点的事件
+    async researchPointsHandler(id, type, item) {
+      const res = await activity.activityCheck({
+        ActivityId: id,
+      });
+      if (res.Ret === 200) {
+        let { Data } = res;
+        this.checkResearchList = Data;
+        this.checkResearchList.childrenType = type;
+        this.jurisdictionList = item;
+        this.isResearchModalShow = true;
+      }
+    },
+
+    // 报名拆分出来
+    myIsApplyHandler(id, type, valName = "") {
+      activity
+        .signupAdd({
+          ActivityId: this.detailData.ActivityId,
+          SignupType: type,
+          PageRouter: this.$store.state.pageRouterActivity,
+        })
+        .then((res) => {
+          if (res.Ret == 200) {
+            this.hasPermission = res.Data.HasPermission;
+            this.jurisdictionList = res.Data;
+            this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
+            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.SignupStatus !== "Success") {
+              this.isShow = true;
+            } else {
+              this.detailData.IsSignup = 1;
+              this.detailData.SignupNum += 1;
+              this.detailData.SignupType = type;
+              this.synchronization();
+              if (res.Data.GoBindEmail) this.mailboxBinding = true;
+              if (res.Data.GoOutboundMobile) this.editIsShow = true;
+              else if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
+              else if (res.Data.SignupStatus == "Success") this.isShow = true;
+            }
+          }
+        });
+    },
   },
 };

activityPages/components/selectMixins.js

@@ -11,6 +11,7 @@ export default {
       chartPermissionIds: "",
       whichDay: "", //选择今日/明日\本、上周 月
       selectActiveId: "", //专家、分析师的id
+      ResearchExternalAct: "",
       activityTimeList: [
         { Id: 1, IsChoose: false, StatusName: "今日活动" },
         { Id: 2, IsChoose: false, StatusName: "明日活动" },
@@ -25,6 +26,10 @@ export default {
         { Id: 5, IsChoose: false, StatusName: "本月", type: "month" },
         { Id: 6, IsChoose: false, StatusName: "上月", type: "month" },
       ],
+      ResearchExternal: [
+        { Id: 1, IsChoose: false, StatusName: "研选扣点" },
+        { Id: 2, IsChoose: false, StatusName: "外部资源" },
+      ],
     };
   },
   methods: {
@@ -74,6 +79,7 @@ export default {
     },
     // 是否有权限的点击事件
     async permissioActivity() {
+      this.page_no = 1;
       if (!this.$store.state.isAuth && !this.$store.state.isBind) {
         this.selectComponent("#industry").toggle(false);
         this.isShowJurisdiction = !this.isShowJurisdiction;
@@ -87,11 +93,12 @@ export default {
         }
       } else {
         //已授权未绑定
-        this.$store.dispatch('checkHandle')
+        this.$store.dispatch("checkHandle");
       }
     },
     // 下拉选择的确定事件
     replacementConfirm() {
+      this.page_no = 1;
       const arr = [];
       const str = [];
       this.listChartPermission &&
@@ -113,6 +120,7 @@ export default {
 
     // 下拉的选择的重置事件
     replacementBtn() {
+      this.page_no = 1;
       this.listChartPermission = this.listChartPermissionInit;
       this.chartPermissionIds = "";
       this.isShowJurisdiction = false;
@@ -152,8 +160,8 @@ export default {
         this.selectComponent("#industry").toggle(false);
       }
       item.IsChoose = !item.IsChoose;
-      let val = this.obtainSelectId(type == "类型" ? this.activityTypeList : this.activityTimeList);
-      type == "类型" ? (this.selectActiveId = val) : (this.whichDay = val);
+      let val = this.obtainSelectId(type == "类型" ? this.activityTypeList : type == "扣点" ? this.ResearchExternal : this.activityTimeList);
+      type == "类型" ? (this.selectActiveId = val) : type == "扣点" ? (this.ResearchExternalAct = val) : (this.whichDay = val);
       this.getActivityList();
     },
 

activityPages/themeActivity/themeActivity.vue

@@ -7,12 +7,7 @@
           <view :class="['content-title', !contentDetail.IsJump && 'jump-title']" @click="jumpHandler">
             <text class="jump-label">{{ contentDetail.Label }}</text>
             <text v-if="contentDetail.IsJump" class="jump-text"> 查看资源包>></text>
-            <image
-              v-if="contentDetail.IndustryNewLabel"
-              class="new_icon"
-              src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"
-              mode=""
-            ></image>
+            <image v-if="contentDetail.IndustryNewLabel" class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
           </view>
         </view>
         <view :class="['screen-item', (isEndActivity || !type) && 'end-select-item']">
@@ -39,32 +34,17 @@
             </view>
           </block>
           <block v-if="isEndActivity">
-            <text
-              @click="selectMultipleHandler(item, '类型')"
-              v-for="item in activityTypeList"
-              :key="item.Id"
-              :class="['select-item-multiple', item.IsChoose && 'active']"
-              >{{ item.StatusName }}</text
-            >
+            <text @click="selectMultipleHandler(item, '类型')" v-for="item in activityTypeList" :key="item.Id" :class="['select-item-multiple', item.IsChoose && 'active']">{{ item.StatusName }}</text>
           </block>
           <block v-else>
-            <text
-              @click="selectMultipleHandler(item, '日期')"
-              v-for="item in activityTimeList"
-              :key="item.Id"
-              :class="['select-item-multiple', item.IsChoose && 'active']"
-              >{{ item.StatusName }}</text
-            >
+            <text @click="selectMultipleHandler(item, '日期')" v-for="item in activityTimeList" :key="item.Id" :class="['select-item-multiple', item.IsChoose && 'active']">{{ item.StatusName }}</text>
           </block>
         </view>
+        <view class="research-external-item" v-if="!isEndActivity && type && contentDetail.IsShowResearchPoints">
+          <text @click="selectMultipleHandler(item, '扣点')" v-for="item in ResearchExternal" :key="item.Id" :class="['select-item-multiple', item.IsChoose && 'active']">{{ item.StatusName }}</text>
+        </view>
         <view class="screen-item screen-item-ul" v-if="isEndActivity">
-          <text
-            @click="monthWeekHandler(item)"
-            v-for="item in activityMonthWeekList"
-            :key="item.Id"
-            :class="['text-item', item.IsChoose && 'active']"
-            >{{ item.StatusName }}</text
-          >
+          <text @click="monthWeekHandler(item)" v-for="item in activityMonthWeekList" :key="item.Id" :class="['text-item', item.IsChoose && 'active']">{{ item.StatusName }}</text>
         </view>
       </view>
       <!-- 活动列表 -->
@@ -106,7 +86,11 @@
               </view>
               <view class="item">
                 <view class="item-text" @click="goDetail(item)">
-                  <text class="activity-title"> {{ item.ActivityName }} </text>
+                  <view class="activity-title text_twoLine">
+                    <image style="width:83rpx;height:33rpx" v-if="item.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
+                    <image v-if="!item.IsResearchPoints && item.IsExternalLabel" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
+                    {{ item.ActivityName }}
+                  </view>
                   <text class="text_twoLine" v-if="item.Expert && item.SourceType == 1">专家背景：{{ 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>
@@ -123,33 +107,23 @@
                         {{ 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.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.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 && !item.IsYidongConduct">
-                            <text class="button" @click="signupIsAddOfCancel(item, 3, 'CClass')">{{
-                              item.IsSignup == 1 ? "取消报名" : "我要报名"
-                            }}</text>
+                            <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)">我要报名</text>
-                            <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{
-                              item.SignupType == 1 ? "取消外呼" : "取消报名"
-                            }}</text>
+                            <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
                           </block>
                         </block>
                       </view>
@@ -212,6 +186,7 @@
       <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
     </view>
     <not-have-login v-else />
+    <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
   </block>
 </template>
 
@@ -228,6 +203,7 @@ import videoModule from "@/components/videoModule/index";
 import SelectPopup from "@/components/activity/selectPopup";
 import NotHaveLogin from "../../components/notHaveLogin.vue";
 
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
 export default {
   mixins: [myActivityMixin, selectMixins, mediaMixins],
   data() {
@@ -250,6 +226,7 @@ export default {
     videoModule,
     SelectPopup,
     NotHaveLogin,
+    ShowResearchDlg,
   },
   methods: {
     // 判断几个按钮
@@ -275,6 +252,7 @@ export default {
         WhichDay: this.whichDay,
         ActivityId: this.activityId,
         TypeName: this.selectActiveId,
+        IsResearchPoints: this.ResearchExternalAct,
       });
       if (res.Ret === 200) {
         if (this.type) {
@@ -379,15 +357,7 @@ export default {
   onShareAppMessage: function (res) {
     return {
       title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : this.type || this.label,
-      path:
-        "/activityPages/themeActivity/themeActivity?title=" +
-        this.label +
-        "&permissionIds=" +
-        this.chartPermissionIds +
-        "&whichDay=" +
-        this.whichDay +
-        "&type=" +
-        this.type,
+      path: "/activityPages/themeActivity/themeActivity?title=" + this.label + "&permissionIds=" + this.chartPermissionIds + "&whichDay=" + this.whichDay + "&type=" + this.type,
     };
   },
 };
@@ -440,11 +410,27 @@ export default {
   .collect-ul {
     padding-top: 10rpx;
   }
+  .research-external-item {
+    width: 100%;
+    background-color: #fff;
+    height: 60rpx;
+    padding: 0 34rpx;
+    font-size: 24rpx;
+    margin-top: -15rpx;
+    color: #333;
+    display: flex;
+    align-items: center;
+    .active {
+      background-color: #3385ff !important;
+      color: #fff !important;
+    }
+  }
   .end-select-item {
+    flex-wrap: wrap !important;
     justify-content: flex-start !important;
-    .select-item-multiple {
-      margin-right: 38rpx;
-    }
+  }
+  .select-item-multiple {
+    margin-right: 38rpx;
   }
   @import "../components/selectCss.scss";
   @import "@/components/activity/indexActivity.scss";

components/ItemComponent/activityItem.vue

@@ -2,10 +2,7 @@
   <view class="container-activity-item" @click="goDetail(list)">
     <view class="content-sign">
       <view :class="[list.ActivityType === 0 ? 'is-down' : 'is-up', 'is-up-down']">{{ list.ActivityType === 0 ? "线下" : "线上" }}</view>
-      <view
-        v-if="list.ActiveState == 1 || list.ActiveState == 2"
-        :class="[list.ActiveState == 1 ? 'is-down-state' : 'is-up-state', 'is-up-down', 'state']"
-      >
+      <view v-if="list.ActiveState == 1 || list.ActiveState == 2" :class="[list.ActiveState == 1 ? 'is-down-state' : 'is-up-state', 'is-up-down', 'state']">
         {{ list.ActiveState == 1 ? "未开始" : "进行中" }}
       </view>
       <block v-else>
@@ -14,11 +11,12 @@
     </view>
     <view class="content-type"> {{ list.ActivityTypeName || "专项产业调研" }}</view>
     <view :class="['content-title', 'text-Line', list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
+      <image style="width:83rpx;height:33rpx" v-if="list.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
+      <image v-if="!list.IsResearchPoints && list.IsExternalLabel" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
       {{ list.ActivityName || list.ResearchTheme }}
     </view>
     <view style="display: flex" class="content-text content-min-hight text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
-      <text style="flex-shrink: 0"> 活动时间：</text>
-      <text> {{ list.ActivityTimeText }}</text>
+      <text> 活动时间：{{ list.ActivityTimeText }}</text>
     </view>
     <view class="content-text text-Line" v-else>
       {{ list.Host ? "主持人:" : list.Expert ? "专家背景:" : list.Speaker ? "主讲人:" : list.DistinguishedGuest ? "嘉宾:" : "" }}
@@ -37,9 +35,7 @@
           <text class="item-btn btn-solid" v-if="list.IsShowOutboundCall && list.ActivityTypeId == 1" @click.stop="signupIsAddOfCancel(list, 1)">{{
             list.IsSignup == 1 ? "取消外呼" : "预约外呼"
           }}</text>
-          <text class="item-btn" v-if="list.IsShowAppointment" @click.stop="summaryIsHandel(list)">{{
-            list.IsAppointment == 1 ? "取消纪要" : "预约纪要"
-          }}</text>
+          <text class="item-btn" v-if="list.IsShowAppointment" @click.stop="summaryIsHandel(list)">{{ list.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
           <text class="item-btn" v-if="list.IsShowMeetingReminder" @click.stop="meetingReminderAdd(list, list.IsCancelMeetingReminder)">
             {{ list.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
           </text>
@@ -52,15 +48,11 @@
           <text class="item-btn" v-if="list.IsShowDetails" @click.stop="goDetail(list)">查看详情</text>
           <block v-if="list.IsShowSignup">
             <block v-if="list.IsCClassMeeting && !list.IsYidongConduct">
-              <text class="item-btn btn-solid" @click.stop="signupIsAddOfCancel(list, 3, 'CClass')">{{
-                list.IsSignup == 1 ? "取消报名" : "我要报名"
-              }}</text>
+              <text class="item-btn btn-solid" @click.stop="signupIsAddOfCancel(list, 3, 'CClass')">{{ list.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
             </block>
             <block v-else>
               <text class="item-btn btn-solid" v-if="list.IsSignup !== 1" @click.stop="wanttosignup(list)">我要报名</text>
-              <text class="item-btn btn-solid" v-else @click.stop="signupIsAddOfCancel(list, 2)">{{
-                list.SignupType == 1 ? "取消外呼" : "取消报名"
-              }}</text>
+              <text class="item-btn btn-solid" v-else @click.stop="signupIsAddOfCancel(list, 2)">{{ list.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
             </block>
           </block>
         </block>
@@ -71,9 +63,7 @@
           <view class="" style="width: 130rpx"> </view>
           <text class="item-btn" @click.stop="lookImg(list)">行程安排</text>
           <block v-if="list.TripStatus == 2">
-            <text v-if="list.ActiveState == 1" class="item-btn btn-solid" @click.stop="applyOfcancel(list)">{{
-              list.IsTrip == 0 ? "我要报名" : "取消报名"
-            }}</text>
+            <text v-if="list.ActiveState == 1" class="item-btn btn-solid" @click.stop="applyOfcancel(list)">{{ list.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
           </block>
           <block v-else>
             <text class="item-btn btn-solid" v-if="list.IsSignup !== 1" @click.stop="interest(list)">感兴趣</text>
@@ -123,6 +113,7 @@
       </view>
     </u-modal>
     <SelectPopup :selectShow.sync="selectShow" @signupIsAddOfCancel="signupIsAddOfCancel" :selectYdong="selectYdong" />
+    <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
   </view>
 </template>
 
@@ -130,9 +121,12 @@
 import modalDialog from "../modalDialog.vue";
 import { activity, User } from "@/config/api.js";
 import SelectPopup from "@/components/activity/selectPopup";
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
+import { isTimeGreaterThanCurrent, isWithinOneHour } from "@/config/util.js";
+
 export default {
   name: "",
-  components: { modalDialog, SelectPopup },
+  components: { modalDialog, SelectPopup, ShowResearchDlg },
   props: {
     list: {
       type: Object,
@@ -180,6 +174,9 @@ export default {
       show_cancel_button: false, // 取消按钮的隐藏显示
       show_confirm_button: false, // 确定按钮的隐藏显示
       itemData: {},
+      isResearchModalShow: false,
+      checkResearchList: {},
+      addItemData: {},
     };
   },
   computed: {},
@@ -205,8 +202,9 @@ export default {
         this.goDetail(item);
         return;
       } else if (
+        (!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
         (item.IsYidongConduct && item.IsCanOutboundCall) ||
-        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))
+        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))
       ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;
@@ -216,16 +214,23 @@ export default {
       }
     },
 
-    //报名/取消报名
+    //报名 取消报名 预约外呼/取消预约外呼报名
     signupIsAddOfCancel(item, type, valName = "") {
       let id = this.activityIdAdd || item.ActivityId;
-      let itemData = item || this.itemData;
+      this.addItemData = item || this.itemData;
       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) {
+        if (item.IsResearchPoints) {
+          if (isTimeGreaterThanCurrent(item.SiginupDeadline)) {
+            uni.showModal({
+              confirmText: "知道了",
+              showCancel: false,
+              confirmColor: "#3385FF",
+              content: "报名名单已提交举办方，若想取消，请联系对口销售",
+            });
+            return;
+          }
+        }
+        if (isWithinOneHour(item.ActivityTime, 3600000)) {
           uni.showModal({
             confirmText: "知道了",
             showCancel: false,
@@ -246,7 +251,7 @@ export default {
                 PageRouter: this.$store.state.pageRouterActivity,
               });
               if (res.Ret === 200) {
-                this.parentDataEmit(itemData, "IsSignup", 0);
+                this.parentDataEmit(this.addItemData, "IsSignup", 0);
                 this.init();
                 type == 1
                   ? uni.showToast({
@@ -270,45 +275,11 @@ export default {
         clearTimeout(timer);
         this.flag = true;
         this.selectShow = false;
-        activity
-          .signupAdd({
-            ActivityId: id,
-            SignupType: type,
-            PageRouter: this.$store.state.pageRouterActivity,
-          })
-          .then((res) => {
-            if (res.Ret == 200) {
-              this.hasPermission = res.Data.HasPermission;
-              this.jurisdictionList = res.Data;
-              if (this.hasPermission == 1) {
-                this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
-                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.isShow = true;
-                  this.parentDataEmit(itemData, "IsSignup", 1);
-                  this.parentDataEmit(itemData, "SignupType", type);
-                }
-              } else if (this.hasPermission == 2) {
-                this.isShowhasPermission = true;
-              } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-                this.applyForIsShow = true;
-              }
-            }
-          });
+        if (this.addItemData.IsResearchPoints) {
+          this.researchPointsHandler(id, type, item);
+        } else {
+          this.myIsApplyHandler(id, type, valName);
+        }
         timer = setTimeout(() => {
           this.flag = false;
         }, 500);
@@ -583,6 +554,58 @@ export default {
       let index = this.$parent.newDataList.findIndex((key) => key.Activity && key.Activity.ActivityId === item.ActivityId);
       this.$parent.newDataList[index].Activity[value] = num;
     },
+    // 我要报名的请求拆分出来了
+    async myIsApplyHandler(id, type, valName = "") {
+      const res = await activity.signupAdd({
+        ActivityId: id,
+        SignupType: type,
+        PageRouter: this.$store.state.pageRouterActivity,
+      });
+      if (res.Ret == 200) {
+        this.hasPermission = res.Data.HasPermission;
+        this.jurisdictionList = res.Data;
+        if (this.hasPermission == 1) {
+          this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
+          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.isShow = true;
+            this.parentDataEmit(this.addItemData, "IsSignup", 1);
+            this.parentDataEmit(this.addItemData, "SignupType", type);
+          }
+        } else if (this.hasPermission == 2) {
+          this.isShowhasPermission = true;
+        } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
+          this.applyForIsShow = true;
+        }
+      }
+    },
+    // 研选扣点的事件
+    async researchPointsHandler(id, type, item) {
+      const res = await activity.activityCheck({
+        ActivityId: id,
+      });
+      if (res.Ret === 200) {
+        let { Data } = res;
+        this.checkResearchList = Data;
+        this.checkResearchList.childrenType = type;
+        this.jurisdictionList = item;
+        this.isResearchModalShow = true;
+      }
+    },
   },
 };
 </script>
@@ -639,6 +662,12 @@ export default {
     font-weight: 400;
     color: #333333;
     line-height: 44rpx;
+    image {
+      width: 83rpx;
+      height: 33rpx;
+      vertical-align: middle;
+      margin-right: 5rpx;
+    }
   }
   .content-text {
     font-size: 28rpx;

components/activity/indexActivity.js

@@ -1,4 +1,5 @@
 import { activity, User } from "@/config/api.js";
+import { isTimeGreaterThanCurrent, isWithinOneHour } from "@/config/util.js";
 let app = getApp();
 export default {
   data() {
@@ -39,6 +40,9 @@ export default {
       mailboxBinding: false, //是否绑定邮箱
       selectShow: false, // 是否显示选择弹框
       selectYdong: false,
+      isResearchModalShow: false,
+      checkResearchList: {},
+      itemData: null,
     };
   },
   methods: {
@@ -49,8 +53,9 @@ export default {
         this.goDetail(item);
         return;
       } else if (
+        (!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
         (item.IsYidongConduct && item.IsCanOutboundCall) ||
-        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))
+        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))
       ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;
@@ -63,13 +68,20 @@ export default {
     //报名/取消报名
     signupIsAddOfCancel(item, type, valName = "") {
       let id = this.activityIdAdd || item.ActivityId;
-      let itemData = item;
+      this.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) {
+        if (item.IsResearchPoints) {
+          if (isTimeGreaterThanCurrent(item.SiginupDeadline)) {
+            uni.showModal({
+              confirmText: "知道了",
+              showCancel: false,
+              confirmColor: "#3385FF",
+              content: "报名名单已提交举办方，若想取消，请联系对口销售",
+            });
+            return;
+          }
+        }
+        if (isWithinOneHour(item.ActivityTime, 3600000)) {
           uni.showModal({
             confirmText: "知道了",
             showCancel: false,
@@ -118,50 +130,11 @@ export default {
         clearTimeout(timer);
         this.flag = true;
         this.selectShow = false;
-        activity
-          .signupAdd({
-            ActivityId: id,
-            SignupType: type,
-            PageRouter: this.$store.state.pageRouterActivity,
-          })
-          .then((res) => {
-            if (res.Ret == 200) {
-              this.hasPermission = res.Data.HasPermission;
-              this.jurisdictionList = res.Data;
-              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.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.isShow = true;
-                  this.collectList.forEach((valueAct) => {
-                    if (valueAct.ActivityId === id) {
-                      valueAct.IsSignup = 1;
-                    }
-                  });
-                }
-              } else if (this.hasPermission == 2) {
-                this.isShowhasPermission = true;
-              } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-                this.applyForIsShow = true;
-              }
-            }
-          });
+        if (this.itemData.IsResearchPoints) {
+          this.researchPointsHandler(id, type, item);
+        } else {
+          this.myIsApplyHandler(id, type);
+        }
         timer = setTimeout(() => {
           this.flag = false;
         }, 500);
@@ -319,5 +292,62 @@ export default {
         uni.navigateTo({ url: "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId });
       }
     },
+
+    // 我要报名的请求拆分出来了
+    async myIsApplyHandler(id, type, valName = "") {
+      const res = await activity.signupAdd({
+        ActivityId: id,
+        SignupType: type,
+        PageRouter: this.$store.state.pageRouterActivity,
+      });
+      if (res.Ret == 200) {
+        this.hasPermission = res.Data.HasPermission;
+        this.jurisdictionList = res.Data;
+        if (this.hasPermission == 1) {
+          this.signupType = valName == "CClass" ? "CClass" : res.Data.SignupType;
+          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.isShow = true;
+            this.collectList.forEach((valueAct) => {
+              if (valueAct.ActivityId === id) {
+                valueAct.IsSignup = 1;
+                valueAct.SignupType = type;
+              }
+            });
+          }
+        } else if (this.hasPermission == 2) {
+          this.isShowhasPermission = true;
+        } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
+          this.applyForIsShow = true;
+        }
+      }
+    },
+    // 研选扣点的事件
+    async researchPointsHandler(id, type, item) {
+      const res = await activity.activityCheck({
+        ActivityId: id,
+      });
+      if (res.Ret === 200) {
+        let { Data } = res;
+        this.checkResearchList = Data;
+        this.checkResearchList.childrenType = type;
+        this.jurisdictionList = item;
+        this.isResearchModalShow = true;
+      }
+    },
   },
 };

components/activity/indexActivity.scss

@@ -108,6 +108,12 @@
           color: #333333;
           font-weight: 700;
           margin-bottom: 20rpx;
+          image {
+            width: 83rpx;
+            height: 33rpx;
+            vertical-align: middle;
+            margin-right: 5rpx;
+          }
         }
       }
     }
@@ -120,14 +126,14 @@
       display: flex;
       justify-content: flex-end;
       align-items: center;
-      color: #3385FF;
+      color: #3385ff;
       overflow: hidden;
       overflow-x: auto;
 
       text {
         display: flex;
         align-items: center;
-        justify-content:center;
+        justify-content: center;
         width: 113rpx;
         height: 42rpx;
         background: #ffffff;
@@ -159,7 +165,7 @@
       .city-img {
         display: flex;
         align-items: center;
-       flex-shrink: 0;
+        flex-shrink: 0;
       }
     }
   }
@@ -220,4 +226,4 @@
       padding: 10rpx 10rpx 20rpx 20rpx;
     }
   }
-}
+}

components/activity/showResearchDlg.vue

@@ -0,0 +1,206 @@
+<template>
+  <view class="show_Research_Dlg">
+    <u-modal
+      ref="modalResearch"
+      async-close
+      v-model="isShow"
+      :content-style="{ fontSize: '32rpx' }"
+      @confirm="confirmModal"
+      :show-cancel-button="!isShowView"
+      :confirm-text="isShowView ? '知道了' : '确定'"
+      cancel-text="取消"
+      @cancel="cancelModal"
+      :show-title="false"
+      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+      :confirm-style="{ fontWeight: '700' }"
+    >
+      <view class="slot-content">
+        <block v-if="!checkResearchList.CheckPermission"> 签约买方研选套餐才可参与此活动，请联系对口销售 </block>
+        <block v-else-if="!checkResearchList.CheckTime"> <rich-text :nodes="content"></rich-text></block>
+        <block v-else-if="!checkResearchList.CheckPoints">
+          <view class="title-box txt-check">
+            点数不足，若想报名,<br />请联系对口销售
+            <text style="display: inline-block; color: #3385ff" @click="promptTextHandler">升级套餐</text>
+          </view>
+          <view class="content-box">
+            <text>当前剩余点数：</text>
+            <text>{{ checkResearchList.CompanyPoints }}</text>
+          </view>
+          <view class="content-box">
+            <text>本次会议扣除点数：</text>
+            <text>{{ checkResearchList.ActivityPoints }}</text>
+          </view>
+        </block>
+        <block v-else-if="!checkResearchList.CheckEmail">
+          <text class="title-box">应上市公司要求，该会议报名需 提供邮箱，请填写您的工作邮箱</text>
+          <view class="content-input">
+            <input v-model="inputVal" type="text" placeholder="请输入正确的邮箱地址" />
+          </view>
+        </block>
+        <block v-else-if="checkResearchList.CheckPoints">
+          <view class="title-box"> 确定报名参加吗？ </view>
+          <view class="content-box">
+            <text>当前剩余点数：</text>
+            <text>{{ checkResearchList.CompanyPoints }}</text>
+          </view>
+          <view class="content-box">
+            <text>本次会议扣除点数：</text>
+            <text>{{ checkResearchList.ActivityPoints }}</text>
+          </view>
+        </block>
+      </view>
+    </u-modal>
+    <u-modal
+      v-model="show"
+      :show-title="false"
+      confirm-text="知道了"
+      :content-style="{ fontSize: '32rpx' }"
+      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+      :confirm-style="{ fontWeight: '700' }"
+    >
+      <view class="slot-content slot-content-text">
+        <rich-text :nodes="TextContent"></rich-text>
+      </view>
+    </u-modal>
+  </view>
+</template>
+
+<script>
+import { User, activity, FreeButton } from "@/config/api.js";
+export default {
+  data() {
+    return {
+      content: "该活动已截止报名<br />若想参加，请联系对口销售",
+      type: 3,
+      inputVal: "",
+      show: false,
+      TextContent:
+        "5万/年含无限量调研纪要查阅以及15次公开专家访谈或30次重点公司、专家小范围交流；<br /><br />10万/年含无限量调研纪要查阅以及40次公开专家访谈或80次重点公司、专家小范围交流或20次私享专家一对一",
+    };
+  },
+  props: {
+    isResearchModalShow: {
+      default: false,
+      type: Boolean,
+    },
+    checkResearchList: {
+      default: {},
+      type: Object,
+    },
+    jurisdictionList: {
+      default: {},
+      type: Object,
+    },
+  },
+  watch: {},
+  computed: {
+    isShowView() {
+      let list = this.checkResearchList;
+      let isNum = !list.CheckPermission || !list.CheckPoints ? true : false;
+      return isNum;
+    },
+    isShow: {
+      get() {
+        return this.isResearchModalShow;
+      },
+      set() {},
+    },
+  },
+  methods: {
+    cancelModal() {
+      this.$emit("update:isResearchModalShow", false);
+      this.$emit("update:checkResearchList", {});
+    },
+    promptTextHandler() {
+      this.cancelModal();
+      this.$nextTick(() => {
+        this.show = true;
+      });
+    },
+    async confirmModal() {
+      if (!this.checkResearchList.CheckPermission || !this.checkResearchList.CheckTime || !this.checkResearchList.CheckPoints) {
+        this.cancelModal();
+        return;
+      } else if (!this.checkResearchList.CheckEmail) {
+        this.$refs.modalResearch.clearLoading();
+        if (!this.inputVal)
+          return uni.showToast({
+            title: "邮箱不能为空",
+            icon: "none",
+            duration: 2000,
+          });
+        this.cancelModal();
+        const res = await activity.activityEmailBinding({
+          Email: this.inputVal,
+        });
+        if (res.Ret === 200) {
+          this.$parent.myIsApplyHandler(this.jurisdictionList.ActivityId, this.checkResearchList.childrenType);
+        }
+        this.inputVal = "";
+        return;
+      } else if (this.checkResearchList.CheckPoints) {
+        this.$parent.myIsApplyHandler(this.jurisdictionList.ActivityId, this.checkResearchList.childrenType);
+        this.cancelModal();
+        return;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.show_Research_Dlg {
+  .title-box {
+    color: #333333;
+    font-weight: 600;
+    font-size: 32rpx;
+    line-height: 44rpx;
+    margin-bottom: 35rpx;
+  }
+  .content-box {
+    font-weight: 400;
+    font-size: 28rpx;
+    line-height: 44rpx;
+    color: #333333;
+    display: flex;
+    justify-content: center;
+    text:nth-child(2) {
+      color: #3385ff;
+    }
+  }
+  .content-input {
+    display: flex;
+    input {
+      width: 100%;
+      height: 78rpx;
+      line-height: 78rpx;
+      background: #f7f7f7;
+      text-align: left;
+      padding-left: 30rpx;
+    }
+  }
+  .txt-check {
+    text {
+      margin-left: 8rpx;
+    }
+  }
+}
+.slot-content {
+  width: 100%;
+  padding: 50rpx;
+  text-align: center;
+  font-size: 32rpx;
+  color: #0f1826;
+  line-height: 48rpx;
+}
+.slot-content-text {
+  text-align: left;
+}
+.seller-mobile {
+  display: inline-block;
+  color: #2979ff;
+}
+.u-model__footer__button.data-v-3626fcec {
+  border-right: 1rpx solid #333;
+}
+</style>

config/modules/activity.js

@@ -106,5 +106,13 @@ export const activity = {
     activityOverActivityList: (params) => {
       return getHttp("/activity/overActivityList", params, 0);
     },
-    
+    // 活动报名之前的校验（权限、时间、点数、邮箱）
+    activityCheck: (params) => {
+      return postHttp("/activity/check", params, 0);
+    },
+    // 更改绑定邮箱
+    activityEmailBinding: (params) => {
+      return postHttp("/user/email/binding", params, 0);
+    },
+   
   };

config/util.js

@@ -1,150 +1,147 @@
-import { get } from './db.js'
+import { get } from "./db.js";
 // 检验手机号格式
-export const checkPhone = (mobile)=> {
-   // return /^1[345678]\d{9}$/.test(mobile);
-   if (mobile.length == 0) {
-      return false;
-   }
-   if (mobile.length != 11) {
-      return false;
-   }
-   // var myreg = /^0?(13[0-9]|15[0-9]|17[013678]|18[0-9]|14[57]|19[0-9]|18[0-9])[0-9]{8}$/;
-   var myreg = /^1(3|4|5|6|7|8|9)\d{9}$/ ;
-   if (!myreg.test(mobile)) {
-      return false;
-   }
-   return true;
-}
+export const checkPhone = (mobile) => {
+  // return /^1[345678]\d{9}$/.test(mobile);
+  if (mobile.length == 0) {
+    return false;
+  }
+  if (mobile.length != 11) {
+    return false;
+  }
+  // var myreg = /^0?(13[0-9]|15[0-9]|17[013678]|18[0-9]|14[57]|19[0-9]|18[0-9])[0-9]{8}$/;
+  var myreg = /^1(3|4|5|6|7|8|9)\d{9}$/;
+  if (!myreg.test(mobile)) {
+    return false;
+  }
+  return true;
+};
 // 密码验证格式
-export const checkPwd = (pwd)=> {
-   if (pwd.length == 0) {
-      return false;
-   }
-   var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/
-   var re = new RegExp(reg)
-   if (re.test(pwd)) {
-      return true;
-   } else {
-      return false;
-   }
-}
+export const checkPwd = (pwd) => {
+  if (pwd.length == 0) {
+    return false;
+  }
+  var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/;
+  var re = new RegExp(reg);
+  if (re.test(pwd)) {
+    return true;
+  } else {
+    return false;
+  }
+};
 //不足位数前面补0
-export const PrefixInteger = (num, length)=> {
-	return (Array(length).join('0') + num).slice(-length)
-}
+export const PrefixInteger = (num, length) => {
+  return (Array(length).join("0") + num).slice(-length);
+};
 /**
  *
  *  判断是否在微信浏览器 true是
  */
-export const isWeiXinBrowser = ()=> {
-	// #ifdef H5
-	// window.navigator.userAgent属性包含了浏览器类型、版本、操作系统类型、浏览器引擎类型等信息，这个属性可以用来判断浏览器类型
-	let ua = window.navigator.userAgent.toLowerCase()
-	// 通过正则表达式匹配ua中是否含有MicroMessenger字符串
-	if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-		return true
-	} else {
-		return false
-	}
-	// #endif
-
-	return false
-}
+export const isWeiXinBrowser = () => {
+  // #ifdef H5
+  // window.navigator.userAgent属性包含了浏览器类型、版本、操作系统类型、浏览器引擎类型等信息，这个属性可以用来判断浏览器类型
+  let ua = window.navigator.userAgent.toLowerCase();
+  // 通过正则表达式匹配ua中是否含有MicroMessenger字符串
+  if (ua.match(/MicroMessenger/i) == "micromessenger") {
+    return true;
+  } else {
+    return false;
+  }
+};
 //深拷贝
-export const deepCopy = (newobj, obj)=> {
-	if (typeof obj != 'object') {
-		return obj
-	}
-	for (var attr in obj) {
-		var a = {}
-		if (newobj[attr]) {
-			a = newobj[attr]
-		}
-		newobj[attr] = deepCopy(a, obj[attr])
-	}
-	return newobj
-}
+export const deepCopy = (newobj, obj) => {
+  if (typeof obj != "object") {
+    return obj;
+  }
+  for (var attr in obj) {
+    var a = {};
+    if (newobj[attr]) {
+      a = newobj[attr];
+    }
+    newobj[attr] = deepCopy(a, obj[attr]);
+  }
+  return newobj;
+};
 //轻提示
-export const toast = (msg = '', callback = function() {})=> {
-	uni.showToast({
-		title: msg,
-		icon: 'none',
-		duration: 1000,
-		success() {
-			setTimeout(function() {
-				callback()
-			}, 1500)
-		}
-	})
-
-}
+export const toast = (msg = "", callback = function () {}) => {
+  uni.showToast({
+    title: msg,
+    icon: "none",
+    duration: 1000,
+    success() {
+      setTimeout(function () {
+        callback();
+      }, 1500);
+    },
+  });
+};
 /* 弹窗 */
-export const modal = (title='',content,callback = function() {}) => {
-	uni.showModal({
-	   title: title,
-	    content: content,
-		 confirmColor:'#3385FF',
-	    success: function (res) {
-	        if (res.confirm) {
-	            callback()
-	        } else if (res.cancel) {
-	        }
-	    }
-	});
-}
+export const modal = (title = "", content, callback = function () {}) => {
+  uni.showModal({
+    title: title,
+    content: content,
+    confirmColor: "#3385FF",
+    success: function (res) {
+      if (res.confirm) {
+        callback();
+      } else if (res.cancel) {
+      }
+    },
+  });
+};
 /* 弹窗 */
-export const modalShow = (title='',content,confirm,callback = function() {}) => {
-	uni.showModal({
-	   title: title,
-	    content: content,
-        showCancel: false,
-        confirmText:confirm==''?'确定':'知道了',
-		confirmColor:'#3385FF',
-	    success: function (res) {
-	        if (res.confirm) {
-	            callback()
-	        } else if (res.cancel) {
-	        }
-	    }
-	});
-}
+export const modalShow = (title = "", content, confirm, callback = function () {}) => {
+  uni.showModal({
+    title: title,
+    content: content,
+    showCancel: false,
+    confirmText: confirm == "" ? "确定" : "知道了",
+    confirmColor: "#3385FF",
+    success: function (res) {
+      if (res.confirm) {
+        callback();
+      } else if (res.cancel) {
+      }
+    },
+  });
+};
 /* 处理时间格式 */
-export const dateFormatter = (str,bol=false,bol2=false) => { //默认返回yyyy-MM-dd HH-mm-ss
-    var dateStr = String(str);
-    if(!(dateStr.indexOf('-')>-1 && dateStr.indexOf('T')>-1)){
-        dateStr = dateStr.replace(/\-/g,'/');
+export const dateFormatter = (str, bol = false, bol2 = false) => {
+  //默认返回yyyy-MM-dd HH-mm-ss
+  var dateStr = String(str);
+  if (!(dateStr.indexOf("-") > -1 && dateStr.indexOf("T") > -1)) {
+    dateStr = dateStr.replace(/\-/g, "/");
+  }
+  var d = new Date(dateStr);
+  var year = d.getFullYear();
+  var month = d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
+  var day = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
+  var hour = d.getHours() < 10 ? "0" + d.getHours() : d.getHours();
+  var minute = d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes();
+  var second = d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds();
+  if (bol) {
+    if (bol2) {
+      return `${month}月${day}日 ${hour}时${minute}分${second}秒`;
     }
-	var d = new Date(dateStr);
-	var year = d.getFullYear();
-	var month = (d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1);
-	var day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate();
-	var hour = d.getHours() < 10 ? '0' + d.getHours() : d.getHours();
-	var minute = d.getMinutes() < 10 ? '0' + d.getMinutes() : d.getMinutes();
-	var second = d.getSeconds() < 10 ? '0' + d.getSeconds() : d.getSeconds();
-	if(bol) {
-        if(bol2){
-            return `${month}月${day}日 ${hour}时${minute}分${second}秒`; 
-        }
-        return [year, month, day].join('-') + " " + [hour, minute, second].join(':');
-	} else {
-        if(bol2){
-            return `${month}月${day}日`; 
-        }
-		return [year, month, day].join('-');
-	}
-}
+    return [year, month, day].join("-") + " " + [hour, minute, second].join(":");
+  } else {
+    if (bol2) {
+      return `${month}月${day}日`;
+    }
+    return [year, month, day].join("-");
+  }
+};
 //加载显示
-export const loading = (msg = '加载中')=> {
-	uni.showToast({
-		title: msg,
-		icon: 'loading'
-	})
-}
+export const loading = (msg = "加载中") => {
+  uni.showToast({
+    title: msg,
+    icon: "loading",
+  });
+};
 
 //加载隐藏
-export const loadHide = ()=> {
-	uni.hideToast();
-}
+export const loadHide = () => {
+  uni.hideToast();
+};
 
 /**
  * 函数防抖 (只执行最后一次点击)
@@ -153,18 +150,18 @@ export const loadHide = ()=> {
  * @returns {Function}
  * @constructor
  */
-export const Debounce = (fn, t=300) => {
+export const Debounce = (fn, t = 300) => {
   let timer;
   return function () {
     let args = arguments;
-    if(timer){
+    if (timer) {
       clearTimeout(timer);
     }
     timer = setTimeout(() => {
       timer = null;
       fn.apply(this, args);
     }, t);
-  }
+  };
 };
 /**
  * 函数节流
@@ -173,7 +170,7 @@ export const Debounce = (fn, t=300) => {
  * @returns {Function}
  * @constructor
  */
-export const Throttle = (fn, t=500) => {
+export const Throttle = (fn, t = 500) => {
   let last;
   let timer;
   return function () {
@@ -189,114 +186,127 @@ export const Throttle = (fn, t=500) => {
       last = now;
       fn.apply(this, args);
     }
-  }
-}
+  };
+};
 
 // 上传图片封装
-export const upload = ({
-	/* 单张上传 */
-   Single: function (Funurl, fn) {
-		// 获取用户token和用户信息
-		let token = get("access_token");
-		let authHeader = token || '';
-      uni.chooseImage({
-         count: 1, ///最多可以选择一张图片
-         sizeType: ['original', 'compressed'],//原图或压缩图
-         sourceType: ['album', 'camera'],//图片来源
-         success: function (res) {
-            const tempFilePaths = res.tempFilePaths;//相当于src路径
+export const upload = {
+  /* 单张上传 */
+  Single: function (Funurl, fn) {
+    // 获取用户token和用户信息
+    let token = get("access_token");
+    let authHeader = token || "";
+    uni.chooseImage({
+      count: 1, ///最多可以选择一张图片
+      sizeType: ["original", "compressed"], //原图或压缩图
+      sourceType: ["album", "camera"], //图片来源
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths; //相当于src路径
+        uni.showToast({
+          title: "正在上传...",
+          icon: "loading",
+          mask: true,
+          duration: 10000,
+        });
+        uni.uploadFile({
+          header: {
+            "Content-Type": "multipart/form-data",
+            Authorization: authHeader,
+          },
+          name: "file",
+          url: Funurl,
+          filePath: tempFilePaths[0],
+          success(res) {
+            fn(res);
+            uni.hideToast();
             uni.showToast({
-               title: '正在上传...',
-               icon: 'loading',
-               mask: true,
-               duration: 10000
-            })
-            uni.uploadFile({
-               header: {
-                  "Content-Type": "multipart/form-data",
-						'Authorization':authHeader
-               },
-               name: 'file',
-               url: Funurl,
-               filePath: tempFilePaths[0],
-               success(res) {
-                  fn(res);
-                  uni.hideToast();
-                  uni.showToast({
-                     title: '上传成功',
-                     icon: 'none',
-                     mark: true,
-                  })
-               },
-               fail(err) {
-                  uni.hideToast();
-                  uni.showModal({
-                     title: '错误提示',
-                     content: '上传图片失败'+err,
-                     showCancel: false,
-                     success: function (res) { }
-                  })
-               }
-            })
-         },
-      })
-   },
-   //上传多张图片
-   Much: function (Funurl, fn, count) {
-		// 获取用户token和用户信息
-		let token = get("access_token");
-		let authHeader = token || '';
-      var list = new Array();
-      uni.chooseImage({
-         count: count,//最多可以选择3张图
-         sizeType: ['original', 'compressed'],
-         sourceType: ['album', 'camera'],
-         success: function (res) {
-            const tempFilePaths = res.tempFilePaths;
-            let uploadImgCount = 0;
-            uni.showToast({
-               title: '正在上传...',
-               icon: 'loading',
-               mask: true,
-               duration: 10000
-            })
-            for (var i = 0; i < tempFilePaths.length; i++) {
-               uni.uploadFile({
-                  url: Funurl,
-                  name: 'file',
-                  filePath: tempFilePaths[i],//第几张图片
-                  header: {
-                     "Content-Type": "multipart/form-data",
-							'Authorization':authHeader
-                  },
-                  success(res) {
-                     uploadImgCount++;
-								fn(res);
-                      //如果是最后一张,则隐藏等待中  
-                     if (uploadImgCount === tempFilePaths.length) {
-                        uni.hideToast();
-                        // uni.showToast({
-                        //    title: '上传图片成功',
-                        //    icon: 'none',
-                        //    mark: true,
-                        // })
-                     }else {
-								that.upload(imgs)
-							}
-                  },
-                  fail(res) {
-                     uni.hideToast();
-                     uni.showModal({
-                        title: '错误提示',
-                        content: '上传图片失败',
-                        showCancel: false,
-                        success: function (res) { }
-                     })
-                  }
-               })
-            }
-         },
-      })
-   }
-})
-
+              title: "上传成功",
+              icon: "none",
+              mark: true,
+            });
+          },
+          fail(err) {
+            uni.hideToast();
+            uni.showModal({
+              title: "错误提示",
+              content: "上传图片失败" + err,
+              showCancel: false,
+              success: function (res) {},
+            });
+          },
+        });
+      },
+    });
+  },
+  //上传多张图片
+  Much: function (Funurl, fn, count) {
+    // 获取用户token和用户信息
+    let token = get("access_token");
+    let authHeader = token || "";
+    var list = new Array();
+    uni.chooseImage({
+      count: count, //最多可以选择3张图
+      sizeType: ["original", "compressed"],
+      sourceType: ["album", "camera"],
+      success: function (res) {
+        const tempFilePaths = res.tempFilePaths;
+        let uploadImgCount = 0;
+        uni.showToast({
+          title: "正在上传...",
+          icon: "loading",
+          mask: true,
+          duration: 10000,
+        });
+        for (var i = 0; i < tempFilePaths.length; i++) {
+          uni.uploadFile({
+            url: Funurl,
+            name: "file",
+            filePath: tempFilePaths[i], //第几张图片
+            header: {
+              "Content-Type": "multipart/form-data",
+              Authorization: authHeader,
+            },
+            success(res) {
+              uploadImgCount++;
+              fn(res);
+              //如果是最后一张,则隐藏等待中
+              if (uploadImgCount === tempFilePaths.length) {
+                uni.hideToast();
+                // uni.showToast({
+                //    title: '上传图片成功',
+                //    icon: 'none',
+                //    mark: true,
+                // })
+              } else {
+                that.upload(imgs);
+              }
+            },
+            fail(res) {
+              uni.hideToast();
+              uni.showModal({
+                title: "错误提示",
+                content: "上传图片失败",
+                showCancel: false,
+                success: function (res) {},
+              });
+            },
+          });
+        }
+      },
+    });
+  },
+};
+// 判断是否大于当前时间
+export const isTimeGreaterThanCurrent = (timeToCheck) => {
+  const time = new Date(timeToCheck)
+  const currentTime = new Date();
+  return time.getTime() < currentTime.getTime();
+};
+// 判断离结束时间 是否大于指定时间
+export const isWithinOneHour = (activityTime,endTime) => {
+  const str = activityTime.replace(/-/g, "/");
+  const date = new Date(str);
+  const times = date.getTime();
+  const num = new Date().getTime();
+  return times - num <= endTime;
+};

pageMy/myPage/myPage.vue

@@ -1,10 +1,7 @@
 <template>
   <view class="container my-container" v-if="haveData">
     <view class="top-content-box">
-      <view
-        class="nav-bar-wrap"
-        :style="{ height: navBarStyle.height, paddingTop: navBarStyle.paddingTop, paddingBottom: navBarStyle.paddingBottom }"
-      >
+      <view class="nav-bar-wrap" :style="{ height: navBarStyle.height, paddingTop: navBarStyle.paddingTop, paddingBottom: navBarStyle.paddingBottom }">
         <van-icon custom-class="search-icon" name="arrow-left" size="24px" @click="goBack" />
       </view>
     </view>
@@ -66,9 +63,7 @@
           <text>{{ type }}</text>
           <view class="my-bot-box">
             <block v-if="type == '外呼号码'">
-              <text v-if="userInfo.OutboundCountryCode && userInfo.OutboundMobile" style="margin-right: 40rpx; font-size: 28rpx"
-                >{{ userInfo.OutboundCountryCode }}-{{ userInfo.OutboundMobile }}</text
-              >
+              <text v-if="userInfo.OutboundCountryCode && userInfo.OutboundMobile" style="margin-right: 40rpx; font-size: 28rpx">{{ userInfo.OutboundCountryCode }}-{{ userInfo.OutboundMobile }}</text>
               <text v-else style="margin-right: 40rpx; font-size: 28rpx">未设置</text>
             </block>
             <block v-if="type == '关注公众号'">
@@ -355,6 +350,7 @@ export default {
   }
   .my-info {
     position: absolute;
+    background: #f9f9f9;
     top: 301rpx;
     left: 50%;
     transform: translateX(-50%);
@@ -509,7 +505,7 @@ export default {
     z-index: 9;
     font-size: 20rpx;
     color: #999999;
-    width: 100%;
+    width:100%;
     text-align: center;
   }
   .not-bind-login {

pageMy/mySchedulepage/mySchedulepage.vue

@@ -128,6 +128,7 @@
       <audioModule :showAudioPop.sync="showAudioPop" />
     </view>
     <videoModule :showVideoPop.sync="showVideoPop" :videoPopList="videoPopList" />
+    <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
   </view>
 </template>
 
@@ -141,6 +142,7 @@ import audioModule from "@/components/audioModule/index";
 import mediaMixins from "@/components/activity/mediaMixins";
 import videoModule from "@/components/videoModule/index";
 import SelectPopup from "@/components/activity/selectPopup";
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
 
 let app = getApp();
 export default {
@@ -151,6 +153,7 @@ export default {
     audioModule,
     videoModule,
     SelectPopup,
+    ShowResearchDlg,
   },
   data() {
     return {
@@ -164,6 +167,8 @@ export default {
       listChartPermission: [],
       listChartPermissionInit: [],
       collectTypeList: [],
+      isResearchModalShow: false,
+      checkResearchList: {},
     };
   },
   methods: {

pages-search/components/activityBack.vue

@@ -145,6 +145,7 @@
         <rich-text v-else :nodes="specialAccounts"></rich-text>
       </view>
     </u-modal>
+    <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
   </view>
 </template>
 
@@ -158,6 +159,8 @@ import audioModule from "@/components/audioModule/index";
 import videoModule from "@/components/videoModule/index";
 import { activity } from "@/config/api";
 import SelectPopup from "@/components/activity/selectPopup";
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
+
 export default {
   props: {
     collectLists: {
@@ -194,6 +197,7 @@ export default {
     audioModule,
     videoModule,
     SelectPopup,
+    ShowResearchDlg,
   },
   watch: {
     collectLists: {

pages/activity/activity.vue

@@ -32,9 +32,7 @@
             </van-dropdown-item>
           </van-dropdown-menu>
         </view>
-        <text v-for="item in activityTimeList" :key="item.Id" :class="item.IsChoose ? 'active' : ''" @click="isActivityDate(item.Id)">{{
-          item.StatusName
-        }}</text>
+        <text v-for="item in activityTimeList" :key="item.Id" :class="item.IsChoose ? 'active' : ''" @click="isActivityDate(item.Id)">{{ item.StatusName }}</text>
       </view>
     </view>
 
@@ -51,29 +49,21 @@
                 <view class="content">
                   <view class="item-img" @click="goDetails(item)"> </view>
                   <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
-                    <view
-                      class="activity-li"
-                      :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }"
-                      v-for="val in item.List"
-                      :key="val.ActivityId"
-                      @click="goDetails(val, item.Resource)"
-                    >
-                      <image
-                        v-if="val.IsNew"
-                        class="item-image"
-                        lazy-load
-                        src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"
-                      ></image>
-                      <image
-                        style="width: 73rpx; right: -6rpx"
-                        v-if="val.IsExternalLabel"
-                        class="item-image"
-                        lazy-load
-                        src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"
-                      ></image>
+                    <view class="activity-li" :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }" v-for="val in item.List" :key="val.ActivityId" @click="goDetails(val, item.Resource)">
+                      <image v-if="val.IsResearchPoints" style="width: 83rpx; right: -6rpx;height:33rpx" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
+                      <block v-else>
+                        <image
+                          style="width: 73rpx; right: -6rpx"
+                          v-if="val.IsExternalLabel"
+                          class="item-image"
+                          lazy-load
+                          src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"
+                        ></image>
+                        <image v-if="!val.IsExternalLabel && val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"></image>
+                      </block>
                       <text class="text_oneLine"> {{ val.KeyWord }}</text>
                       <view class="item-trip" v-if="val.TripStatus == 2">确定行程</view>
-                      <view class="item-trip item-city" v-if="val.City.length == 2">{{ val.City }}</view>
+                      <view class="item-trip item-city" v-if="!val.IsResearchPoints && val.City.length == 2">{{ val.City }}</view>
                     </view>
                   </view>
                 </view>
@@ -87,29 +77,21 @@
                 <view class="content">
                   <view class="item-img" @click="goDetails(item)"> </view>
                   <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
-                    <view
-                      class="activity-li"
-                      :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }"
-                      v-for="val in item.List"
-                      :key="val.ActivityId"
-                      @click="goDetails(val, item.Resource)"
-                    >
-                      <image
-                        v-if="val.IsNew"
-                        class="item-image"
-                        lazy-load
-                        src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"
-                      ></image>
-                      <image
-                        style="width: 73rpx; right: -6rpx"
-                        v-if="val.IsExternalLabel"
-                        class="item-image"
-                        lazy-load
-                        src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"
-                      ></image>
+                    <view class="activity-li" :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }" v-for="val in item.List" :key="val.ActivityId" @click="goDetails(val, item.Resource)">
+                      <image v-if="val.IsResearchPoints" style="width: 83rpx; right: -6rpx;height:33rpx" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
+                      <block v-else>
+                        <image v-if="!val.IsExternalLabel && val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"></image>
+                        <image
+                          style="width: 73rpx; right: -6rpx"
+                          v-if="val.IsExternalLabel"
+                          class="item-image"
+                          lazy-load
+                          src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"
+                        ></image>
+                      </block>
                       <text class="text_oneLine"> {{ val.KeyWord }}</text>
                       <view class="item-trip" v-if="val.TripStatus == 2">确定行程</view>
-                      <view class="item-trip item-city" v-if="val.City.length == 2">{{ val.City }}</view>
+                      <view class="item-trip item-city" v-if="!val.IsResearchPoints && val.City.length == 2">{{ val.City }}</view>
                     </view>
                   </view>
                 </view>
@@ -331,10 +313,7 @@ export default {
         let key = item.ActivityTypeId || item.KeyWord;
         let id = typeof key == "string" ? item.ActivityId : "";
         let str = type ? "&permissionIds=" + this.chartPermissionIds + "&showJurisdiction=" + (this.isShowJurisdiction ? "show" : "") : "";
-        this.$store.dispatch(
-          "checkHandle",
-          "/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&id=" + id + "&whichDay=" + this.whichDay + str
-        );
+        this.$store.dispatch("checkHandle", "/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&id=" + id + "&whichDay=" + this.whichDay + str);
       } else {
         if (key) {
           uni.navigateTo({ url: "/activityPages/specialDetail/specialDetail?id=" + item.ActivityId });
@@ -374,13 +353,7 @@ export default {
   onShareAppMessage: function (res) {
     return {
       title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : this.messageTitle,
-      path:
-        "/pages/activity/activity?whichDay=" +
-        this.whichDay +
-        "&chartPermissionIds=" +
-        this.chartPermissionIds +
-        "&isGetJurisdiction=" +
-        this.isGetJurisdiction,
+      path: "/pages/activity/activity?whichDay=" + this.whichDay + "&chartPermissionIds=" + this.chartPermissionIds + "&isGetJurisdiction=" + this.isGetJurisdiction,
     };
   },
   /* 下拉刷新 */

pages/reportForm/reportForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="reportForm-container">
+  <view class="reportForm-container container">
     <view id="nav-bar-wrap-id" class="nav-bar-wrap">
       <search-bar @goSearch="goSearch" :searchTitle="searchPlaceholderList.SummarySearch" :width="50">
         <template slot="content-left">