6.6

activityPages/activityDetail/activityDetail.vue

@@ -111,8 +111,8 @@
         </view>
         <view class="network" v-if="detailData.ArticleList.length">
           <view class="network-left">相关报告：</view>
-          <view class="network-right"  style="color: #2c83ff">
-            <view style="margin-left: -20rpx" class="text_oneLine" @click="goDetail(item.ArticleId)" v-for="item in detailData.ArticleList" :key="item.ArticleId"> {{item.ReportLink}}</view>
+          <view class="network-right" style="color: #2c83ff">
+            <view style="margin-left: -20rpx" class="text_oneLine" @click="goDetail(item.ArticleId)" v-for="item in detailData.ArticleList" :key="item.ArticleId"> {{ item.ReportLink }}</view>
           </view>
         </view>
         <view v-if="detailData.Theme" class="network">
@@ -158,10 +158,10 @@
         <view class="content-bottom" v-else>
           <view v-if="detailData.ActiveState == 1">
             <view class="make-outbound" @click="wanttosignup" v-if="detailData.IsSignup == 0">
-              {{ detailData.SignupType == 1 ? "预约外呼" : `我要报名(${detailData.SignupNum}/${detailData.LimitPeopleNum})` }}
+              {{ detailData.SignupType == 1 ? "预约外呼" : detailData.LimitPeopleNum > 0 ? `我要报名(${detailData.SignupNum}/${detailData.LimitPeopleNum})` : "我要报名" }}
             </view>
             <view v-else class="make-outbound" @click="signupCancel(2)">
-              {{ detailData.SignupType == 1 ? "取消外呼" : `取消报名(${detailData.SignupNum}/${detailData.LimitPeopleNum})` }}
+              {{ detailData.SignupType == 1 ? "取消外呼" : detailData.LimitPeopleNum > 0 ? `取消报名(${detailData.SignupNum}/${detailData.LimitPeopleNum})` : "取消报名" }}
             </view>
             <view v-if="detailData.IsShowAppointment" @click="summaryIsHandel" class="make-generation make-conference">{{ detailData.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</view>
           </view>

activityPages/activitySearch/activitySearch.vue

@@ -144,14 +144,12 @@
             <view class="item">
               <view class="item-text" @click="goDetail(item)">
                 <text class="activity-title"> {{ item.ActivityName }} </text>
-                <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙' || item.ActivityTypeName == '研选电话会'"
-                  >专家背景：{{ item.Expert }}
-                </text>
-                <text class="text_twoLine" v-if="item.ActivityTypeName == '公司调研电话会' || item.ActivityTypeName == '公司线下调研'">嘉宾：{{ item.DistinguishedGuest }} </text>
-                <text class="text_twoLine" v-if="item.ActivityTypeName == '分析师电话会' || item.ActivityTypeName == '分析师线下沙龙'">主讲人：{{ item.Speaker }}</text>
+               <text class="text_twoLine" v-if="item.Expert">专家背景：{{ item.Expert }} </text>
+                <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾：{{ item.DistinguishedGuest }} </text>
+                <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
               </view>
               <block v-if="item.ActiveState == 1">
-                <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeName == '公司调研电话会'">
+                <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeId == 3">
                   <view class="city-img">
                     <image v-if="item.City" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                     {{ item.City }}
@@ -162,14 +160,19 @@
                     <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.IsSignup == 1 ? "取消外呼" : "取消报名" }}</text>
                   </view>
                 </view>
-                <view class="bottom-box" :class="item.ActivityTypeId == 1  ? 'four-btn' : ''" v-else-if="item.ActivityType == 1">
-                  <text class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-                  <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
-                  <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
-                  <view class="" style="width: 130rpx" v-if="item.ActivityTypeName != '分析师电话会' && item.ActivityTypeName != '公司调研电话会'">
-                    <text @click="askingGo(item)">帮我带问</text>
-                  </view>
+                <view class="bottom-box" :class="(item.ActivityTypeId == 1 || item.ActivityTypeId == 2)  ? 'four-btn' : ''" v-else-if="item.ActivityType == 1">
+                  <block v-if="item.IsCClassMeeting">
+                    <text class="button" @click="signupIsAddOfCancel(item, 3)">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+                  </block>
+                  <block v-else>
+                    <text class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+                    <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+                    <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
+                    <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
+                    <view class="" style="width: 130rpx" v-if="item.ActivityTypeId != 7 && item.ActivityTypeId != 3">
+                      <text @click="askingGo(item)">帮我带问</text>
+                    </view>
+                  </block>
                 </view>
                 <view class="bottom-box city" v-else>
                   <view class="city-img">

