10.7 上线

activityPages/activityDetail/activityDetail.vue

@@ -14,8 +14,8 @@
           <!-- 内容部分 -->
           <view class="content">
             <view v-if="detailData.ActivityName" class="dialog-title brackets-title">
-              <image v-if="detailData.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
-              <image v-if="!detailData.IsResearchPoints && detailData.TemporaryLabel" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
+              <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">
@@ -184,7 +184,7 @@
               <view class="network-left">链接参会：</view>
               <view class="network-right network-zoom" style="color: #2c83ff">
                 <view>
-                  <view class="default text_zoom" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司调研电话会'">请报名获取 </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>
@@ -322,7 +322,7 @@
         </view>
       </van-popup>
       <!-- 各种弹框部分 -->
-      <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList"/>
+      <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
     </view>
     <not-have-login v-else />
   </block>
@@ -339,7 +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';
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
 let app = getApp({ allowDefault: true });
 export default {
   filters: {
@@ -389,7 +389,7 @@ export default {
       isDlgImg: false,
       showSingInImg: false,
       isResearchModalShow: false,
-      checkResearchList:{}
+      checkResearchList: {},
     };
   },
   mixins: [manageMixin],

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,
@@ -50,14 +58,13 @@ export default {
         if (this.detailData.IsResearchPoints) {
           this.researchPointsHandler(this.detailData.ActivityId, type, this.detailData);
         } else {
-          this.myIsApplyHandler(this.detailData.ActivityId, type, this.detailData);
+          this.myIsApplyHandler(this.detailData.ActivityId, type, valName);
         }
         timer = setTimeout(() => {
           this.flag = false;
         }, 500);
       }
     },
