小彬 hace 2 años
padre
commit
cf557b3b06

+ 23 - 13
activityPages/activityDetail/activityDetail.vue

@@ -383,7 +383,7 @@ export default {
     },
   },
   methods: {
-    //获取是否需要填写区号接口
+    // 获取是否需要填写区号接口
     countryCcode() {
       User.countryCcode().then((res) => {
         if (res.Ret == 200) {
@@ -391,6 +391,7 @@ export default {
         }
       });
     },
+    // 获取详情
     getActivityDetail() {
       activity
         .getActivityDetail({
@@ -418,13 +419,14 @@ export default {
           }
         });
     },
-    //拨打电话
+    // 拨打电话
     phonebtn(phone) {
       uni.makePhoneCall({
         phoneNumber: phone,
       });
     },
-    //  跳转新的小程序
+
+    // 跳转新的小程序
     networkBtn() {
       if (this.detailData.OnlineParticipation.includes("http")) {
         uni.navigateTo({
@@ -437,19 +439,25 @@ export default {
         });
       }
     },
+
+    // 弹框的回调事件
     cancelEnsure() {
       this.getActivityDetail();
     },
+
+    // 跳转
     goDetail(id) {
       uni.navigateTo({
         url: "/pageMy/reportDetail/reportDetail?id=" + id,
       });
     },
+    // 提问
     askingGo(type = "") {
       uni.navigateTo({
         url: "/activityPages/generationAsk/generationAsk?id=" + this.id + "&type=" + type,
       });
     },
+    // 添加会议提醒
     meetingReminderAdd() {
       activity
         .meetingReminderAdd({
@@ -471,7 +479,8 @@ export default {
           }
         });
     },
-    //取消会议提醒接口
+
+    // 取消会议提醒接口
     meetingReminderCancel() {
       if (this.detailData.IsCancelMeetingReminder == 1) {
         activity
@@ -497,6 +506,7 @@ export default {
         this.meetingReminderAdd();
       }
     },
+    // 我要报名
     wanttosignup() {
       if (this.detailData.IsLimitPeople == 1 && this.detailData.ActivityTypeName == "公司调研电话会") {
         this.selectShow = true;
@@ -504,6 +514,7 @@ export default {
         this.signupAdd(3);
       }
     },
+
     //点击了严选
     strictSelection() {
       activity.descriptionOfResearch().then((res) => {
@@ -518,6 +529,7 @@ export default {
         }
       });
     },
+    // 复制的操作
     copyLink() {
       uni.setClipboardData({
         data: this.detailData.LinkParticipants || this.detailData.OnlineParticipation,
@@ -530,7 +542,8 @@ export default {
         },
       });
     },
-    //跳转产业标签
+
+    // 跳转产业标签
     goDustrialHandler(item) {
       if (!item.IsJump) return;
       if (item.IsResearch) {
@@ -541,7 +554,7 @@ export default {
         this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId);
       }
     },
-    //音频点击暂停播放
+    // 音频点击暂停播放
     audioPlayBack() {
       if (this.$store.state.audioBg.activityId == this.detailData.ActivityId) {
         if (this.globalBgAudioManager.paused) {
@@ -553,16 +566,12 @@ export default {
         this.$store.commit("audioBg/addAudio", { list: this.detailData.VoiceList, activityId: this.detailData.ActivityId, activityTitle: this.detailData.ActivityName });
       }
     },
-    // //拖动进度条
-    // handleAudioSliderChangeing(e) {
-    //   this.curTime = e.detail.value;
-    //   this.globalBgAudioManager.seek(this.curTime);
-    // },
-    //拖动进度条
+
+    // 拖动进度条
     handleAudioSliderChangeing(e) {
       this.curTime = e.detail.value;
     },
-    //拖动进度条
+    // 拖动进度条
     handleAudioSliderChange(e) {
       const value = e.detail.value;
       this.globalBgAudioManager.seek(value);
@@ -572,6 +581,7 @@ export default {
         this.$store.commit("audioBg/setSlide", false);
       }, 300);
     },
+    // 手指离开拖动进度条
     touchstartHandler() {
       this.$store.commit("audioBg/setSlide", true);
     },

+ 7 - 7
activityPages/activityDetail/manageMixin.js

@@ -2,7 +2,7 @@ import { activity, User } from "@/config/api.js";
 let app = getApp();
 export default {
   methods: {
-    //报名
+    // 报名
     signupAdd(type = 1) {
       if (this.isNeedAddCountryCode) {
         this.isAreaCode = true;
@@ -46,7 +46,7 @@ export default {
       }
       this.selectShow = false;
     },
-    //取消报名
+    // 取消报名
     signupCancel(type) {
       if (this.detailData.IsSignup == 1) {
         this.isCancelShow = true;
@@ -60,7 +60,7 @@ export default {
         this.signupAdd();
       }
     },
-    //预约/取消
+    // 预约/取消
     async summaryIsHandel() {
       if (this.detailData.IsAppointment == 0) {
         const res = await activity.postAppointmentAdd({ ActivityId: Number(this.id) });
@@ -103,7 +103,7 @@ export default {
         });
       }
     },
-    //取消会议提醒接口
+    // 取消会议提醒接口
     meetingReminderCancel() {
       if (this.detailData.IsCancelMeetingReminder == 1) {
         activity
@@ -129,7 +129,7 @@ export default {
         this.meetingReminderAdd();
       }
     },
-    //添加会议提醒
+    // 添加会议提醒
     meetingReminderAdd() {
       activity
         .meetingReminderAdd({
@@ -151,7 +151,7 @@ export default {
           }
         });
     },
-    //我要报名
+    // 我要报名
     wanttosignup() {
       if (this.detailData.IsLimitPeople == 1 && this.detailData.ActivityTypeName == "公司调研电话会") {
         this.selectShow = true;
@@ -159,7 +159,7 @@ export default {
         this.signupAdd(3);
       }
     },
-    //提问
+    // 提问
     askingGo(type = "") {
       uni.navigateTo({
         url: "/activityPages/generationAsk/generationAsk?id=" + this.id + "&type=" + type,

+ 10 - 10
activityPages/components/specialMixins.js

@@ -3,17 +3,17 @@ export default {
   data() {
     return {
       specialIsHintShow: false, // 按钮的显示
-      specialGoFollowShow: false, //弹框的隐藏显示
+      specialGoFollowShow: false, // 弹框的隐藏显示
       specialAccounts: `您已开启【专项调研】新活动通知<br/><br/>请关注【查研观向小助手】公众号,及时获取微信消息提醒`,
-      specialIsFollow: false, //是否关注
-      specialPopupMsg: "",
-      show_cancel_button: false,
-      show_confirm_button: false,
+      specialIsFollow: false, // 是否关注
+      specialPopupMsg: "", // 消息的文案
+      show_cancel_button: false, // 取消按钮的隐藏显示
+      show_confirm_button: false, // 确定按钮的隐藏显示
     };
   },
   computed: {},
   methods: {
-    //点击小icon
+    // 点击小icon
     reminderTextHandler(item) {
       this.specialPopupMsg = "";
       this.specialIsHintShow = true;
@@ -22,11 +22,11 @@ export default {
       this.show_confirm_button = false;
       this.specialAccounts = item.Explain;
     },
-    //报名或者取消报名
+    // 报名或者取消报名
     async applyOfcancel(item, type = "") {
       this.show_cancel_button = false;
       this.show_confirm_button = true;
-      if ((type != "back" && item.IsTrip == 1) || (type == "back" && item.IsSignup == 1)) {
+      if ((type != "back" && item.IsTrip == 1) || (type == "back" && item.IsSignup == 1)) {  // 取消报名
         const str = item.ActivityTime.replace(/-/g, "/");
         const date = new Date(str);
         const times = date.getTime();
@@ -46,13 +46,13 @@ export default {
                   title: "已取消",
                   duration: 2000,
                 });
-
+                item.TripNum > 0 && (item.TripNum -= 1);
                 type == "back" ? (item.IsSignup = 0) : (item.IsTrip = 0);
               }
             }
           },
         });
-      } else {
+      } else { // 报名
         const res = await activity.activityApecialAdd({ ActivityId: item.ActivityId });
         if (res.Ret == 200) {
           this.specialIsHintShow = false;

+ 16 - 8
activityPages/editOutbound/editOutbound.vue

@@ -56,13 +56,13 @@
         <rich-text :nodes="content"></rich-text>
       </view>
     </u-modal>
-   <freeCharge class="free-charge" :isShowFreeBtn="isShowFree"/>
+    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
   </view>
 </template>
 
 <script>
 import { activity } from "@/config/api.js";
-import freeCharge  from '@/components/freeCharge'
+import freeCharge from "@/components/freeCharge";
 export default {
   data() {
     return {
@@ -82,17 +82,21 @@ export default {
     };
   },
   components: {
-    freeCharge
+    freeCharge,
   },
   methods: {
+    // 显示地区的选项
     areaCode() {
       this.areacodeShow = true;
     },
+
+    // 选择了地区
     areacode(code) {
       this.telephone = code;
       this.areacodeShow = false;
     },
-    //提交
+
+    // 提交
     submit() {
       activity
         .addOutboundMobile({
@@ -131,7 +135,8 @@ export default {
           }
         });
     },
-    //取消修改
+
+    // 取消修改
     cancelModification() {
       if (this.identification == "修改") {
         if (this.goOnNextStep == "true") {
@@ -153,17 +158,20 @@ export default {
         uni.navigateBack();
       }
     },
-    //去关注公众号
+
+    // 去关注公众号
     goFollowShowBtn() {
       uni.redirectTo({
         url: "/activityPages/accountsOfficial/accountsOfficial",
       });
     },
-    //弹框的取消
+
+    // 弹框的取消
     cancelDialog() {
       uni.navigateBack();
     },
-    //右上角的返回
+
+    // 右上角的返回
     backArrowleft() {
       if (this.identification == "修改") {
         if (this.goOnNextStep == "true") {

+ 1 - 0
activityPages/generationAsk/generationAsk.vue

@@ -29,6 +29,7 @@ export default {
     },
   },
   methods: {
+    // 提交
     submitHandle() {
       if (this.type == "文章") {
         Report.articleAskAdd({

+ 11 - 5
activityPages/playBack/playBack.vue

@@ -115,7 +115,7 @@ export default {
   mixins: [mediaMixins],
   components: { audioModule, modalDialog, videoModule },
   methods: {
-    //获取活动
+    // 获取活动
     async getActivityList() {
       const res = await activity.getActivityListNew({
         PageSize: this.pageSize,
@@ -139,6 +139,7 @@ export default {
         }
       }
     },
+    // 获取权限 、行业的接口
     async getUserSearchContent() {
       const res = await activity.getUserSearchContent({
         IsShowJurisdiction: this.isGetJurisdiction,
@@ -149,7 +150,8 @@ export default {
         this.clickPermission();
       }
     },
-    //是否有权限的点击事件
+
+    // 是否有权限的点击事件
     async permissioActivity() {
       if (!this.$store.state.isAuth && !this.$store.state.isBind) {
         this.selectComponent("#industry").toggle(false);
@@ -169,7 +171,8 @@ export default {
         });
       }
     },
-    //点击后有权限的
+
+    // 点击后有权限的
     clickPermission() {
       if (this.isShowJurisdiction) {
         const arr = [];
@@ -182,11 +185,12 @@ export default {
         this.chartPermissionIds = arr.join(",");
       }
     },
-    //去往详情页面
+
+    // 去往详情页面
     goDetail(item) {
       this.$store.dispatch("checkHandle", "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId);
     },
-    //下拉选择的确定事件
+    // 下拉选择的确定事件
     replacementConfirm() {
       const arr = [];
       const str = [];
@@ -206,6 +210,7 @@ export default {
       this.getActivityList();
       this.selectComponent("#industry").toggle(false);
     },
+
     // 下拉的选择的重置事件
     replacementBtn() {
       this.chartPermissionIds = "";
@@ -214,6 +219,7 @@ export default {
       this.chartPermissionName = "所有行业";
       this.getActivityList();
     },
+    
     // 选择的选中事件
     overallClick(item) {
       if (this.isShowJurisdiction) return;

+ 11 - 14
activityPages/specialDetail/specialDetail.vue

@@ -61,7 +61,7 @@
       </view>
       <view class="interest-btn">
         <block v-if="detailData.TripStatus == 2">
-          <text class="button" @click="applyOfcancel(detailData)">{{ detailData.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
+          <text class="button" @click="applyOfcancel(detailData)">{{ detailData.IsTrip == 0 ? `我要报名(${detailData.TripNum}/${detailData.LimitPeopleNum})` : "取消报名" }}</text>
         </block>
         <block v-else>
           <text class="button" v-if="detailData.IsSignup !== 1" @click="interest">感兴趣</text>
@@ -121,18 +121,9 @@ export default {
     freeCharge,
   },
   mixins: [specialMixins],
-  watch: {
-    haveAuth: {
-      handler() {
-        //上传页面统计
-        // if (this.haveAuth == 1) {
-        //   this.$store.dispatch("statistics", { PageType: "ActivitParticulars", DetailId: this.id });
-        // }
-      },
-      immediate: true,
-    },
-  },
+
   methods: {
+    // 获取详情
     async getActivityDetail() {
       const res = await activity.getSpecialDetailList({ ActivityId: this.id });
       if (res.Ret == 200) {
@@ -147,6 +138,7 @@ export default {
         }
       }
     },
+
     //感兴趣
     async interest() {
       const res = await activity.postSpecialSignupAdd({
@@ -163,7 +155,8 @@ export default {
         });
       }
     },
-    //已预报名、就是不感兴趣
+
+    // 已预报名、就是不感兴趣
     beNotInterested() {
       uni.showModal({
         content: "您要取消此次专研调研的预报名吗?",
@@ -182,6 +175,8 @@ export default {
         },
       });
     },
+
+    // 控制列表页面的状态
     currentPages() {
       let pages = getCurrentPages();
       let prevPage = pages[pages.length - 2];
@@ -191,12 +186,14 @@ export default {
         prevPage.$vm.collectList[index].IsSignup = this.detailData.IsSignup;
       }
     },
-    //查看行程的事件
+
+    // 查看行程的事件
     lookImg() {
       uni.previewImage({
         urls: [this.detailData.TripImgLink], //查看图片的数组
       });
     },
+
     //新调研通知
     async specialFollow() {
       if (this.specialIsFollow) {

+ 11 - 6
activityPages/specialResearchPage/specialResearchPage.vue

@@ -101,7 +101,7 @@ export default {
     freeCharge,
   },
   methods: {
-    //获取事件
+    // 获取事件
     async getActivityList() {
       const res = await activity.getSpecialList({
         PageSize: this.pageSize,
@@ -121,17 +121,20 @@ export default {
         }
       }
     },
-    //查看行程的事件
+
+    // 查看行程的事件
     lookImg(item) {
       uni.previewImage({
         urls: [item.TripImgLink], //查看图片的数组
       });
     },
-    //去往详情页面
+
+    // 去往详情页面
     goDetail(item) {
       this.$store.dispatch("checkHandle", "/activityPages/specialDetail/specialDetail?id=" + item.ActivityId);
     },
-    //感兴趣
+
+    // 点击感兴趣
     async interest(item) {
       const res = await activity.postSpecialSignupAdd({
         ActivityId: item.ActivityId,
@@ -146,7 +149,8 @@ export default {
         });
       }
     },
-    //已预报名、就是不感兴趣
+
+    // 已预报名、就是不感兴趣
     beNotInterested(item) {
       uni.showModal({
         content: "您要取消此次专研调研的预报名吗?",
@@ -164,7 +168,8 @@ export default {
         },
       });
     },
-    //新调研通知
+    
+    // 新调研通知
     async specialFollow() {
       this.show_confirm_button = true;
       if (this.specialIsFollow) {

+ 5 - 1
activityPages/themeActivity/themeActivity.vue

@@ -125,6 +125,7 @@ export default {
     freeCharge,
   },
   methods: {
+    // 获取列表数据
     async getActivityList() {
       const res = await activity.getActivityListNew({
         PageSize: this.pageSize,
@@ -156,7 +157,8 @@ export default {
         }
       }
     },
-    //获取是否需要填写区号接口
+
+    // 获取是否需要填写区号接口
     countryCcode() {
       User.countryCcode().then((res) => {
         if (res.Ret == 200) {
@@ -164,6 +166,8 @@ export default {
         }
       });
     },
+
+    // 点击了top的标签
     jumpHandler() {
       if (this.contentDetail.IsJump) {
         if (this.contentDetail.IsResearch) {

+ 20 - 13
components/audioModule/index.vue

@@ -110,7 +110,7 @@ export default {
     },
   },
   watch: {
-    audioInit: {
+    audioInit: { // 切换了音频播放 重置下数据
       handler(nval) {
         this.init();
       },
@@ -120,7 +120,7 @@ export default {
 
   created() {},
   mounted() {
-    uni.getSystemInfo({
+    uni.getSystemInfo({ //判断机型
       success: (res) => {
         this.isosName = res.osName;
       },
@@ -154,6 +154,7 @@ export default {
     },
     //音频播放事件
     listenAudio() {
+      // 音频播放
       this.globalBgAudioManager.onPlay(async () => {
         if (this.isRecord) {
           console.log("音频播放");
@@ -167,7 +168,7 @@ export default {
         this.$store.commit("audioBg/updateAudioPause", false);
         this.isRecord = true;
       });
-
+      // 音频暂停
       this.globalBgAudioManager.onPause(() => {
         console.log("音频暂停");
         this.backAudioPlay();
@@ -175,7 +176,7 @@ export default {
         this.play = false;
         this.$store.commit("audioBg/updateAudioPause", true);
       });
-
+      // 音频停止
       this.globalBgAudioManager.onStop(() => {
         console.log("音频停止");
         this.backAudioPlay();
@@ -189,7 +190,7 @@ export default {
           this.$store.commit("audioBg/updateAudioPause", true);
         }
       });
-
+      // 音频onEnded
       this.globalBgAudioManager.onEnded(() => {
         console.log("音频onEnded");
         this.backAudioPlay();
@@ -199,7 +200,7 @@ export default {
         this.$store.commit("audioBg/parseIntAudio", false);
         this.$store.commit("audioBg/removeAudio");
       });
-
+      // 音频onError
       this.globalBgAudioManager.onError((e) => {
         console.log("音频onError", e);
         this.$store.commit("audioBg/removeAudio");
@@ -210,7 +211,7 @@ export default {
         });
       });
 
-      //音频的播放时间更新
+      // 音频的播放时间更新
       this.globalBgAudioManager.onTimeUpdate(() => {
         if (this.globalBgAudioManager.src && parseInt(this.globalBgAudioManager.currentTime) !== 0 && !this.isSlide) {
           this.curTime = parseInt(this.globalBgAudioManager.currentTime);
@@ -218,11 +219,13 @@ export default {
         }
       });
     },
-    //拖动进度条
+
+    // 拖动进度条
     handleAudioSliderChangeing(e) {
       this.curTime = e.detail.value;
     },
-    //拖动进度条
+
+    // 拖动进度条
     handleAudioSliderChange(e) {
       const value = e.detail.value;
       this.globalBgAudioManager.seek(value);
@@ -231,7 +234,8 @@ export default {
         this.$store.commit("audioBg/setSlide", false);
       }, 300);
     },
-    //音频点击暂停播放
+
+    // 音频点击暂停播放
     handleChangePlayStatus() {
       if (!this.globalBgAudioManager.paused) {
         this.globalBgAudioManager.pause();
@@ -239,7 +243,8 @@ export default {
         this.globalBgAudioManager.play();
       }
     },
-    //倍速播放
+
+    // 倍速播放
     isTimesHandler(i) {
       let index = i == 3 ? 0 : i + 1;
       this.$store.commit("audioBg/setMultiple", this.timesTheSpeed[index].value);
@@ -250,6 +255,7 @@ export default {
       }
       this.isRecord = false;
     },
+
     //快进 快退
     speedReverseHandler(type) {
       let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
@@ -257,7 +263,8 @@ export default {
       this.globalBgAudioManager.seek(isTime);
       this.isRecord = false;
     },
-    //播放了记录
+
+    // 播放了记录
     backAudioPlay() {
       if ((this.$store.state.audioBg.activityId || this.$store.state.audioBg.indexId) && this.palyTime >= 0) {
         activity.backAudioPlay({
@@ -266,7 +273,7 @@ export default {
         });
       }
     },
-
+    // 手指离开了拖动进度条 
     touchstartHandler() {
       this.$store.commit("audioBg/setSlide", true);
     },

+ 1 - 0
pageMy/applyInterview/applyInterview.vue

@@ -82,6 +82,7 @@ export default {
         }
       });
     },
+    // 跳转文章详情
     goDetail(id) {
       uni.navigateTo({
         url: "/pageMy/reportDetail/reportDetail?id=" + id,

+ 3 - 0
pageMy/applyResult/applyResult.vue

@@ -18,11 +18,14 @@ export default {
     };
   },
   methods: {
+    // 拨打电话
     callNum() {
       uni.makePhoneCall({
         phoneNumber: this.phone,
       });
     },
+    
+    //  返回
     goIndex() {
       uni.navigateBack({
         delta: 2,

+ 1 - 1
pageMy/applyTrial/applyTrial.vue

@@ -97,7 +97,7 @@ export default {
         this.$util.toast(`请${!this.fileList.length ? "上传名片" : !this.name ? "输入姓名" : !this.company ? "输入公司名" : ""}`);
       }
     },
-    //预览图片
+    // 预览图片
     viewImage(path, imgList) {
       uni.previewImage({
         current: path, // 当前显示图片的http链接

+ 4 - 2
pageMy/authGuide/authGuide.vue

@@ -85,7 +85,8 @@ export default {
         }
       });
     },
-    //微信授权登录
+
+    // 微信授权登录
     getUserInfo(e) {
       if (e.detail.userInfo) {
         let userInfo = e.detail.userInfo;
@@ -95,7 +96,8 @@ export default {
         this.cancelBind();
       }
     },
-    //获取用户的当前设置
+    
+    // 获取用户的当前设置
     getSetting() {
       return new Promise(function (resolve, reject) {
         uni.getSetting({

+ 9 - 6
pageMy/browseHistory/browseHistory.vue

@@ -44,18 +44,18 @@ import freeCharge from "@/components/freeCharge";
 export default {
   data() {
     return {
-      refresh: false, //正在下拉
       status: "loadmore",
+      totalPage: "",
       page_no: 1,
       pageSize: 10,
-      historyList: [],
       haveData: null,
+      refresh: false, //正在下拉
+      historyList: [],
       loadText: {
         loadmore: "上拉加载更多",
         loading: "加载中",
         nomore: "已经到底了",
       },
-      totalPage: "",
     };
   },
   onLoad() {
@@ -87,11 +87,13 @@ export default {
         }
       });
     },
-    //去往文章详情页面
+
+    // 去往文章详情页面
     goDetailReport(item) {
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
-    //去往主题详情
+
+    // 去往主题详情
     themeDetails(item, val) {
       if (item.Source === 1) {
         //非严选
@@ -101,7 +103,8 @@ export default {
         this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId);
       }
     },
-    //收藏
+
+    // 收藏
     async collectClick(item) {
       const res = await Report.collectRpt({ ArticleId: item.ArticleId });
       if (res.Ret === 200) {

+ 9 - 15
pageMy/chartPage/chartPage.vue

@@ -24,16 +24,17 @@ export default {
   data() {
     return {
       id: "",
-      chartData: {},
       httpUrl: "",
       isCollection: false,
+      chartData: {},
     };
   },
   components: {
     freeCharge,
   },
   computed: {
-     strategyUrl() {
+    strategyUrl() {
+      // web-view 的URL
       return reportStrategyUrl;
     },
   },
@@ -63,25 +64,18 @@ export default {
       }
     },
   },
+
+  onLoad(option) {
+    this.id = option.id || "";
+  },
+
   async onShow() {
     await this.$store.dispatch("checkHandle");
     if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-      //已授权已绑定
+      //已授权已绑定 才获取详情
       this.id && this.myChartDetail();
     }
   },
-  onLoad(option) {
-    // /* 兼容iphonex底部 */
-    uni.getSystemInfo({
-      success: (res) => {
-        let ua = res.model;
-        if (ua.search("iPhone X") != -1 || ua.search("iPhone 11") != -1 || ua.search("iPhone 11 Pro Max") != -1) {
-          this.isIphoneX = true;
-        }
-      },
-    });
-    this.id = option.id || "";
-  },
   /**
    * 用户点击分享
    */

+ 1 - 0
pageMy/downloadFile/downloadFile.vue

@@ -1,4 +1,5 @@
 <template>
+<!-- 下载页面 -->
   <view class="progress-box">
     <progress :percent="progress" show-info stroke-width="3" />
   </view>

+ 2 - 0
pageMy/freeTrial/freeTrial.vue

@@ -1,4 +1,5 @@
 <template>
+ <!-- 这个页面应该是不用了 免费送月卡页面 这里应该就不重要了 -->
   <view class="container container-free">
     <view class="nav-bar-wrap" :style="{ height: navBarStyle.height, paddingTop: navBarStyle.paddingTop, paddingBottom: navBarStyle.paddingBottom }">
       <view class="content">
@@ -27,6 +28,7 @@ export default {
     };
   },
   methods: {
+    /**这个页面应该是不用了 免费送月卡页面 这里应该就不重要了 就不备注了 */
     initNavBar() {
       let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
       this.navBarStyle = {

+ 13 - 3
pageMy/login/login.vue

@@ -61,8 +61,6 @@ export default {
   data() {
     return {
       bind_type: 1, //绑定方式
-      checked: false,
-      isArgee: false,
       seconds: 60,
       tips: "获取验证码",
       email: "", //邮箱
@@ -72,8 +70,9 @@ export default {
       phone_code: "",
       showCountryCode: "+86",
       countryCode: "86", //区号
-      isAreaCode: false,
       scene: "", //分享人的分享码
+      isAreaCode: false, //选择区号
+      checked: false, //勾选了同意
     };
   },
   methods: {
@@ -87,6 +86,7 @@ export default {
       this.phone_code = "";
       this.checked = false;
     },
+
     /* 授权获取手机号 */
     getPhoneNumber(e) {
       if (e.detail.errMsg == "getPhoneNumber:ok") {
@@ -104,9 +104,11 @@ export default {
         });
       }
     },
+    // 选了区号
     codeChange(text) {
       this.tips = text;
     },
+
     /* 获取邮箱验证码 */
     getCode() {
       if (this.$refs.uCode.canGetCode) {
@@ -134,6 +136,7 @@ export default {
         }
       }
     },
+
     /* 绑定 */
     bindHandle() {
       let params;
@@ -159,11 +162,13 @@ export default {
         }
       }
     },
+    // 查看用户协议
     lookArgeement() {
       uni.navigateTo({
         url: "/pageMy/agreement/agreement",
       });
     },
+
     /* 绑定手机号 */
     bindPhoneHandle() {
       if (this.phoneIpt && this.phone_code && this.checked) {
@@ -179,6 +184,7 @@ export default {
         this.$util.toast(!this.checked ? "请先勾选用户服务协议" : !this.phoneIpt ? "请输入手机号" : "请输入验证码");
       }
     },
+
     //绑定登陆
     bindLogin(params) {
       User.Bind(params).then((res) => {
@@ -209,11 +215,15 @@ export default {
         }
       });
     },
+    
+    // 选择了地区的区号
     areacode(num) {
       this.showCountryCode = "+" + num;
       this.countryCode = num;
       this.isAreaCode = false;
     },
+
+    // 选择区号的取消
     cancel() {
       this.isAreaCode = false;
     },

+ 9 - 6
pageMy/myCollection/myCollection.vue

@@ -44,18 +44,18 @@ import freeCharge from "@/components/freeCharge";
 export default {
   data() {
     return {
-      refresh: false, //正在下拉
       page_no: 1,
       pageSize: 10,
       collectList: [],
-      haveData: true,
       status: "loadmore",
+      totalPage: "",
       loadText: {
         loadmore: "上拉加载更多",
         loading: "加载中",
         nomore: "已经到底了",
       },
-      totalPage: "",
+      haveData: true, //是否有数据
+      refresh: false, //正在下拉
     };
   },
   onLoad() {
@@ -87,11 +87,13 @@ export default {
         }
       });
     },
-    //去往文章详情页面
+
+    // 去往文章详情页面
     goDetailReport(item) {
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
-    //去往主题详情
+
+    // 去往主题详情
     themeDetails(item, val) {
       if (item.Source === 1) {
         //非严选
@@ -101,7 +103,8 @@ export default {
         this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId);
       }
     },
-    //收藏
+    
+    // 收藏
     async collectClick(item) {
       const res = await Report.collectRpt({ ArticleId: item.ArticleId });
       if (res.Ret === 200) {

+ 8 - 6
pageMy/mySchedulepage/mySchedulepage.vue

@@ -157,17 +157,17 @@ export default {
   },
   data() {
     return {
-      collectTypeList: [],
-      haveData: true,
+      isGetJurisdiction: 0,
       whichDay: "",
-      listChartPermission: [],
-      listChartPermissionInit: [],
       chartPermissionIds: "",
+      activityTypeId: "",
+      haveData: true,
       isShowJurisdiction: false, //
-      isGetJurisdiction: 0,
       isrefresh: true,
-      activityTypeId: "",
       selectShow: false,
+      listChartPermission: [],
+      listChartPermissionInit: [],
+      collectTypeList: [],
     };
   },
   methods: {
@@ -190,12 +190,14 @@ export default {
         }
       }
     },
+
     //查看行程的事件
     lookImg(item) {
       uni.previewImage({
         urls: [item.TripImgLink], //查看图片的数组
       });
     },
+    
     //报名或者取消报名
     async applyOfcancel(item, index) {
       const str = item.ActivityTime.replace(/-/g, "/");

+ 16 - 6
pageMy/reportDetail/reportDetail.vue

@@ -41,19 +41,19 @@ let app = getApp({ allowDefault: true });
 export default {
   data() {
     return {
-      haveAuth: false,
       access_token: "", //用户标识
-      isIphoneX: false, //判断机型
       reportInfo: "",
-      showNav: false,
       id: "",
-      isShowTip: false,
       sale_name: "", //可联系销售名称
       sale_number: "", //可联系销售电话
       industry: "", //行业
       readTiem: 0,
       setIntervalTiem: null,
       isShowAlert: false,
+      haveAuth: false,
+      isShowTip: false,
+      showNav: false,
+      isIphoneX: false, //判断机型
     };
   },
   computed: {
@@ -90,6 +90,7 @@ export default {
         }
       });
     },
+
     /* 无权限申请开通权限 */
     applyAuth() {
       /* 区分是否是潜在用户 */
@@ -117,7 +118,8 @@ export default {
             success: function (res) {},
           });
     },
-    //销售的立即申请
+
+    // 销售的立即申请
     sellerApplyAuth() {
       User.applyTry({
         TryType: "Article",
@@ -136,6 +138,7 @@ export default {
         }
       });
     },
+
     // 返回首頁
     backIndex() {
       uni.navigateBack({
@@ -146,11 +149,14 @@ export default {
         },
       });
     },
+
+    // 拨打电话
     callPhone(num) {
       uni.makePhoneCall({
         phoneNumber: num,
       });
     },
+
     /* 申请访谈 */
     applyHandle() {
       // 申请访谈
@@ -180,6 +186,7 @@ export default {
         );
       }
     },
+
     /* 访谈接口 */
     interviewApi() {
       Report.applyRpt({
@@ -188,6 +195,7 @@ export default {
         this.reportInfo.IsInterviewApply = !this.reportInfo.IsInterviewApply;
       });
     },
+
     /* 收藏 */
     collectHandle() {
       Report.collectRpt({
@@ -197,6 +205,7 @@ export default {
         this.$util.toast(res.Msg);
       });
     },
+
     /* 错误 */
     errorDetails() {
       uni.showModal({
@@ -215,7 +224,8 @@ export default {
         },
       });
     },
-    //获取权限弹窗是否展示免费月卡接口
+
+    // 获取权限弹窗是否展示免费月卡接口
     async userIsShowAlert() {
       const res = await FreeButton.userIsShowAlert();
       if (res.Ret === 200) {

+ 4 - 21
pageMy/reportPage/reportPage.vue

@@ -2,12 +2,6 @@
   <view class="container reportDetail-container">
     <block v-if="haveAuth === 1">
       <web-view :src="strategyUrl + '?url=' + linkurl" v-if="linkurl">
-        <!-- <cover-view bindtap="searchViewTap" class="search-view">
-          <cover-view class="search-view-box" @click="btnSearch">
-            <cover-image class="search-icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/search.png"></cover-image>
-            <cover-view class="search-text">搜索您想要的纪要</cover-view>
-          </cover-view>
-        </cover-view> -->
         <cover-view class="footer-con">
           <cover-view class="handle-item" @click="applyHandle">
             <cover-image
@@ -72,23 +66,21 @@ let app = getApp({ allowDefault: true });
 export default {
   data() {
     return {
-      haveAuth: false,
-      // haveFree:false,//是否付费
+      readTiem: 0,
       access_token: "", //用户标识
-      isIphoneX: false, //判断机型
       reportInfo: "",
-      showNav: false,
       id: "",
       linkurl: "",
-      isShowTip: false,
       sale_name: "", //可联系销售名称
       sale_number: "", //可联系销售电话
       industry: "", //行业
-      readTiem: 0,
       setIntervalTiem: null,
       fileLink: false,
       isCollection: false,
       isInterviewApply: false,
+      isShowTip: false,
+      showNav: false,
+      haveAuth: false,
     };
   },
   components: {
@@ -294,15 +286,6 @@ export default {
     }
   },
   onLoad(option) {
-    // /* 兼容iphonex底部 */
-    uni.getSystemInfo({
-      success: (res) => {
-        let ua = res.model;
-        if (ua.search("iPhone X") != -1 || ua.search("iPhone 11") != -1 || ua.search("iPhone 11 Pro Max") != -1) {
-          this.isIphoneX = true;
-        }
-      },
-    });
     this.id = option.id ? option.id : "";
     if (!this.id && !+this.id > 0) {
       this.errorDetails();

+ 2 - 0
pageMy/transitionPages/transitionPages.vue

@@ -13,11 +13,13 @@ export default {
     return {};
   },
   methods: {
+    // 跳转上传信息的页面
     applyAuth() {
       uni.navigateTo({
         url: "/pageMy/applyTrial/applyTrial",
       });
     },
+    // 返回
     backIndex() {
       uni.switchTab({
         url: "/pages/index/index",

+ 28 - 15
pages/activity/activity.vue

@@ -95,25 +95,25 @@ export default {
   },
   data() {
     return {
-      collectTypeList: [],
+      whichDay: "",
+      activityTypeId: "",
+      chartPermissionIds: "",
       chartPermissionName: "所有行业",
+      isGetJurisdiction: 0,
+      isrefresh: true,
+      isShowJurisdiction: false, //
       haveData: true,
+      listChartPermission: [],
+      listChartPermissionInit: [],
+      collectTypeList: [],
       activityTimeList: [
         { Id: 1, IsChoose: false, StatusName: "今日活动" },
         { Id: 2, IsChoose: false, StatusName: "明日活动" },
       ],
-      whichDay: "",
-      listChartPermission: [],
-      listChartPermissionInit: [],
-      chartPermissionIds: "",
-      isShowJurisdiction: false, //
-      isGetJurisdiction: 0,
-      isrefresh: true,
-      activityTypeId: "",
     };
   },
   computed: {
-    messageTitle() {
+    messageTitle() {  // 计算分享时候的title
       let arr = this.whichDay ? this.whichDay.split(",") : [];
       let whichData = arr.length == 2 ? "今日活动,明日活动" : arr == "1" ? "今日活动" : arr == "2" ? "明日活动" : "";
       let title = whichData ? whichData + "," + this.chartPermissionName : this.chartPermissionName !== "所有行业" ? this.chartPermissionName : "";
@@ -121,6 +121,7 @@ export default {
     },
   },
   methods: {
+
     //获取胶囊位置
     initNavBar() {
       let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
@@ -130,6 +131,8 @@ export default {
         paddingBottom: "4px",
       };
     },
+
+    // 获取权限、所有的行业
     async getUserSearchContent() {
       const res = await activity.getUserSearchContent({
         IsShowJurisdiction: this.isGetJurisdiction,
@@ -144,7 +147,8 @@ export default {
         }
       }
     },
-    //获取列表数据
+
+    // 获取列表数据
     async getActivityLabelTypeList() {
       const res = await activity.getActivityLabelTypeList({
         ChartPermissionIds: this.chartPermissionIds,
@@ -162,6 +166,7 @@ export default {
         }
       }
     },
+
     // 下拉的选择的关闭事件
     closeTheWindow() {
       const types = this.chartPermissionIds ? this.chartPermissionIds.split(",").map(Number) : [];
@@ -178,6 +183,7 @@ export default {
         this.chartPermissionName = str.length == 6 ? "所有行业" : str.join(",");
       }
     },
+
     // 下拉的选择的选中事件
     overallClick(item) {
       if (this.isShowJurisdiction) return;
@@ -187,6 +193,7 @@ export default {
         }
       });
     },
+
     // 下拉的选择的重置事件
     replacementBtn() {
       this.listChartPermission = this.listChartPermissionInit;
@@ -196,7 +203,8 @@ export default {
       this.chartPermissionName = "所有行业";
       this.getActivityLabelTypeList();
     },
-    //下拉选择的确定事件
+
+    // 下拉选择的确定事件
     replacementConfirm() {
       const arr = [];
       const str = [];
@@ -216,7 +224,8 @@ export default {
       this.getActivityLabelTypeList();
       this.selectComponent("#industry").toggle(false);
     },
-    //今日明日的点击事件
+
+    // 今日明日的点击事件
     isActivityDate(id) {
       this.selectComponent("#industry").toggle(false);
       this.activityTimeList.forEach((item) => {
@@ -227,7 +236,8 @@ export default {
       this.whichDay = arr.join(",");
       this.getActivityLabelTypeList();
     },
-    //是否有权限的点击事件
+
+    // 是否有权限的点击事件
     async permissioActivity() {
       if (!this.$store.state.isAuth && !this.$store.state.isBind) {
         this.selectComponent("#industry").toggle(false);
@@ -247,7 +257,8 @@ export default {
         });
       }
     },
-    //点击后有权限的
+
+    // 点击后有权限的
     clickPermission() {
       if (this.isShowJurisdiction) {
         const arr = [];
@@ -260,6 +271,7 @@ export default {
         this.chartPermissionIds = arr.join(",");
       }
     },
+    // 进入页面 判断是否是分享的
     loadShare(option) {
       if (option && Object.keys(option).length !== 0) {
         this.whichDay = option.whichDay || "";
@@ -275,6 +287,7 @@ export default {
         });
       }
     },
+    // 去往详情
     goDetails(item, key) {
       if (item.Resource === 1 || key === 1) {
         let type = item.ActivityTypeName || "";

+ 3 - 0
pages/pcWebViev/pcWebViev.vue

@@ -26,6 +26,7 @@ export default {
     },
   },
   methods: {
+    // 获取token
     getToken() {
       uni.login({
         success: (result) => {
@@ -41,11 +42,13 @@ export default {
         },
       });
     },
+    // 获取web-view 的消息
     handleGetMessage(e) {
       const data = e.detail.data[e.detail.data.length - 1];
       this.urlShare = data.url;
       this.titleShare = data.title;
     },
+    // 进入页面 处理数据
     initLoad(optios) {
       let urlType = [
         "index",

+ 4 - 2
pages/purchaser/purchaser.vue

@@ -154,6 +154,7 @@ export default {
     };
   },
   mounted() {
+    // 处理数据 列表同步详情
     uni.$on("updateFllowTheme", (data) => {
       this.hotList.forEach((item) => {
         if (item.IndustrialManagementId == data.id) {
@@ -161,6 +162,7 @@ export default {
         }
       });
     });
+    // 处理数据 列表同步详情
     uni.$on("updateFllowAuthor", (data) => {
       this.kolList.forEach((item) => {
         if (item.DepartmentId == data.id) {
@@ -340,7 +342,7 @@ export default {
     width: 70%;
     height: 63rpx;
     font-size: 30rpx;
-    color: #8D8D8D;
+    color: #8d8d8d;
     background-color: #f6f6f6;
     padding-left: 33rpx;
     border-radius: 70rpx;
@@ -355,7 +357,7 @@ export default {
 .resear-container {
   background-color: #f7f7f7;
   .notice-content {
-    position:sticky;
+    position: sticky;
     left: 0;
     top: 200rpx;
     z-index: 99;