切换8.8

components/ItemComponent/activityItem.vue

@@ -2,15 +2,15 @@
   <view class="container-activity-item" @click="goDetail(list)">
     <view class="content-sign">
       <view :class="[list.ActivityType === 0 ? 'is-down' : 'is-up', 'is-up-down']">{{ list.ActivityType === 0 ? "线下" : "线上" }}</view>
-      <view :class="[list.ActiveState === 1 ? 'is-down' : list.ActiveState === 2 ? 'is-up' : 'is-end', 'is-up-down', 'state']">
+      <view :class="[list.ActiveState === 1 ? 'is-down-state' : list.ActiveState === 2 ? 'is-up-state' : 'is-end', 'is-up-down', 'state']">
         {{ list.ActiveState === 1 ? "未开始" : list.ActiveState === 2 ? "进行中" : "已结束" }}
       </view>
     </view>
-    <view class="content-type"> {{ list.ActivityTypeName || list.ResearchTheme }}</view>
-    <view class="content-title text-Line" v-if="list.ActivityName">
-      {{ list.ActivityName }}
+    <view class="content-type"> {{ list.ActivityTypeName || "专项产业调研" }}</view>
+    <view :class="['content-title', 'text-Line' ,list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
+      {{ list.ActivityName || list.ResearchTheme }}
     </view>
-    <view style="display: flex" class="content-text text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
+    <view style="display: flex" class="content-text content-min-hight text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
       <text style="flex-shrink: 0"> 活动时间：</text>
       <text> {{ list.ActivityTimeText }}</text>
     </view>
@@ -25,38 +25,43 @@
       <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
       {{ list.City }}
     </view>
-    <view :class="['content-btn', list.ActivityTypeId === 1 && 'content-btn-end']">
+    <view :class="['content-btn', isEndBtnSlide(list) > 2 && 'content-btn-end']">
       <block v-if="list.SourceType === 1">