-
     // 预约/取消
     async summaryIsHandel() {
       if (this.detailData.IsAppointment == 0) {
@@ -146,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;
@@ -177,7 +185,7 @@ export default {
     },
 
     // 报名拆分出来
-    myIsApplyHandler(id, type) {
+    myIsApplyHandler(id, type, valName = "") {
       activity
         .signupAdd({
           ActivityId: this.detailData.ActivityId,

activityPages/components/selectMixins.js

@@ -79,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;
@@ -97,6 +98,7 @@ export default {
     },
     // 下拉选择的确定事件
     replacementConfirm() {
+      this.page_no = 1;
       const arr = [];
       const str = [];
       this.listChartPermission &&
@@ -118,6 +120,7 @@ export default {
 
     // 下拉的选择的重置事件
     replacementBtn() {
+      this.page_no = 1;
       this.listChartPermission = this.listChartPermissionInit;
       this.chartPermissionIds = "";
       this.isShowJurisdiction = false;

activityPages/themeActivity/themeActivity.vue

@@ -40,7 +40,7 @@
             <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">
+        <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">
@@ -87,8 +87,8 @@
               <view class="item">
                 <view class="item-text" @click="goDetail(item)">
                   <view class="activity-title text_twoLine">
-                    <image v-if="item.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
-                    <image v-if="!item.IsResearchPoints && item.TemporaryLabel" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
+                    <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>
@@ -203,7 +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';
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
 export default {
   mixins: [myActivityMixin, selectMixins, mediaMixins],
   data() {
@@ -252,6 +252,7 @@ export default {
         WhichDay: this.whichDay,
         ActivityId: this.activityId,
         TypeName: this.selectActiveId,
+        IsResearchPoints: this.ResearchExternalAct,
       });
       if (res.Ret === 200) {
         if (this.type) {

components/ItemComponent/activityItem.vue

@@ -11,8 +11,8 @@
     </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 v-if="list.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
-      <image v-if="!list.IsResearchPoints && list.IsResearchPoints" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"></image>
+      <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">
@@ -122,6 +122,7 @@ 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: "",
@@ -175,6 +176,7 @@ export default {
       itemData: {},
       isResearchModalShow: false,
       checkResearchList: {},
+      addItemData: {},
     };
   },
   computed: {},
@@ -199,7 +201,11 @@ export default {
       if (item.YidongActivityId) {
         this.goDetail(item);
         return;
-      } else if ((item.IsYidongConduct && item.IsCanOutboundCall) || (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))) {
+      } else if (
+        (!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
+        (item.IsYidongConduct && item.IsCanOutboundCall) ||
+        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))
+      ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;
       } else {
@@ -211,13 +217,20 @@ 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,
@@ -238,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({
@@ -262,10 +275,10 @@ export default {
         clearTimeout(timer);
         this.flag = true;
         this.selectShow = false;
-         if (itemData.IsResearchPoints) {
+        if (this.addItemData.IsResearchPoints) {
           this.researchPointsHandler(id, type, item);
         } else {
-          this.myIsApplyHandler(id, type);
+          this.myIsApplyHandler(id, type, valName);
         }
         timer = setTimeout(() => {
           this.flag = false;
@@ -542,7 +555,7 @@ export default {
       this.$parent.newDataList[index].Activity[value] = num;
     },
     // 我要报名的请求拆分出来了
-    async myIsApplyHandler(id, type) {
+    async myIsApplyHandler(id, type, valName = "") {
       const res = await activity.signupAdd({
         ActivityId: id,
         SignupType: type,
@@ -570,8 +583,8 @@ export default {
             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);
+            this.parentDataEmit(this.addItemData, "IsSignup", 1);
+            this.parentDataEmit(this.addItemData, "SignupType", type);
           }
         } else if (this.hasPermission == 2) {
           this.isShowhasPermission = true;
@@ -582,7 +595,7 @@ export default {
     },
     // 研选扣点的事件
     async researchPointsHandler(id, type, item) {
-     const res = await activity.activityCheck({
+      const res = await activity.activityCheck({
         ActivityId: id,
       });
       if (res.Ret === 200) {

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() {
@@ -41,6 +42,7 @@ export default {
       selectYdong: false,
       isResearchModalShow: false,
       checkResearchList: {},
+      itemData: null,
     };
   },
   methods: {
@@ -50,7 +52,11 @@ export default {
       if (item.YidongActivityId) {
         this.goDetail(item);
         return;
-      } else if ((item.IsYidongConduct && item.IsCanOutboundCall) || (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))) {
+      } else if (
+        (!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
+        (item.IsYidongConduct && item.IsCanOutboundCall) ||
+        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))
+      ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;
       } else {
@@ -62,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,
@@ -117,7 +130,7 @@ export default {
         clearTimeout(timer);
         this.flag = true;
         this.selectShow = false;
-        if (itemData.IsResearchPoints) {
+        if (this.itemData.IsResearchPoints) {
           this.researchPointsHandler(id, type, item);
         } else {
           this.myIsApplyHandler(id, type);
@@ -281,7 +294,7 @@ export default {
     },
 
     // 我要报名的请求拆分出来了
-    async myIsApplyHandler(id, type) {
+    async myIsApplyHandler(id, type, valName = "") {
       const res = await activity.signupAdd({
         ActivityId: id,
         SignupType: type,
@@ -309,8 +322,12 @@ export default {
             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);
+            this.collectList.forEach((valueAct) => {
+              if (valueAct.ActivityId === id) {
+                valueAct.IsSignup = 1;
+                valueAct.SignupType = type;
+              }
+            });
           }
         } else if (this.hasPermission == 2) {
           this.isShowhasPermission = true;

components/activity/showResearchDlg.vue

@@ -3,7 +3,7 @@
     <u-modal
       ref="modalResearch"
       async-close
-      v-model="isResearchModalShow"
+      v-model="isShow"
       :content-style="{ fontSize: '32rpx' }"
       @confirm="confirmModal"
       :show-cancel-button="!isShowView"
@@ -99,6 +99,12 @@ export default {
       let isNum = !list.CheckPermission || !list.CheckPoints ? true : false;
       return isNum;
     },
+    isShow: {
+      get() {
+        return this.isResearchModalShow;
+      },
+      set() {},
+    },
   },
   methods: {
     cancelModal() {
@@ -112,26 +118,28 @@ export default {
       });
     },
     async confirmModal() {
-      if (!this.checkResearchList.CheckPermission || !this.checkResearchList.CheckTime || !this.checkResearchList.CheckPoints || !this.checkResearchList.CheckEmail) {
+      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,
           });
-        const res = activity.activityEmailBinding({
+        this.cancelModal();
+        const res = await activity.activityEmailBinding({
           Email: this.inputVal,
         });
         if (res.Ret === 200) {
-          this.$emit("myIsApplyHandler", this.jurisdictionList, this.checkResearchList.childrenType);
+          this.$parent.myIsApplyHandler(this.jurisdictionList.ActivityId, this.checkResearchList.childrenType);
         }
-        this.cancelModal();
+        this.inputVal = "";
         return;
       } else if (this.checkResearchList.CheckPoints) {
-        this.$emit("myIsApplyHandler", this.jurisdictionList, this.checkResearchList.childrenType);
+        this.$parent.myIsApplyHandler(this.jurisdictionList.ActivityId, this.checkResearchList.childrenType);
         this.cancelModal();
         return;
       }

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

@@ -167,7 +167,7 @@ export default {
       listChartPermission: [],
       listChartPermissionInit: [],
       collectTypeList: [],
-      isResearchModalShow: true,
+      isResearchModalShow: false,
       checkResearchList: {},
     };
   },

pages/activity/activity.vue

@@ -50,7 +50,7 @@
                   <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.IsResearchPoints" style="width: 83rpx; right: -6rpx" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
+                      <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"
@@ -59,11 +59,11 @@
                           lazy-load
                           src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/activity_external.png"
                         ></image>
-                        <image v-if="val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.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>
@@ -78,9 +78,9 @@
                   <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.IsResearchPoints" style="width: 83rpx; right: -6rpx" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Research_Points.png"></image>
+                      <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.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.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>
                         <image
                           style="width: 73rpx; right: -6rpx"
                           v-if="val.IsExternalLabel"
@@ -91,7 +91,7 @@
                       </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>

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">