bding 2 years ago
parent
commit
33d31b48c0

+ 12 - 15
activityPages/activityDetail/activityDetail.vue

@@ -6,12 +6,12 @@
       </block>
       <block v-else>
         <!-- 头部滚动显示 -->
-        <view class="notice" v-if="detailData.IsLimitPeople == 1">
+        <view class="notice" v-if="detailData.IsLimitPeople">
           <van-notice-bar color="#FFFFFF" background="#FE9000" text="该活动参与名额有限,报名客户请按时参加,若不能按时参加请及时取消报名,爽约会影响您的后续报名资格" />
         </view>
         <!-- 内容部分 -->
         <view class="content">
-          <view v-if="detailData.ActivityName" class="dialog-title" :class="1 == 1 ? 'brackets-title' : ''">{{ detailData.ActivityName }}</view>
+          <view v-if="detailData.ActivityName" class="dialog-title brackets-title">{{ detailData.ActivityName }}</view>
           <block v-if="detailData.FileType == 1">
             <view class="audio-card" v-if="detailData.VoiceList && detailData.VoiceList.Url">
               <view class="slider-paly">
@@ -162,13 +162,12 @@
           </view>
           <view v-if="detailData.ParticipationCode" class="network">
             <view class="network-left">拨入密码:</view>
-            <view class="network-right">{{
-              detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople == 1 && detailData.IsSignup == 0 ? "请报名获取" : detailData.ParticipationCode
-            }}</view>
+            <view class="network-right">{{ [1, 2, 3].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ParticipationCode }}</view>
           </view>
           <view class="network" v-if="detailData.OnlineParticipation">
             <view class="network-left">网络参会:</view>
-            <view class="network-right network-link" style="color: #2c83ff">
+            <view class="network-right network-link" v-if="[1, 2].includes(detailData.ActivityTypeId) && detailData.IsLimitPeople && !detailData.IsSignup"> 请报名获取 </view>
+            <view class="network-right network-link" style="color: #2c83ff" v-else>
               <view class="">
                 <text class="default text_oneLine" @click="networkBtn">{{ detailData.OnlineParticipation }}</text>
                 <text class="default copy-link" @click="copyLink">复制链接</text>
@@ -192,13 +191,11 @@
           </view>
           <view v-if="detailData.ConferencePassword" class="network">
             <view class="network-left">拨入密码:</view>
-            <view class="network-right">{{
-              detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople == 1 && detailData.IsSignup == 0 ? "请报名获取" : detailData.ConferencePassword
-            }}</view>
+            <view class="network-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ConferencePassword }}</view>
           </view>
           <view v-if="detailData.Address" class="network">
             <view class="network-left">活动地址:</view>
-            <view class="network-right" v-if="detailData.IsSignup == 0 && detailData.ActivityTypeName == '公司线下调研' && detailData.IsLimitPeople == 1">请报名获取 </view>
+            <view class="network-right" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司线下调研' && detailData.IsLimitPeople">请报名获取 </view>
             <view class="network-right" v-else>{{ detailData.Address }}</view>
           </view>
           <view v-if="detailData.Highlights" class="network">
@@ -239,10 +236,10 @@
             </view>
             <view v-if="detailData.IsShowAppointment" @click="summaryIsHandel" class="make-generation make-conference">{{ detailData.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</view>
             <view v-if="detailData.IsShowHelpSsk" class="make-generation make-conference" @click="askingGo"> 帮我带问 </view>
-            <view class="make-outbound" @click="wanttosignup" v-if="detailData.IsSignup == 0 && detailData.IsShowSignup">
+            <view class="make-outbound" @click="wanttosignup" v-if="!detailData.IsSignup && detailData.IsShowSignup">
               {{ detailData.LimitPeopleNum > 0 ? `我要报名(${detailData.SignupNum}/${detailData.LimitPeopleNum})` : "我要报名" }}
             </view>
-            <view v-if="detailData.IsSignup != 0 && detailData.IsShowSignup" class="make-outbound" @click="signupIsAddOfCancel(2)">
+            <view v-if="detailData.IsSignup && detailData.IsShowSignup" class="make-outbound" @click="signupIsAddOfCancel(2)">
               {{ detailData.LimitPeopleNum > 0 ? `${showWay}(${detailData.SignupNum}/${detailData.LimitPeopleNum})` : showWay }}
             </view>
           </block>
@@ -358,11 +355,11 @@ export default {
     },
     //报名的显示
     showWay() {
-      let text = this.detailData.SignupType == 1 ? "取消外呼" : "取消报名";
+      let text = this.detailData.SignupType ? "取消外呼" : "取消报名";
       return text;
     },
     showOutboundCall() {
-      let text = this.detailData.IsSignup == 1 ? "取消外呼" : "预约外呼";
+      let text = this.detailData.IsSignup ? "取消外呼" : "预约外呼";
       return text;
     },
     //几倍的播放数度
@@ -412,7 +409,7 @@ export default {
             this.jurisdictionList = res.Data;
             if (res.Data.HasPermission == 1) {
               this.detailData = res.Data.Detail;
-              this.synchronization()
+              this.synchronization();
             }
           }
         });

+ 1 - 1
activityPages/activityDetail/manageMixin.js

@@ -170,7 +170,7 @@ export default {
     },
     // 我要报名
     wanttosignup() {
-      if (this.detailData.IsLimitPeople == 1 && this.detailData.ActivityTypeName == "公司调研电话会") {
+      if (this.detailData.IsLimitPeople && [1, 2, 3].includes(this.detailData.ActivityTypeId)) {
         this.selectShow = true;
       } else {
         this.signupIsAddOfCancel(3);

+ 1 - 1
components/ItemComponent/activityItem.vue

@@ -198,7 +198,7 @@ export default {
       if (item.YidongActivityId) {
         this.goDetail(item);
         return;
-      } else if (item.IsLimitPeople == 1 && item.ActivityTypeName == "公司调研电话会") {
+      } else if (item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId)) {
         this.selectShow = true;
       } else {
         this.activityIdAdd = "";

+ 1 - 1
components/activity/indexActivity.js

@@ -46,7 +46,7 @@ export default {
       if (item.YidongActivityId) {
         this.goDetail(item);
         return;
-      } else if (item.IsLimitPeople == 1 && item.ActivityTypeName == "公司调研电话会") {
+      } else if (item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId)) {
         this.selectShow = true;
       } else {
         this.activityIdAdd = "";