专项调研 按钮显示

activityPages/specialDetail/specialDetail.vue

@@ -59,7 +59,7 @@
         查看行程安排
         <van-icon name="arrow" />
       </view>
-      <view class="interest-btn">
+      <view class="interest-btn" v-if="detailData.ActiveState == 1">
         <block v-if="detailData.TripStatus == 2">
           <text class="button" @click="applyOfcancel(detailData)">{{ detailData.IsTrip == 0 ? `我要报名(${detailData.TripNum}/${detailData.LimitPeopleNum})` : "取消报名" }}</text>
         </block>

activityPages/specialResearchPage/specialResearchPage.vue

@@ -22,7 +22,7 @@
               <image :src="item.ImgUrl"> </image>
               <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
               <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-              <text v-else class="img-status">已结束</text>
+              <text v-else-if="item.ActiveState == 0 && item.TripStatus == 2" class="img-status">已结束</text>
             </view>
             <view class="item">
               <view class="item-text" @click="goDetail(item)">

pageMy/mySchedulepage/mySchedulepage.vue

@@ -26,7 +26,9 @@
             <image :src="item.ImgUrl"></image>
             <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
             <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-            <text v-else class="img-status">已结束</text>
+            <block v-else>
+              <text v-if="item.TripStatus != 1" class="img-status">已结束</text>
+            </block>
             <view class="img-type">
               <image :src="item.ImgUrlText" mode=""></image>
             </view>

pages-search/components/activityBack.vue

@@ -90,7 +90,7 @@
                 <view class="bottom-box">
                   <view class="" style="width: 130rpx"> </view>
                   <text @click="lookImg(item)">行程安排</text>
-                  <text class="button" @click="applyOfcancel(item, 'back')">{{ item.IsSignup == 0 ? "我要报名" : "取消报名" }}</text>
+                  <text v-if="item.ActiveState == 1" class="button" @click="applyOfcancel(item, 'back')">{{ item.IsSignup == 0 ? "我要报名" : "取消报名" }}</text>
                 </view>
               </block>
             </view>

pages-search/indedxSearch/indedxSearch.vue

@@ -78,9 +78,7 @@
               <view class="more-rivet" @click="tabsActiveMore(3)"> 更多 <u-icon name="arrow-right" color="#3385FF" size="28"></u-icon> </view>
             </view>
           </view>
-          <reportPage :reportPageData="reportPageData" id="container-report-page"
-		  v-if="Object.keys(reportPageData).length && (tabsActive == 3 || tabsActive == 1)" />
-
+          <reportPage :reportPageData="reportPageData" id="container-report-page" v-if="Object.keys(reportPageData).length && (tabsActive == 3 || tabsActive == 1)" />
           <view class="more-activity more-box" v-if="tabsActive === 1 && haveResultActivity">
             <text class="more-text"> 活动/回放 </text>
             <view>
@@ -615,16 +613,16 @@ export default {
 }
 </style>
 <style lang="scss">
-	#container-report-page{
-		.industry-video-module{
-			  .global-video-box{
-				  .video-content{
-					  top: 400rpx!important;
-				  }
-				  .close-icon{
-					  top: 330rpx!important;
-				  }
-			  }
-		}
-	}
+#container-report-page {
+  .industry-video-module {
+    .global-video-box {
+      .video-content {
+        top: 400rpx !important;
+      }
+      .close-icon {
+        top: 330rpx !important;
+      }
+    }
+  }
+}
 </style>