pages/activity/detail.vue

@@ -52,8 +52,7 @@
         </view>
         <u-panel v-if="expand_content.topic_title.value" class="activity-desc"
                  :title="expand_content.topic_title.value " :second="true">
-          <view class="activity-agenda"
-                v-if="expand_content.topic_list.value && expand_content.speaker_title.value && expand_content.speaker_btn.value">
+          <view class="activity-agenda">
             <!--            <view class="activity-agenda-title">{{ expand_content.topic_title.value }}</view>-->
             <view class="activity-agenda-list">
               <view class="activity-agenda-item" v-for="item in expand_content.topic_list.value">
@@ -62,7 +61,7 @@
               </view>
             </view>
             <view class="activity-agenda-guest-title">{{ expand_content.speaker_title.value }}</view>
-            <view class="activity-agenda-guest-link">
+            <view class="activity-agenda-guest-link" v-if="expand_content.speaker_btn.value && expand_content.schedule_list  && expand_content.schedule_list.value">
               <van-button type="primary" @click="onClickGuestLink">
                 <template>
                   <view>{{ expand_content.speaker_btn.value }}</view>
@@ -72,15 +71,15 @@
             </view>
           </view>
         </u-panel>
-        <u-panel v-if="expand_content.schedule_desc.value" class="activity-desc"
+
+        <u-panel class="activity-desc"
                  :title="expand_content.schedule_title.value" :second="true">
           <view class="activity-schedule">
             <!--            <view class="activity-schedule-title">{{ expand_content.schedule_title.value }}</view>-->
             <view class="activity-schedule-desc">
               {{ expand_content.schedule_desc.value }}
             </view>
-            <view class="activity-schedule-table table"
-                  v-if="meetingInfo['expand_content'] && meetingInfo['expand_content']['schedule_list'] && meetingInfo['expand_content']['schedule_list']['value'].length > 0">
+            <view class="activity-schedule-table table">
               <view class="thead">
                 <view class="tr">
                   <view></view>
@@ -90,8 +89,8 @@
                 </view>
               </view>
               <view class="tbody">
-                <view class="tr" v-for="item in meetingInfo['expand_content']['schedule_list']['value']" >
-                  <template v-if="item[0].value !=='' || item[1].value !=='' || item[2].value !==''">
+                <view class="tr" v-for="item in expand_content['schedule_list']['value']" >
+                  <template>
                     <view>
                       <view class="iconfont icon-CalendarAdd1"></view>
                     </view>
@@ -244,7 +243,6 @@ export default {
 
 <style lang="scss">
 .activity-detail {
-  //padding-bottom: 140rpx;
   .main-container {
     padding-bottom: 140rpx;
   }

pages/activity/guest.vue

@@ -50,7 +50,7 @@
                   {{item.time}}
                 </view>
                 <van-collapse class="subject-collapse" :value="item.active"  @change="(e) => onSubjectCollapseChange(e, index)">
-                  <van-collapse-item :title="item.description" :name="item.title">
+                  <van-collapse-item :title="item.title" :name="item.title">
                     <text class="description">{{item.description}}</text>
                   </van-collapse-item>
                 </van-collapse>

pages/exhibitor/exhibit-detail.vue

@@ -13,10 +13,10 @@
           <view class="exhibitor-info-item">
             <view class="iconfont icon-View"></view>浏览：{{ exhibit.pv }}
           </view>
-          <view class="exhibitor-info-item" v-if="pollShow.product_poll_show">
+<!--          <view class="exhibitor-info-item" v-if="pollShow.product_poll_show">
             <view class="iconfont icon-xiaochengxu-renqiicon"></view>
             <view>人气：{{ exhibit.poll_count }}</view>
-          </view>
+          </view>-->
         </view>
         <view class="exhibit-desc">{{ exhibit.summary }}</view>
         <view class="exhibit-tags exhibitor-tags">
@@ -274,7 +274,7 @@ export default {
     .exhibitor-info-item {
       display: flex;
       align-items: center;
-      //grid-gap: 12rpx;
+      grid-gap: 8rpx;
       font-size: $fontSize1;
       color: #555555;
       .iconfont {

pages/user/award.vue

@@ -13,9 +13,12 @@
             <view class="award-title">
               路线进度
             </view>
-            <view @click="gotoCheck()" class="award-button">
+            <view v-if="is_receipts === 0" @click="gotoCheck()" class="award-button">
               继续打卡
             </view>
+            <view class="award-button disabled" v-else>
+              已完成打卡
+            </view>
           </view>
           <view class="award-progress">
             <view class="award-progress-bar"></view>
@@ -609,6 +612,9 @@ export default {
         border-radius: 50rpx;
         font-size: 24rpx;
         color: #ffffff;
+        &.disabled {
+          background: #94A3B8;
+        }
       }
     }