activityPages/themeActivity/themeActivity.vue

@@ -25,14 +25,12 @@
             <view class="item">
               <view class="item-text" @click="goDetail(item)">
                 <text class="activity-title"> {{ item.ActivityName }} </text>
-                <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙' || item.ActivityTypeName == '研选电话会'"
-                  >专家背景：{{ item.Expert }}
-                </text>
-                <text class="text_twoLine" v-if="item.ActivityTypeName == '公司调研电话会' || item.ActivityTypeName == '公司线下调研'">嘉宾：{{ item.DistinguishedGuest }} </text>
-                <text class="text_twoLine" v-if="item.ActivityTypeName == '分析师电话会' || item.ActivityTypeName == '分析师线下沙龙'">主讲人：{{ item.Speaker }}</text>
+                <text class="text_twoLine" v-if="item.Expert">专家背景：{{ item.Expert }} </text>
+                <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾：{{ item.DistinguishedGuest }} </text>
+                <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
               </view>
               <block v-if="item.ActiveState == 1">
-                <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeName == '公司调研电话会'">
+                <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeId == 3">
                   <view class="city-img">
                     <image v-if="item.City" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                     {{ item.City }}
@@ -43,14 +41,19 @@
                     <text class="button" v-else @click="signupIsAddOfCancel(item, 2)">{{ item.IsSignup == 1 ? "取消外呼" : "取消报名" }}</text>
                   </view>
                 </view>
-                <view class="bottom-box" :class="item.ActivityTypeId == 1 ? 'four-btn' : ''" v-else-if="item.ActivityType == 1">
-                  <text class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-                  <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
-                  <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
-                  <view class="" style="width: 130rpx" v-if="item.ActivityTypeName != '分析师电话会' && item.ActivityTypeName != '公司调研电话会'">
-                    <text @click="askingGo(item)">帮我带问</text>
-                  </view>
+                <view class="bottom-box" :class="item.ActivityTypeId == 1 || item.ActivityTypeId == 2 ? 'four-btn' : ''" v-else-if="item.ActivityType == 1">
+                  <block v-if="item.IsCClassMeeting">
+                    <text class="button" @click="signupIsAddOfCancel(item, 3)">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+                  </block>
+                  <block v-else>
+                    <text class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+                    <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+                    <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
+                    <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
+                    <view class="" style="width: 130rpx" v-if="item.ActivityTypeId != 7 && item.ActivityTypeId != 3">
+                      <text @click="askingGo(item)">帮我带问</text>
+                    </view>
+                  </block>
                 </view>
                 <!-- 公司线下调研 -->
                 <view class="bottom-box city" v-else>

pageMy/chartPage/chartPage.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container reportDetail-container">
-    <web-view :src="chartData.HttpUrl">
+    <web-view :src="strategyUrl + '?url=' + chartData.HttpUrl">
       <cover-view class="footer-con">
         <cover-view class="handle-item" @click="collectHandle">
           <cover-image