-        <text class="item-btn btn-solid" v-if="list.IsShowOutboundCall && list.ActivityTypeId == 1" @click.stop="signupIsAddOfCancel(list, 1)">{{ list.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-        <text class="item-btn" v-if="list.IsShowAppointment" @click.stop="summaryIsHandel(list)">{{ list.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-        <text class="item-btn" v-if="list.IsShowMeetingReminder" @click.stop="meetingReminderAdd(list.ActivityId, list.IsCancelMeetingReminder)">
-          {{ list.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
-        </text>
-        <view class="item-btn" v-if="list.IsShowHelpSsk" style="width: 130rpx">
-          <text @click.stop="askingGo(list)">帮我带问</text>
-        </view>
-        <text class="item-btn" v-if="list.IsShowOutboundCall && list.ActivityTypeId != 1" @click.stop="signupIsAddOfCancel(list, 1)">{{ list.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-        <text class="item-btn" v-if="list.IsShowDetails" @click.stop="goDetail(list)">查看详情</text>
-        <block v-if="list.IsShowSignup">
-          <block v-if="list.IsCClassMeeting">
-            <text class="item-btn btn-solid" @click.stop="signupIsAddOfCancel(list, 3, 'CClass')">{{ list.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
-          </block>
-          <block v-else>
-            <text class="item-btn btn-solid" v-if="list.IsSignup !== 1" @click.stop="wanttosignup(list)">我要报名</text>
-            <text class="item-btn btn-solid" v-else @click.stop="signupIsAddOfCancel(list, 2)">{{ list.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
+        <block v-if="list.ActiveState == 1">
+          <text class="item-btn btn-solid" v-if="list.IsShowOutboundCall && list.ActivityTypeId == 1" @click.stop="signupIsAddOfCancel(list, 1)">{{
+            list.IsSignup == 1 ? "取消外呼" : "预约外呼"
+          }}</text>
+          <text class="item-btn" v-if="list.IsShowAppointment" @click.stop="summaryIsHandel(list)">{{ list.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+          <text class="item-btn" v-if="list.IsShowMeetingReminder" @click.stop="meetingReminderAdd(list, list.IsCancelMeetingReminder)">
+            {{ list.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
+          </text>
+          <view class="item-btn" v-if="list.IsShowHelpSsk" style="width: 130rpx">
+            <text @click.stop="askingGo(list)">帮我带问</text>
+          </view>
+          <text class="item-btn" v-if="list.IsShowOutboundCall && list.ActivityTypeId != 1" @click.stop="signupIsAddOfCancel(list, 1)">{{ list.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+          <text class="item-btn" v-if="list.IsShowDetails" @click.stop="goDetail(list)">查看详情</text>
+          <block v-if="list.IsShowSignup">
+            <block v-if="list.IsCClassMeeting">
+              <text class="item-btn btn-solid" @click.stop="signupIsAddOfCancel(list, 3, 'CClass')">{{ list.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+            </block>
+            <block v-else>
+              <text class="item-btn btn-solid" v-if="list.IsSignup !== 1" @click.stop="wanttosignup(list)">我要报名</text>
+              <text class="item-btn btn-solid" v-else @click.stop="signupIsAddOfCancel(list, 2)">{{ list.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
+            </block>
           </block>
         </block>
+        <text v-if="list.IsShowHelpSsk && list.ActiveState == 2" class="item-btn" @click="askingGo(list, '提问')">实时提问</text>
       </block>
       <view class="bottom-box real-time" v-else>
         <view class="bottom-box">
           <view class="" style="width: 130rpx"> </view>
-          <text class="item-btn" @click="lookImg(list)">行程安排</text>
+          <text class="item-btn" @click.stop="lookImg(list)">行程安排</text>
           <block v-if="list.TripStatus == 2">
-            <text v-if="list.ActiveState == 1" class="item-btn btn-solid" @click="applyOfcancel(list)">{{ list.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
+            <text v-if="list.ActiveState == 1" class="item-btn btn-solid" @click.stop="applyOfcancel(list)">{{ list.IsTrip == 0 ? "我要报名" : "取消报名" }}</text>
           </block>
           <block v-else>
-            <text class="item-btn" v-if="list.IsSignup !== 1" @click="interest(list)">感兴趣</text>
-            <text class="item-btn" @click="beNotInterested(list)" v-else>已预报名</text>
+            <text class="item-btn btn-solid" v-if="list.IsSignup !== 1" @click.stop="interest(list)">感兴趣</text>
+            <text class="item-btn btn-solid" @click.stop="beNotInterested(list)" v-else>已预报名</text>
           </block>
         </view>
       </view>
@@ -168,6 +173,16 @@ export default {
   created() {},
   mounted() {},
   methods: {
+    isEndBtnSlide(item) {
+      let isKey = ["IsShowOutboundCall", "IsShowAppointment", "IsShowMeetingReminder", "IsShowHelpSsk", "IsShowDetails", "IsShowSignup"];
+      let arr = [];
+      Object.keys(item).forEach((key) => {
+        if (isKey.includes(key)) {
+          item[key] && arr.push(item[key]);
+        }
+      });
+      return arr.length;
+    },
     // 我要报名
     wanttosignup(item) {
       this.activityIdAdd = item.ActivityId;
@@ -287,14 +302,14 @@ export default {
       this.isCancelShow = false;
     },
     //添加消息提醒接口
-    meetingReminderAdd(id, type) {
+    meetingReminderAdd(item, type) {
       if (type != 0) {
-        this.meetingReminderCancel(id);
+        this.meetingReminderCancel(item);
         return;
       }
       activity
         .meetingReminderAdd({
-          ActivityId: id,
+          ActivityId: item.ActivityId,
         })
         .then((res) => {
           if (res.Ret == 200) {
@@ -322,10 +337,10 @@ export default {
         });
     },
     //取消消息提醒接口
-    meetingReminderCancel(id) {
+    meetingReminderCancel(item) {
       activity
         .meetingReminderCancel({
-          ActivityId: id,
+          ActivityId: item.ActivityId,
         })
         .then((res) => {
           if (res.Ret == 200) {
@@ -575,6 +590,12 @@ export default {
     .is-up {
       background: linear-gradient(90deg, #0151ff 0%, #01b9ff 100%);
     }
+    .is-up-state {
+      background-color: #01a7ff;
+    }
+    .is-down-state {
+      background: #ff9110;
+    }
     .is-down {
       background: linear-gradient(90deg, #ff8a05 0%, #ffb74d 100%);
     }
@@ -604,7 +625,7 @@ export default {
     font-weight: 400;
     color: #999999;
     line-height: 44rpx;
-    padding: 10rpx 0 20rpx;
+    margin: 10rpx 0;
   }
 
   .content-time {
@@ -629,6 +650,9 @@ export default {
     width: 205rpx;
     height: 119rpx;
   }
+  .content-min-hight {
+    min-height: 88rpx;
+  }
   .content-btn {
     display: flex;
     overflow: hidden;

components/ItemComponent/reportItem.vue

@@ -6,10 +6,12 @@
     <view class="item-image" v-if="list.BodyHtml">
       <image :src="list.BodyHtml"></image>
     </view>
-    <text class="item-content">{{ list.ArticleResponse == 4 ? "核心观点" : "核心结论" }}:</text>
-    <view class="item-rich-text">
-      <rich-text :nodes="richTextClamp + list.Annotation + '</div>'"></rich-text>
-    </view>
+    <block v-if="list.Annotation">
+      <text class="item-content">{{ list.ArticleResponse == 4 ? "核心观点" : "核心结论" }}:</text>
+      <view class="item-rich-text">
+        <rich-text :nodes="richTextClamp + list.Annotation + '</div>'"></rich-text>
+      </view>
+    </block>
     <view class="item-abstract text-Line" v-if="list.Abstract && list.ArticleResponse != 1"> 摘要：{{ list.Abstract }} </view>
     <view class="item-time">
       <text>{{ list.PublishDate }}</text>
@@ -35,7 +37,8 @@ export default {
   },
   data() {
     return {
-      richTextClamp: '<div style="min-height: 50px;line-clamp: 7;-webkit-line-clamp: 7;-webkit-box-orient: vertical;display: -webkit-box;overflow: hidden;text-overflow: ellipsis;">',
+      richTextClamp:
+        '<div style="min-height: 50px;line-clamp: 7;-webkit-line-clamp: 7;text-overflow: -o-ellipsis-lastline;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient: vertical;word-wrap: break-word;word-break: break-all;">',
     };
   },
   computed: {},
@@ -95,13 +98,12 @@ export default {
     font-size: 26rpx;
     font-weight: 400;
     color: #666666;
-    line-height: 30rpx;
   }
   .item-content {
     margin-top: 10rpx;
   }
   .item-rich-text {
-    margin-bottom: 10rpx;
+    margin-bottom: 20rpx;
   }
   .item-image {
     height: 242rpx;