Merge branch '8.8' into 9.0

activityPages/themeActivity/themeActivity.vue

@@ -93,7 +93,7 @@
               </view>
               <block v-if="item.SourceType == 1">
                 <block v-if="item.ActiveState == 1">
-                  <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
+                  <view :class="['bottom-box', isEndBtn(item) > 3 && 'expert-item', item.City && 'city']">
                     <view class="city-img" v-if="item.City">
                       <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                       {{ item.City }}
@@ -219,6 +219,17 @@ export default {
     videoModule,
   },
   methods: {
+    // 判断几个按钮
+    isEndBtn(item) {
+      let isKeys = ["IsShowOutboundCall", "IsShowAppointment", "IsShowMeetingReminder", "IsShowHelpSsk", "IsShowDetails", "IsShowSignup"];
+      let arr = [];
+      Object.keys(item).forEach((key) => {
+        if (isKeys.includes(key)) {
+          item[key] && arr.push(item[key]);
+        }
+      });
+      return arr.length;
+    },
     // 获取列表数据
     async getActivityList() {
       const res = await activity.getActivityListNew({

pageMy/mySchedulepage/mySchedulepage.vue

@@ -46,7 +46,7 @@
             </view>
             <block v-if="item.SourceType == 1">
               <block v-if="item.ActiveState == 1">
-                <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
+                <view :class="['bottom-box', isEndBtn(item) > 3 && 'expert-item', item.City && 'city']">
                   <view class="city-img" v-if="item.City">
                     <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                     {{ item.City }}
@@ -173,6 +173,17 @@ export default {
     };
   },
   methods: {
+    // 判断几个按钮
+    isEndBtn(item) {
+      let isKeys = ["IsShowOutboundCall", "IsShowAppointment", "IsShowMeetingReminder", "IsShowHelpSsk", "IsShowDetails", "IsShowSignup"];
+      let arr = [];
+      Object.keys(item).forEach((key) => {
+        if (isKeys.includes(key)) {
+          item[key] && arr.push(item[key]);
+        }
+      });
+      return arr.length;
+    },
     //获取数据
     async getActivityList() {
       const res = await activity.getScheduleList({ PageSize: this.pageSize, CurrentIndex: this.page_no });

pages-search/components/activityBack.vue

@@ -46,7 +46,7 @@
               </view>
               <block v-if="item.SourceType == 1">
                 <block v-if="item.ActiveState == 1">
-                  <view :class="['bottom-box', item.ActivityTypeId == 1 && 'expert-item', item.City && 'city']">
+                  <view :class="['bottom-box', isEndBtn(item) > 3 && 'expert-item', item.City && 'city']">
                     <view class="city-img" v-if="item.City">
                       <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png"></image>
                       {{ item.City }}
@@ -218,6 +218,17 @@ export default {
         urls: [item.TripImgLink], //查看图片的数组
       });
     },
+    // 判断几个按钮
+    isEndBtn(item) {
+      let isKeys = ["IsShowOutboundCall", "IsShowAppointment", "IsShowMeetingReminder", "IsShowHelpSsk", "IsShowDetails", "IsShowSignup"];
+      let arr = [];
+      Object.keys(item).forEach((key) => {
+        if (isKeys.includes(key)) {
+          item[key] && arr.push(item[key]);
+        }
+      });
+      return arr.length;
+    },
   },
 };
 </script>