@@ -24,6 +24,9 @@ export default {
       id: "",
       chartData: {},
       isCollection: false,
+      //strategyUrl:'http://192.168.20.72:3000/xcx_h5/strategyReport',
+      strategyUrl: "https://details.hzinsights.com/strategyReport", //线上链接地址
+      //strategyUrl: "http://xcxh5test.hzinsights.com/xcx_h5/strategyReport", //链接地址
     };
   },
   components: {
@@ -59,7 +62,7 @@ export default {
     if (!this.$store.state.isAuth && !this.$store.state.isBind) {
       //已授权已绑定
       this.id && this.myChartDetail();
-    } 
+    }
   },
   onLoad(option) {
     // /* 兼容iphonex底部 */

pageMy/mySchedulepage/mySchedulepage.vue

@@ -19,13 +19,13 @@
           </view>
           <view class="item">
             <view class="item-text" @click="goDetail(item)">
-              <text class="activity-title"> {{ item.ActivityName }} </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙' || item.ActivityTypeName == '研选电话会'">专家背景：{{ item.Expert }} </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '公司调研电话会' || item.ActivityTypeName == '公司线下调研'">嘉宾：{{ item.DistinguishedGuest }} </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '分析师电话会' || item.ActivityTypeName == '分析师线下沙龙'">主讲人：{{ item.Speaker }}</text>
-            </view>
+               <text class="activity-title"> {{ item.ActivityName }} </text>
+                <text class="text_twoLine" v-if="item.Expert">专家背景：{{ item.Expert }} </text>
+                <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾：{{ item.DistinguishedGuest }} </text>
+                <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
+               </view>
             <block v-if="item.ActiveState == 1">
-               <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeName == '公司调研电话会'">
+               <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeId == 3">
                   <view class="city-img">
                     <image v-if="item.City" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                     {{ item.City }}
@@ -36,14 +36,19 @@
                     <text class="button" v-else @click="signupIsAddOfCancel(item, 2,'我的')">{{ item.IsSignup == 1 ? "取消外呼" : "取消报名" }}</text>
                   </view>
                 </view>
-              <view class="bottom-box" :class="item.ActivityTypeId == 1  ? 'four-btn':''" v-else-if="item.ActivityType == 1">
-                  <text class="button" @click="signupIsAddOfCancel(item, 1,'我的')">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                  <text  v-if="item.IsShowAppointment" @click="summaryIsHandel(item,'我的')">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-                  <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
-                  <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
-                  <view class="" style="width: 130rpx" v-if="item.ActivityTypeName != '分析师电话会' && item.ActivityTypeName != '公司调研电话会'">
-                    <text @click="askingGo(item)">帮我带问</text>
-                  </view>
+              <view class="bottom-box" :class="item.ActivityTypeId == 1 || item.ActivityTypeId == 2  ? 'four-btn':''" v-else-if="item.ActivityType == 1">
+                  <block v-if="item.IsCClassMeeting">
+                    <text class="button" @click="signupIsAddOfCancel(item, 3)">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+                  </block>
+                  <block v-else>
+                    <text class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+                    <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+                    <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
+                    <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
+                    <view class="" style="width: 130rpx" v-if="item.ActivityTypeId != 7 && item.ActivityTypeId != 3">
+                      <text @click="askingGo(item)">帮我带问</text>
+                    </view>
+                  </block>
                 </view>
                <!-- 公司线下调研 -->
                 <view class="bottom-box city" v-else>

pageMy/reportDetail/reportDetail.vue

@@ -45,7 +45,8 @@ export default {
       isIphoneX: false, //判断机型
       reportInfo: "",
       linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
-      //linkurl: "http://advisoryadmin.brilliantstart.cn/xcx_h5/raiReportDtl", //链接地址
+      //linkurl:'http://192.168.20.72:3000/xcx_h5/raiReportDtl',//线上链接地址
+      //linkurl: "http://xcxh5test.hzinsights.com/xcx_h5/raiReportDtl", //链接地址
       showNav: false,
       id: "",
       isShowTip: false,

pageMy/reportPage/reportPage.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container reportDetail-container">
     <block v-if="haveAuth === 1">
-      <web-view :src="linkurl">
+      <web-view :src="strategyUrl + '?url='+ 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>
@@ -52,6 +52,9 @@ export default {
       showNav: false,
       id: "",
       linkurl: "",
+      //strategyUrl:'http://192.168.20.72:3000/xcx_h5/strategyReport',
+      strategyUrl:'https://details.hzinsights.com/strategyReport',//线上链接地址
+      //strategyUrl: "http://xcxh5test.hzinsights.com/xcx_h5/strategyReport", //链接地址
       isShowTip: false,
       sale_name: "", //可联系销售名称
       sale_number: "", //可联系销售电话
@@ -319,6 +322,9 @@ export default {
 <style lang="scss" scoped>
 .reportDetail-container {
   background-color: #fff;
+  padding-bottom: 200rpx;
+  padding-bottom: calc(200rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(200rpx + env(safe-area-inset-bottom));
   .search-view {
     position: fixed;
     width: 100%;

pages/activity/activity.vue

@@ -90,32 +90,35 @@
           <view class="item">
             <view class="item-text" @click="goDetail(item)">
               <text class="activity-title"> {{ item.ActivityName }} </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙' || item.ActivityTypeName == '研选电话会'"
-                >专家背景：{{ item.Expert }}
-              </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '公司调研电话会' || item.ActivityTypeName == '公司线下调研'">嘉宾：{{ item.DistinguishedGuest }} </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '分析师电话会' || item.ActivityTypeName == '分析师线下沙龙'">主讲人：{{ item.Speaker }}</text>
+              <text class="text_twoLine" v-if="item.Expert">专家背景：{{ item.Expert }} </text>
+              <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾：{{ item.DistinguishedGuest }} </text>
+              <text class="text_twoLine" v-if="item.Speaker">主讲人：{{ item.Speaker }}</text>
             </view>
             <block v-if="item.ActiveState == 1">
-              <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeName == '公司调研电话会'">
+              <view class="bottom-box city" v-if="item.ActiveState == 1 && item.IsLimitPeople == 1 && item.ActivityTypeId == 3">
                 <view class="city-img">
                   <image v-if="item.City" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                   {{ item.City }}
                 </view>
                 <view style="display: flex">
-                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item,'我的')">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item, '我的')">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
                   <text class="button" v-if="item.IsSignup !== 1" @click="wanttosignup(item.ActivityId)">我要报名</text>
-                  <text class="button" v-else @click="signupIsAddOfCancel(item, 2,'我的')">{{ item.IsSignup == 1 ? "取消外呼" : "取消报名" }}</text>
+                  <text class="button" v-else @click="signupIsAddOfCancel(item, 2, '我的')">{{ item.IsSignup == 1 ? "取消外呼" : "取消报名" }}</text>
                 </view>
               </view>
-              <view class="bottom-box" :class="item.ActivityTypeId == 1  ? 'four-btn' : ''" v-else-if="item.ActivityType == 1">
-                <text class="button" @click="signupIsAddOfCancel(item, 1,'我的')">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item,'我的')">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-                <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
-                <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
-                <view class="" style="width: 130rpx" v-if="item.ActivityTypeName != '分析师电话会' && item.ActivityTypeName != '公司调研电话会'">
-                  <text @click="askingGo(item)">帮我带问</text>
-                </view>
+              <view class="bottom-box" :class="item.ActivityTypeId == 1 || item.ActivityTypeId == 2 ? 'four-btn' : ''" v-else-if="item.ActivityType == 1">
+                <block v-if="item.IsCClassMeeting">
+                  <text class="button" @click="signupIsAddOfCancel(item, 3)">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+                </block>
+                <block v-else>
+                  <text class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+                  <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
+                  <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
+                  <view class="" style="width: 130rpx" v-if="item.ActivityTypeId != 7 && item.ActivityTypeId != 3">
+                    <text @click="askingGo(item)">帮我带问</text>
+                  </view>
+                </block>
               </view>
               <view class="bottom-box city" v-else>
                 <view class="city-img">
@@ -123,8 +126,8 @@
                   {{ item.City }}
                 </view>
                 <view style="display: flex">
-                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item,'我的')">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-                  <text class="button" @click="signupIsAddOfCancel(item, 3,'我的')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+                  <text v-if="item.IsShowAppointment" @click="summaryIsHandel(item, '我的')">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+                  <text class="button" @click="signupIsAddOfCancel(item, 3, '我的')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
                 </view>
               </view>
             </block>