Browse Source

12.3 优化

bding 1 year ago
parent
commit
36997b2b8f

+ 1 - 1
activityPages/activityDetail/activityDetail.vue

@@ -854,7 +854,7 @@ export default {
       height: 62rpx;
     }
     .content-title {
-      margin-bottom: 30rpx;
+      margin: 10rpx 0 30rpx;
     }
     .content-item {
       display: flex;

+ 1 - 1
activityPages/editOutbound/editOutbound.vue

@@ -269,7 +269,7 @@ export default {
   }
   .top-box {
     width: 100%;
-    background-color: #f7f7f7;
+    background-color: $uni-bg-color;
     padding: 20rpx 34rpx;
     font-size: 28rpx;
     font-weight: 400;

+ 3 - 3
activityPages/playBack/playBack.vue

@@ -3,10 +3,10 @@
     <view class="container container-play-back">
       <!-- 筛选部分 -->
       <view class="select-content-activity">
-        <view class="screen-item" style="justify-content: flex-start;">
+        <view class="screen-item" style="justify-content: flex-start">
           <text :class="[isShowJurisdiction ? 'active' : '', 'text-item']" @click="permissioActivity">有权限行业</text>
           <!-- 各种状态选择 -->
-          <view class="select-conyent" ref="select-conyent" style="margin-left:20rpx">
+          <view class="select-conyent" ref="select-conyent" style="margin-left: 20rpx">
             <van-dropdown-menu active-color="#333333">
               <van-dropdown-item id="industry" :title="chartPermissionName">
                 <view class="menu-items">
@@ -218,7 +218,7 @@ export default {
 
 <style lang="scss" scoped>
 .container-play-back {
-  background: #f7f7f7;
+  background-color: $uni-bg-color;
   padding-bottom: 30rpx;
   .title-date {
     position: relative;

+ 141 - 198
activityPages/specialDetail/specialDetail.vue

@@ -1,70 +1,64 @@
 <template>
-  <block>
-    <view class="container special-detail" v-if="isUserBindingPhoneNumber">
-      <view class="" v-if="haveAuth == 1">
-        <view class="top-notice-special">
-          <view class="notice">
-            <van-notice-bar color="#FFFFFF" background="#FE9000" text="专项调研行程持续更新中,满五家即开团,欢迎点击感兴趣预报名" />
-          </view>
-          <view class="inform-btn" @click="specialFollow">{{ specialIsFollow ? "取消通知" : "新调研通知" }}</view>
+  <view class="container special-detail" v-if="isUserBindingPhoneNumber">
+    <view class="" v-if="haveAuth == 1">
+      <view class="top-notice-special">
+        <view class="notice">
+          <van-notice-bar color="#E37318" background="#FFF1E9" text="专项调研行程持续更新中,满五家即开团,欢迎点击感兴趣预报名" />
         </view>
-        <view class="content">
-          <view class="dialog-title" :class="1 == 1 ? 'brackets-title' : ''">{{ detailData.ResearchTheme }}</view>
-          <view class="network">
-            <view class="network-left">活动类型:</view>
-            <view class="network-right">{{ detailData.ActivityTypeName }}</view>
-          </view>
-          <view class="network">
-            <view class="network-left">所属行业:</view>
-            <view class="network-right">{{ detailData.ChartPermissionName }}</view>
-          </view>
-          <view class="network" v-if="detailData.TripStatus == 2">
-            <view class="network-left">开始时间:</view>
-            <view class="network-right">{{ detailData.ActivityTimeTextByDay }}</view>
+        <view class="inform-btn" @click="specialFollow">{{ specialIsFollow ? "取消通知" : "新调研通知" }}</view>
+      </view>
+      <view class="content">
+        <view class="reminder-item">
+          <image v-if="detailData.TripStatus == 1" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/Ybm.png"></image>
+          <image v-if="detailData.TripStatus == 2" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/trip_icon.png"></image>
+          <image v-if="detailData.Explain" @click="reminderTextHandler(detailData)" class="reminder" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/error-circle-filled.png"></image>
+        </view>
+        <view class="global_title content-title">{{ detailData.ResearchTheme }}</view>
+        <view class="content-item">
+          <view class="item-left">活动类型:</view>
+          <view class="item-right">{{ detailData.ActivityTypeName }}</view>
+        </view>
+        <view class="content-item">
+          <view class="item-left">所属行业:</view>
+          <view class="item-right">{{ detailData.ChartPermissionName }}</view>
+        </view>
+        <view class="content-item" v-if="detailData.TripStatus == 2">
+          <view class="item-left">开始时间:</view>
+          <view class="item-right">{{ detailData.ActivityTimeTextByDay }}</view>
+        </view>
+        <view class="content-item" v-else>
+          <view class="item-left">预期时间:</view>
+          <view class="item-right">{{ detailData.ActivityTimeText }}</view>
+        </view>
+        <view class="content-item">
+          <view class="item-left">调研形式:</view>
+          <view class="item-right">
+            {{ detailData.SpecialType == 1 ? "线上" : "线下" }}
+            <block v-if="detailData.SpecialType == 2">({{ detailData.City }})</block>
           </view>
-          <view class="network" v-else>
-            <view class="network-left">预期时间:</view>
-            <view class="network-right">{{ detailData.ActivityTimeText }}</view>
+        </view>
+        <block v-if="detailData.IndustrialName || detailData.IndustrialSubjectName">
+          <view class="content-item">
+            <view class="item-left">产业名称:</view>
+            <view class="item-right">{{ detailData.IndustrialName }}</view>
           </view>
-          <view class="network">
-            <view class="network-left">调研形式:</view>
-            <view class="network-right">
-              {{ detailData.SpecialType == 1 ? "线上" : "线下" }}
-              <block v-if="detailData.SpecialType == 2">({{ detailData.City }})</block>
-            </view>
+          <view class="content-item">
+            <view class="item-left">相关公司:</view>
+            <view class="item-right">{{ detailData.IndustrialSubjectName }}</view>
           </view>
-          <block v-if="detailData.IndustrialName || detailData.IndustrialSubjectName">
-            <view class="network">
-              <view class="network-left">产业名称:</view>
-              <view class="network-right">{{ detailData.IndustrialName }}</view>
-            </view>
-            <view class="network">
-              <view class="network-left">相关公司:</view>
-              <view class="network-right">{{ detailData.IndustrialSubjectName }}</view>
-            </view>
-          </block>
-          <block v-else>
-            <view class="network">
-              <view class="network-left">相关主题:</view>
-              <view class="network-right">{{ detailData.Label }}</view>
-            </view>
-          </block>
-          <view class="reminder-item">
-            <image v-if="detailData.TripStatus == 1" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Y_apply.png"></image>
-            <image v-if="detailData.TripStatus == 2" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/confirm_XC.png"></image>
-            <image
-              v-if="detailData.Explain"
-              @click="reminderTextHandler(detailData)"
-              class="reminder"
-              src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/reminder_icon.png"
-            ></image>
+        </block>
+        <block v-else>
+          <view class="content-item">
+            <view class="item-left">相关主题:</view>
+            <view class="item-right">{{ detailData.Label }}</view>
           </view>
-        </view>
-        <view class="" style="height: 50rpx"></view>
-        <view class="look-Trip" @click="lookImg">
-          查看行程安排
-          <van-icon name="arrow" />
-        </view>
+        </block>
+        <!-- <view class="reminder-item">
+          <image v-if="detailData.TripStatus == 1" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/Y_apply.png"></image>
+          <image v-if="detailData.TripStatus == 2" class="item" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/confirm_XC.png"></image>
+          <image v-if="detailData.Explain" @click="reminderTextHandler(detailData)" class="reminder" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/reminder_icon.png"></image>
+        </view> -->
+        <view class="global_content_center look-Trip" @click="lookImg"> 查看行程安排 > </view>
         <view class="interest-btn">
           <block v-if="detailData.TripStatus == 2">
             <text v-if="detailData.ActiveState == 1" class="button" @click="applyOfcancel(detailData)">
@@ -77,36 +71,36 @@
           </block>
         </view>
       </view>
-      <!-- 权限部分 -->
-      <view v-else>
-        <jurisdiction :idAct="id" :jurisdictionList="jurisdictionList"></jurisdiction>
-      </view>
-      <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-      <u-modal
-        v-model="specialGoFollowShow"
-        :content-style="{ fontSize: '32rpx' }"
-        :show-cancel-button="show_cancel_button"
-        confirm-text="知道了"
-        :show-confirm-button="show_confirm_button"
-        :show-title="false"
-        :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-        :confirm-style="{ fontWeight: '700' }"
-        :mask-close-able="specialIsHintShow"
-        @confirm="ininModalHandler"
-        @cancel="ininModalHandler"
-      >
-        <view class="slot-content">
-          <block v-if="specialPopupMsg">
-            <text>{{ specialAccounts }}</text>
-            <text class="light-hint">{{ specialPopupMsg }}</text>
-          </block>
-          <rich-text v-else :nodes="specialAccounts"></rich-text>
-        </view>
-      </u-modal>
     </view>
-    <not-have-login v-else />
+    <!-- 权限部分 -->
+    <view v-else>
+      <jurisdiction :idAct="id" :jurisdictionList="jurisdictionList"></jurisdiction>
+    </view>
+    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
+    <u-modal
+      v-model="specialGoFollowShow"
+      :content-style="{ fontSize: '32rpx' }"
+      :show-cancel-button="show_cancel_button"
+      confirm-text="知道了"
+      :show-confirm-button="show_confirm_button"
+      :show-title="false"
+      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+      :confirm-style="{ fontWeight: '700' }"
+      :mask-close-able="specialIsHintShow"
+      @confirm="ininModalHandler"
+      @cancel="ininModalHandler"
+    >
+      <view class="slot-content">
+        <block v-if="specialPopupMsg">
+          <text>{{ specialAccounts }}</text>
+          <text class="light-hint">{{ specialPopupMsg }}</text>
+        </block>
+        <rich-text v-else :nodes="specialAccounts"></rich-text>
+      </view>
+    </u-modal>
     <Loading />
-  </block>
+  </view>
+  <not-have-login v-else />
 </template>
 
 <script>
@@ -253,11 +247,10 @@ export default {
 
 <style lang="scss" scoped>
 .special-detail {
-  padding-bottom: 100rpx;
+  background-color: $uni-color-new;
   .top-notice-special {
-    height: 96rpx;
     padding-right: 20rpx;
-    background-color: #fe9000;
+    background-color: #fff1e9;
     position: relative;
     .notice {
       width: 80%;
@@ -267,14 +260,14 @@ export default {
       right: 20rpx;
       top: 50%;
       transform: translateY(-50%);
-      width: 147rpx;
-      height: 40rpx;
-      background: #ffffff;
-      border-radius: 4rpx;
+      width: 140rpx;
+      height: 36rpx;
+      background: #e37318;
+      border-radius: 8rpx;
       text-align: center;
-      line-height: 40rpx;
+      line-height: 36rpx;
       font-size: 24rpx;
-      color: #ff9e58;
+      color: #fff;
     }
   }
   .notice {
@@ -299,35 +292,41 @@ export default {
     }
   }
   .content {
-    padding: 34rpx 34rpx 0rpx;
-    margin-bottom: -20rpx;
+    margin: 30rpx 35rpx;
+    background-color: #fff;
+    padding: 30rpx;
     color: #333333;
     font-size: 28rpx;
     position: relative;
-    view {
-      padding-left: 20rpx;
+    border-radius: 16rpx;
+    overflow: hidden;
+    .content-title {
+      margin: 20rpx 0 30rpx;
     }
-
-    text {
-      line-height: 80rpx;
-      padding-left: 20rpx;
-    }
-
-    .phone {
-      padding: 0;
-      display: inline-block;
-      color: #2c83ff;
+    .content-item {
+      display: flex;
+      font-size: 28rpx;
+      line-height: 40rpx;
+      color: #333;
+      margin-bottom: 20rpx;
+      align-items: flex-start;
+      vertical-align: text-top;
+      .item-left {
+        width: 140rpx;
+        flex-shrink: 0;
+      }
+      .item-right {
+        color: #333;
+      }
     }
     .reminder-item {
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 204rpx;
-      height: 118rpx;
-      z-index: 9;
+      position: relative;
+      margin: -30rpx 0 0 -30rpx;
+      width: 176rpx;
+      height: 48rpx;
       .item {
-        width: 100%;
-        height: 100%;
+        width: 176rpx;
+        height: 48rpx;
       }
       .reminder {
         position: absolute;
@@ -353,108 +352,52 @@ export default {
     .brackets-title {
       padding-left: 20rpx;
     }
-    .city-box {
-      display: flex;
-      align-items: center;
-
-      text {
-        padding: 0;
-      }
-
-      .city {
-        display: flex;
-        color: #2088ff;
-        align-items: center;
-
-        image {
-          width: 27rpx;
-          height: 32rpx;
-          margin-right: 12rpx;
-        }
-      }
-    }
   }
   .light-hint {
     color: #999;
     font-size: 24rpx;
   }
-  .network {
+  .content-item {
     margin-bottom: 30rpx;
     padding: 0 !important;
     display: flex;
-    .network-left {
+    .item-left {
       width: 160rpx;
       text-align-last: justify;
       text-align: justify;
     }
-
-    .network-right {
+    .item-right {
       width: 480rpx;
     }
-    .network-zoom {
-      .text_zoom {
-        width: 100%;
-        word-break: break-all;
-        color: #333333;
-      }
-      view {
-        padding: 0 !important;
-        margin: 0 !important;
-      }
-      .copy-zoom {
-        display: inline-block;
-        padding: 5rpx 17rpx !important;
-        border-radius: 34rpx;
-        background-color: #ebf4ff;
-        font-size: 24rpx;
-        color: #2c83ff;
-        margin: 0 10rpx;
-        margin-top: 30rpx;
-      }
-    }
-    .network-link {
-      width: 520rpx !important;
-      view {
-        padding: 0 !important;
-        margin: 0 !important;
-        width: 100%;
-        display: flex;
-        justify-content: space-between;
-        :first-child {
-          width: 350rpx;
-        }
-        .copy-link {
-          padding: 5rpx 17rpx !important;
-          border-radius: 34rpx;
-          background-color: #ebf4ff;
-          font-size: 24rpx;
-          color: #2c83ff;
-        }
-      }
-    }
   }
 
   .look-Trip {
-    width: 100%;
-    text-align: center;
-    font-size: 28rpx;
-    color: #3385ff;
-    font-weight: 500;
+    margin: 50rpx auto;
+    width: 188rpx;
+    height: 42rpx;
+    font-size: 24rpx;
+    color: $uni-color-new;
+    font-weight: 600;
+    border-radius: 4rpx;
+    background-color: #e5efff;
   }
   .interest-btn {
     width: 100%;
     text-align: center;
     text {
-      width: 318rpx;
-      height: 67rpx;
-      background: #3385ff;
-      font-size: 28rpx;
+      width: 504rpx;
+      height: 60rpx;
+      background: $uni-color-new;
+      font-size: 24rpx;
       color: #fff;
-      font-weight: 500;
-      border-radius: 4rpx;
-      line-height: 67rpx;
-      margin: 90rpx auto 40rpx;
+      font-weight: 600;
+      border-radius: 8rpx;
+      line-height: 60rpx;
+      margin: 30rpx auto 40rpx;
     }
   }
+  /deep/ .van-notice-bar {
+    height: 62rpx;
+  }
 }
 </style>

+ 1 - 1
activityPages/specialResearchPage/specialResearchPage.vue

@@ -242,7 +242,7 @@ export default {
 
 <style lang="scss" scoped>
 .special-research {
-  background: #f7f7f7;
+  background-color: $uni-bg-color;
   position: relative;
   .top-notice {
     display: flex;

+ 6 - 8
activityPages/themeActivity/themeActivity.vue

@@ -95,10 +95,10 @@
                     <image v-else-if="item.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
                     {{ item.ActivityName }}
                   </view>
-                  <text class="text_twoLine" v-if="item.Expert && item.SourceType == 1">专家背景:{{ item.Expert }} </text>
-                  <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾:{{ item.DistinguishedGuest }} </text>
-                  <text class="text_twoLine" v-if="item.Speaker">主讲人:{{ item.Speaker }}</text>
-                  <view style="display: flex" class="text_twoLine" v-if="item.ActivityTimeText && item.SourceType == 2">
+                  <text class="global_activity_content text_twoLine" v-if="item.Expert && item.SourceType == 1">专家背景:{{ item.Expert }} </text>
+                  <text class="global_activity_content text_twoLine" v-if="item.DistinguishedGuest">嘉宾:{{ item.DistinguishedGuest }} </text>
+                  <text class="global_activity_content text_twoLine" v-if="item.Speaker">主讲人:{{ item.Speaker }}</text>
+                  <view style="display: flex" class="global_activity_content text_twoLine" v-if="item.ActivityTimeText && item.SourceType == 2">
                     <text style="flex-shrink: 0"> 活动时间:</text>
                     <text> {{ item.ActivityTimeText }}</text>
                   </view>
@@ -116,9 +116,7 @@
                         <text v-if="item.IsShowMeetingReminder" @click="meetingReminderCheck(item.ActivityId, item.IsCancelMeetingReminder)">
                           {{ item.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
                         </text>
-                        <view v-if="item.IsShowHelpSsk" style="width: 130rpx">
-                          <text @click="askingCheck(item)">帮我带问</text>
-                        </view>
+                        <text v-if="item.IsShowHelpSsk" @click="askingCheck(item)">帮我带问</text>
                         <text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1" class="button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
                         <text v-if="item.IsShowDetails" @click="goDetailCheck(item)" class="button">查看详情</text>
                         <block v-if="item.IsShowSignup">
@@ -379,7 +377,7 @@ export default {
 
 <style lang="scss" scoped>
 .theme-container {
-  background: #f7f7f7;
+  background-color: $uni-bg-color;
   padding-bottom: 30rpx;
   position: relative;
   .top-title {

+ 3 - 5
components/ItemComponent/activityItem.vue

@@ -31,11 +31,11 @@
       <mp-html :content="richTextClamp(3) + (list.ActivityName || list.ResearchTheme) + '</div>'" />
     </view>
 
-    <view style="display: flex" class="content-text text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
+    <view style="display: flex" class="global_content content-text text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
       <text> 活动时间:{{ list.ActivityTimeText }}</text>
     </view>
 
-    <view class="content-text text-Line" v-else>
+    <view class="global_content content-text text-Line" v-else>
       {{ list.Host ? "主持人:" : list.Expert ? "专家背景:" : list.Speaker ? "主讲人:" : list.DistinguishedGuest ? "嘉宾:" : "" }}
       {{ list.Host ? list.Host : list.Expert ? list.Expert : list.Speaker ? list.Speaker : list.DistinguishedGuest ? list.DistinguishedGuest : "" }}
     </view>
@@ -56,9 +56,7 @@
           <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.IsShowHelpSsk" @click.stop="askingGo(list)">帮我带问</text>
           <text class="item-btn btn-solid" v-if="list.IsShowOutboundCall && list.ActivityTypeId != 1" @click.stop="signupIsAddOfCancel(list, 1)">{{
             list.IsSignup == 1 ? "取消外呼" : "预约外呼"
           }}</text>

+ 262 - 270
components/activity/purchaserActivityList.vue

@@ -1,277 +1,269 @@
 <template>
-	<block v-if="isLoad">
-		<view class="purchaser-activity-list" v-if="collectList && collectList.length > 0">
-			<view class="purchaser-activity-box" v-for="(item,index) in collectList" :key="item.ActivityId"
-			:style="{'border-color':item.ActivityType==1?'#8FA4C4':'#E7E0CD'}">
-				<view class="purchaser-activity-head" >
-					<text :class="item.ActivityType == 1 ? 'online' : 'offline'" 
-					class="activity-which-line">{{ item.ActivityType == 1 ? "线上" : "线下" }}</text>
-					<text class="activity-label-text">
-						{{item.ActivityTypeName}}
-					</text>
-					<text class="activity-label-text">
-						{{item.Label}}
-					</text>
-				</view>
-				<view class="activity-title text_twoLine" @click="goDetailCheck(item)">
-					<image v-if="item.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
-					<!-- <image v-else-if="item.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image> -->
-					<image v-else-if="item.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
-					{{ item.ActivityName }}
-				</view>
-				<view class="activity-time-city-row" @click="goDetailCheck(item)">
-					<text class="activity-time">{{ item.SourceType == 2 ? "" : item.ActivityTimeText }}</text>
-					<view class="activity-city" v-if="item.City">
-						<image src="https://hzstatic.hzinsights.com/cygx/icon/location-new.png"></image>
-						{{ item.City }}
-					</view>
-				</view>
-				<view class="activity-buttons-row" v-if="isUserBindingPhoneNumber">
-					<block v-if="item.ActiveState == 1">
-						<text v-if="item.IsShowOutboundCall && item.ActivityTypeId == 1"
-						class="main-button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-						<text v-if="item.IsShowAppointment" @click="summaryHandelCheck(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
-						<text v-if="item.IsShowMeetingReminder" @click="meetingReminderCheck(item.ActivityId, item.IsCancelMeetingReminder)">
-							{{ item.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
-						</text>
-						<view v-if="item.IsShowHelpSsk">
-							<text @click="askingCheck(item)">帮我带问</text>
-						</view>
-						<text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1"
-						 class="main-button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-						<text v-if="item.IsShowDetails" @click="goDetailCheck(item)" class="main-button">查看详情</text>
-						<block v-if="item.IsShowSignup">
-							<block v-if="item.IsCClassMeeting && !item.IsYidongConduct">
-								<text class="main-button" @click="signupCheck(item, 3, 'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
-							</block>
-							<block v-else>
-								<text class="main-button" v-if="item.IsSignup !== 1" @click="wanttosignupCheck(item)">我要报名</text>
-								<text class="main-button" v-else @click="signupCheck(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
-							</block>
-						</block>
-					</block>
-					<view class="bottom-box real-time" v-if="item.ActiveState == 2 && item.ActivityTypeId == 1">
-						<text class="main-button" @click="askingCheck(item, '提问')">实时提问</text>
-					</view>
-				</view>
-			</view>
-			<slot name="finished"></slot>
-			<SelectPopup :selectShow.sync="selectShow" @signupIsAddOfCancel="signupIsAddOfCancel" :selectYdong="selectYdong" />
-			<!-- 所有自定义弹框 -->
-			<modalDialog
-				:isShow="isShow"
-				:signupType="signupType"
-				:goFollow="goFollow"
-				:hasPermission="hasPermission"
-				:jurisdictionList="jurisdictionList"
-				:editIsShow="editIsShow"
-				:isCancelShow="isCancelShow"
-				:idTypeCancel="idTypeCancel"
-				:countryCode="countryCode"
-				:mobileEdit="mobileEdit"
-				:goOnNextStep="goOnNextStep"
-				:isShowhasPermission="isShowhasPermission"
-				:applyForIsShow="applyForIsShow"
-				:mailboxBinding="mailboxBinding"
-			/>
-			 <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
-		</view>
-		<slot v-else></slot>
-	</block>
-	<view  v-else>
-		
-	</view>
+  <block v-if="isLoad">
+    <view class="purchaser-activity-list" v-if="collectList && collectList.length > 0">
+      <view class="purchaser-activity-box" v-for="(item, index) in collectList" :key="item.ActivityId" :style="{ 'border-color': item.ActivityType == 1 ? '#8FA4C4' : '#E7E0CD' }">
+        <view class="purchaser-activity-head">
+          <text :class="item.ActivityType == 1 ? 'online' : 'offline'" class="activity-which-line">{{ item.ActivityType == 1 ? "线上" : "线下" }}</text>
+          <text class="activity-label-text">
+            {{ item.ActivityTypeName }}
+          </text>
+          <text class="activity-label-text">
+            {{ item.Label }}
+          </text>
+        </view>
+        <view class="activity-title text_twoLine" @click="goDetailCheck(item)">
+          <image v-if="item.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
+          <!-- <image v-else-if="item.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image> -->
+          <image v-else-if="item.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
+          {{ item.ActivityName }}
+        </view>
+        <view class="activity-time-city-row" @click="goDetailCheck(item)">
+          <text class="activity-time">{{ item.SourceType == 2 ? "" : item.ActivityTimeText }}</text>
+          <view class="activity-city" v-if="item.City">
+            <image src="https://hzstatic.hzinsights.com/cygx/icon/location-new.png"></image>
+            {{ item.City }}
+          </view>
+        </view>
+        <view class="activity-buttons-row" v-if="isUserBindingPhoneNumber">
+          <block v-if="item.ActiveState == 1">
+            <text v-if="item.IsShowOutboundCall && item.ActivityTypeId == 1" class="main-button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+            <text v-if="item.IsShowAppointment" @click="summaryHandelCheck(item)">{{ item.IsAppointment == 1 ? "取消纪要" : "预约纪要" }}</text>
+            <text v-if="item.IsShowMeetingReminder" @click="meetingReminderCheck(item.ActivityId, item.IsCancelMeetingReminder)">
+              {{ item.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
+            </text>
+            <text v-if="item.IsShowHelpSsk" @click="askingCheck(item)">帮我带问</text>
+            <text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1" class="main-button" @click="signupCheck(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
+            <text v-if="item.IsShowDetails" @click="goDetailCheck(item)" class="main-button">查看详情</text>
+            <block v-if="item.IsShowSignup">
+              <block v-if="item.IsCClassMeeting && !item.IsYidongConduct">
+                <text class="main-button" @click="signupCheck(item, 3, 'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
+              </block>
+              <block v-else>
+                <text class="main-button" v-if="item.IsSignup !== 1" @click="wanttosignupCheck(item)">我要报名</text>
+                <text class="main-button" v-else @click="signupCheck(item, 2)">{{ item.SignupType == 1 ? "取消外呼" : "取消报名" }}</text>
+              </block>
+            </block>
+          </block>
+          <view class="bottom-box real-time" v-if="item.ActiveState == 2 && item.ActivityTypeId == 1">
+            <text class="main-button" @click="askingCheck(item, '提问')">实时提问</text>
+          </view>
+        </view>
+      </view>
+      <slot name="finished"></slot>
+      <SelectPopup :selectShow.sync="selectShow" @signupIsAddOfCancel="signupIsAddOfCancel" :selectYdong="selectYdong" />
+      <!-- 所有自定义弹框 -->
+      <modalDialog
+        :isShow="isShow"
+        :signupType="signupType"
+        :goFollow="goFollow"
+        :hasPermission="hasPermission"
+        :jurisdictionList="jurisdictionList"
+        :editIsShow="editIsShow"
+        :isCancelShow="isCancelShow"
+        :idTypeCancel="idTypeCancel"
+        :countryCode="countryCode"
+        :mobileEdit="mobileEdit"
+        :goOnNextStep="goOnNextStep"
+        :isShowhasPermission="isShowhasPermission"
+        :applyForIsShow="applyForIsShow"
+        :mailboxBinding="mailboxBinding"
+      />
+      <ShowResearchDlg :isResearchModalShow.sync="isResearchModalShow" :jurisdictionList="jurisdictionList" :checkResearchList.sync="checkResearchList" />
+    </view>
+    <slot v-else></slot>
+  </block>
+  <view v-else> </view>
 </template>
 
 <script>
-	import myActivityMixin from "@/components/activity/indexActivity.js";
-	import modalDialog from "@/components/modalDialog.vue";
-	import SelectPopup from "@/components/activity/selectPopup";
-	import {  activity} from "@/config/api.js";
-	import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
-	export default {
-		mixins: [myActivityMixin],
-		components:{modalDialog,SelectPopup,ShowResearchDlg},
-		props:{
-			// 1-未开始、进行中 0-已结束
-			activityType:{
-				type: Number,
-				default:1
-			},
-			whichDay:{
-				type: String,
-				default:''
-			},
-			typeName:{
-				type: String,
-				default:''
-			}
-		},
-		data(){
-			return {
-				pageSize:10,
-				page_no:1,
-				collectList:[],
-				pages:0,
-				isLoad:false
-			}
-		},
-		methods:{
-			// 获取列表数据
-			async getActivityList() {
-			  const res = await activity.getActivityListNew({
-			    PageSize: this.pageSize,
-			    CurrentIndex: this.page_no,
-					IsResearch:true,
-					ActiveState:this.activityType==1? '':3,
-					WhichDay:this.whichDay,
-					ActivityTypeId:this.typeName
-			  })
-			  if (res.Ret === 200) {
-			    if (this.page_no === 1) {
-			      this.collectList = res.Data.List || [];
-			    } else {
-			      this.collectList = this.collectList.concat(res.Data.List || []);
-			    }
-					this.pages = res.Data.Paging.Pages || 0
-					this.isLoad=true
-			  }
-			},
-			reloadActivityList(){
-				this.page_no=1
-				this.getActivityList()
-			},
-			loadActivityMore(){
-				this.page_no++
-				this.getActivityList()
-			},
-		},
-		created() {
-			// this.getActivityList()
-		}
-	}
+import myActivityMixin from "@/components/activity/indexActivity.js";
+import modalDialog from "@/components/modalDialog.vue";
+import SelectPopup from "@/components/activity/selectPopup";
+import { activity } from "@/config/api.js";
+import ShowResearchDlg from "@/components/activity/showResearchDlg.vue";
+export default {
+  mixins: [myActivityMixin],
+  components: { modalDialog, SelectPopup, ShowResearchDlg },
+  props: {
+    // 1-未开始、进行中 0-已结束
+    activityType: {
+      type: Number,
+      default: 1,
+    },
+    whichDay: {
+      type: String,
+      default: "",
+    },
+    typeName: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      pageSize: 10,
+      page_no: 1,
+      collectList: [],
+      pages: 0,
+      isLoad: false,
+    };
+  },
+  methods: {
+    // 获取列表数据
+    async getActivityList() {
+      const res = await activity.getActivityListNew({
+        PageSize: this.pageSize,
+        CurrentIndex: this.page_no,
+        IsResearch: true,
+        ActiveState: this.activityType == 1 ? "" : 3,
+        WhichDay: this.whichDay,
+        ActivityTypeId: this.typeName,
+      });
+      if (res.Ret === 200) {
+        if (this.page_no === 1) {
+          this.collectList = res.Data.List || [];
+        } else {
+          this.collectList = this.collectList.concat(res.Data.List || []);
+        }
+        this.pages = res.Data.Paging.Pages || 0;
+        this.isLoad = true;
+      }
+    },
+    reloadActivityList() {
+      this.page_no = 1;
+      this.getActivityList();
+    },
+    loadActivityMore() {
+      this.page_no++;
+      this.getActivityList();
+    },
+  },
+  created() {
+    // this.getActivityList()
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	// 从查研观向11.0 版本开始陆续更换各个页面的页面主题。先从研选页面开始
-	.purchaser-activity-box{
-		width: 100%;
-		padding: 40rpx 20rpx 30rpx;
-		border-top: solid 10rpx ;
-		border-radius: 16rpx;
-		background-color: white;
-		margin-bottom: 20rpx;
-		.purchaser-activity-head{
-			display: flex;
-			align-items: center;
-			margin-bottom: 40rpx;
-			.activity-which-line{
-				min-width: 110rpx;
-				height: 40rpx;
-				border-radius: 4rpx;
-				font-size: 24rpx;
-				line-height: 34rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				color: #333333;
-				font-weight: 500;
-			}
-			.online{
-				background-color: #DFE8FF;
-			}
-			.offline{
-				background-color: #F2E8CC;
-			}
-			.activity-label-text{
-				white-space: nowrap;
-				margin-left: 20rpx;
-				background-color:#F0F1F3 ;
-				color: #333333;
-				font-weight: 400;
-				font-size: 24rpx;
-				line-height: 34rpx;
-				height: 40rpx;
-				min-width: 154rpx;
-				padding: 0 12rpx;
-				border-radius: 40rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				&:last-child{
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					display: block;
-					padding: 4rpx 12rpx;
-					text-align: center;
-				}
-			}
-		}
-		.activity-title{
-			font-weight: 700;
-			margin-bottom: 20rpx;
-			image{
-				width: 73rpx;
-				height: 30rpx;
-				vertical-align: bottom;
-				margin-right: 8rpx;
-				margin-bottom: 4rpx;
-			}
-		}
-		.activity-time-city-row{
-			display: flex;
-			margin-bottom: 40rpx;
-			.activity-time{
-				font-size: 24rpx;
-				font-weight: 400;
-				line-height: 34rpx;
-				color: #333333;
-				margin-right: 20rpx;
-				white-space: nowrap;
-			}
-			.activity-city{
-				display: flex;
-				align-items: center;
-				font-size: 24rpx;
-				line-height: 34rpx;
-				color: #376CBB;
-				overflow: hidden;
-				image{
-					height: 24rpx;
-					min-width: 24rpx;
-					width: 24rpx;
-				}
-				text{
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-				}
-			}
-		}
-		.activity-buttons-row{
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
-			text{
-				height: 52rpx;
-				min-width: 136rpx;
-				width: 136rpx;
-				padding: 4rpx 20rpx;
-				box-sizing: border-box;
-				color: #376CBB;
-				background-color: white;
-				border: solid 2rpx #376CBB;
-				white-space: nowrap;
-				font-size: 24rpx;
-				line-height: 44rpx;
-				margin-left: 20rpx;
-				border-radius: 52rpx;
-			}
-			.main-button{
-				color: white;
-				background-color: #376CBB;
-			}
-		}
-	}
-</style>
+// 从查研观向11.0 版本开始陆续更换各个页面的页面主题。先从研选页面开始
+.purchaser-activity-box {
+  width: 100%;
+  padding: 40rpx 20rpx 30rpx;
+  border-top: solid 10rpx;
+  border-radius: 16rpx;
+  background-color: white;
+  margin-bottom: 20rpx;
+  .purchaser-activity-head {
+    display: flex;
+    align-items: center;
+    margin-bottom: 40rpx;
+    .activity-which-line {
+      min-width: 110rpx;
+      height: 40rpx;
+      border-radius: 4rpx;
+      font-size: 24rpx;
+      line-height: 34rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #333333;
+      font-weight: 500;
+    }
+    .online {
+      background-color: #dfe8ff;
+    }
+    .offline {
+      background-color: #f2e8cc;
+    }
+    .activity-label-text {
+      white-space: nowrap;
+      margin-left: 20rpx;
+      background-color: #f0f1f3;
+      color: #333333;
+      font-weight: 400;
+      font-size: 24rpx;
+      line-height: 34rpx;
+      height: 40rpx;
+      min-width: 154rpx;
+      padding: 0 12rpx;
+      border-radius: 40rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      &:last-child {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        display: block;
+        padding: 4rpx 12rpx;
+        text-align: center;
+      }
+    }
+  }
+  .activity-title {
+    font-weight: 700;
+    margin-bottom: 20rpx;
+    image {
+      width: 73rpx;
+      height: 30rpx;
+      vertical-align: bottom;
+      margin-right: 8rpx;
+      margin-bottom: 4rpx;
+    }
+  }
+  .activity-time-city-row {
+    display: flex;
+    margin-bottom: 40rpx;
+    .activity-time {
+      font-size: 24rpx;
+      font-weight: 400;
+      line-height: 34rpx;
+      color: #333333;
+      margin-right: 20rpx;
+      white-space: nowrap;
+    }
+    .activity-city {
+      display: flex;
+      align-items: center;
+      font-size: 24rpx;
+      line-height: 34rpx;
+      color: #376cbb;
+      overflow: hidden;
+      image {
+        height: 24rpx;
+        min-width: 24rpx;
+        width: 24rpx;
+      }
+      text {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+  .activity-buttons-row {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    text {
+      height: 52rpx;
+      min-width: 136rpx;
+      width: 136rpx;
+      padding: 4rpx 20rpx;
+      box-sizing: border-box;
+      color: #376cbb;
+      background-color: white;
+      border: solid 2rpx #376cbb;
+      white-space: nowrap;
+      font-size: 24rpx;
+      line-height: 44rpx;
+      margin-left: 20rpx;
+      border-radius: 52rpx;
+    }
+    .main-button {
+      color: white;
+      background-color: #376cbb;
+    }
+  }
+}
+</style>

+ 1 - 1
components/activity/showResearchDlg.vue

@@ -177,7 +177,7 @@ export default {
       width: 100%;
       height: 78rpx;
       line-height: 78rpx;
-      background: #f7f7f7;
+      background-color: $uni-bg-color;
       text-align: left;
       padding-left: 30rpx;
     }

+ 1 - 1
pageMy/advice/advice.vue

@@ -181,7 +181,7 @@ export default {
       &.upload-ico {
         padding-top: 50rpx;
         text-align: center;
-        background-color: #f7f7f7;
+        background-color: $uni-bg-color;
         color: #4a4a4a;
         .add-tip {
           margin-top: 10rpx;

+ 1 - 1
pageMy/applyInterview/applyInterview.vue

@@ -111,7 +111,7 @@ export default {
 
 <style lang="scss" scoped>
 .applyInterview-container {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   .apply-ul {
     padding: 5rpx 0;
     .apply-ltem {

+ 1 - 2
pageMy/applyTrial/applyTrial.vue

@@ -133,7 +133,6 @@ export default {
   }
   .tip {
     padding: 11rpx 32rpx;
-    // background: #f7f7f7; 
     color: #b2b2b2;
     font-size: 24rpx;
   }
@@ -158,7 +157,7 @@ export default {
       &.upload-ico {
         padding-top: 50rpx;
         text-align: center;
-        background-color: #f7f7f7;
+        background-color: $uni-bg-color;
         color: #4a4a4a;
         margin-right: 20rpx;
         .add-tip {

+ 6 - 8
pageMy/mySchedulepage/mySchedulepage.vue

@@ -44,10 +44,10 @@
                 <image v-else-if="item.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
                 {{ item.ActivityName }}
               </view>
-              <text class="text_twoLine" v-if="item.Expert && item.SourceType == 1">专家背景:{{ item.Expert }} </text>
-              <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾:{{ item.DistinguishedGuest }} </text>
-              <text class="text_twoLine" v-if="item.Speaker">主讲人:{{ item.Speaker }}</text>
-              <view style="display: flex" class="text_twoLine" v-if="item.ActivityTimeText && item.SourceType == 2">
+              <text class="global_activity_content text_twoLine" v-if="item.Expert && item.SourceType == 1">专家背景:{{ item.Expert }} </text>
+              <text class="global_activity_content text_twoLine" v-if="item.DistinguishedGuest">嘉宾:{{ item.DistinguishedGuest }} </text>
+              <text class="global_activity_content text_twoLine" v-if="item.Speaker">主讲人:{{ item.Speaker }}</text>
+              <view style="display: flex" class="global_activity_content text_twoLine" v-if="item.ActivityTimeText && item.SourceType == 2">
                 <text style="flex-shrink: 0"> 活动时间:</text>
                 <text> {{ item.ActivityTimeText }}</text>
               </view>
@@ -65,9 +65,7 @@
                     <text v-if="item.IsShowMeetingReminder" @click="meetingReminderAdd(item.ActivityId, item.IsCancelMeetingReminder)">
                       {{ item.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
                     </text>
-                    <view v-if="item.IsShowHelpSsk" style="width: 130rpx">
-                      <text @click="askingGo(item)">帮我带问</text>
-                    </view>
+                    <text v-if="item.IsShowHelpSsk" @click="askingGo(item)">帮我带问</text>
                     <text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1" class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
                     <text v-if="item.IsShowDetails" @click="goDetail(item)" class="button">查看详情</text>
                     <block v-if="item.IsShowSignup">
@@ -275,7 +273,7 @@ export default {
 
 <style scoped lang="scss">
 .activity-content {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   padding-bottom: 90rpx;
   position: relative;
   padding-top: 20rpx;

+ 1 - 1
pageMy/reportDetail/reportDetail.vue

@@ -502,7 +502,7 @@ export default {
       }
     }
     .product-introduction-box {
-      background-color: #f7f7f7;
+      background-color: $uni-bg-color;
       padding-top: 10rpx;
       margin-top: 60rpx;
       .product-introduction {

+ 1 - 1
pageMy/reportPage/reportPage.vue

@@ -641,7 +641,7 @@ export default {
       }
     }
     .product-introduction-box {
-      background-color: #f7f7f7;
+      background-color: $uni-bg-color;
       padding-top: 10rpx;
       margin-top: 60rpx;
       .product-introduction {

+ 1 - 1
pages-purchaser/lastestReport/lastestReport.vue

@@ -139,7 +139,7 @@ export default {
 <style lang="scss" scoped>
 @import "../components/purchaser-report-list.scss";
 .lastest-report-container {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   padding-top: 20rpx;
   box-sizing: border-box;
   .checkbox-ui {

+ 472 - 331
pages-purchaser/researchList/researchList.vue

@@ -1,339 +1,480 @@
 <template>
-	<view class="research-list-container">
-		<view class="announcement">
-		  <view class="tab-cont">
-		    <scroll-view
-		      scroll-x="true"
-		      scroll-with-animation
-		      class="scroll-tab"
-		      :scroll-into-view="'_' + tabIndex"
-		    >
-		      <block v-for="(item, index) in researchTabBars" :key="index">
-		        <view class="scroll-tab-item" :class="{ active: tagActive == item.name }" @click.stop="typeChange(item)">
-		          {{ item.titel }}
-		          <image
-		            src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/border_act.png"
-		            mode=""
-		            class="border_act"
-		            v-if="tagActive == item.name"
-		          ></image>
-		        </view>
-		      </block>
-		    </scroll-view>
-		  </view>
-		  <view class="content-ul" v-if="tagActive == '用户'">
-				<view class="user-li" v-for="(item, index) in collectionList" :key="item.ArticleId">
-					<view class="li-item">
-						<text class="li-serial" :style="{ background: serialBackground(index) }">
-							{{ index + 1 }}
-						</text>
-						<view>
-							<text
-								class="title"
-								@click="goDetail(item)"
-								:style="{ display: 'inline', marginLeft: item.Title.substr(0, 1) != '【' ? '14rpx' : 0 }"
-								>{{ item.Title }}</text
-							>
-							<text class="li-industry" @click="themeDetails(key, '月度收藏榜')" v-for="key in item.List" :key="key.IndustrialManagementId">
-								# {{ key.IndustryName }}
-							</text>
-						</view>
-					</view>
-					<view class="li-item li-bottom" style="color: #999999">
-						<viwe class="time-user">
-							<text>
-								{{ item.PublishDate }}
-							</text>
-							<view class="li-user" @click="authorDetails(item)">
-								<image class="user_report-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
-								<text class="text_oneLine"> {{ item.NickName }}</text>
-							</view>
-						</viwe>
-	
-						<view class="li-item user-img">
-							<view class="img-box">
-								<image class="user-pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/examine_icon.png"></image>
-								<text>
-									{{ item.Pv }}
-								</text>
-							</view>
-							<view class="img-box" @click="collectClick(item)">
-								<image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_act.png"></image>
-								<image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/collect_ico.png"></image>
-								<text class=""> {{ item.CollectNum }}人收藏 </text>
-							</view>
-						</view>
-					</view>
-				</view>
-		    <!-- <view class="content-bottom">最新榜单您已掌握,明天再刷刷看~</view> -->
-		  </view>
-		
-		  <view class="content-ul" v-if="hotList.length && tagActive == '主题'">
-		    <view class="hot-li" v-for="(item, index) in hotList" :key="item.IndustrialManagementId">
-		      <view class="li-item hot-item">
-		        <view style="display: flex" class="text_oneLine hot-new" @click="themeDetails(item, '主题热度榜')">
-		          <text class="li-serial serial-number" :style="{ background: serialBackground(index) }">
-		            {{ index + 1 }}
-		          </text>
-		          <text class="text_oneLine title" style="display: inline"> # {{ item.IndustryName }} </text>
-		          <image class="new-img" v-if="item.IsNew" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png"></image>
-		        </view>
-		        <text :class="item.IsFollw ? 'cancel-attention' : 'attention'" @click="isAttention(item, '主题')">{{
-		          item.IsFollw ? "取消关注" : "+ 关注"
-		        }}</text>
-		      </view>
-		      <view class="li-item read-more" @click="themeDetails(item, '主题热度榜')">
-		        <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
-		          {{ val.SubjectName }}
-		        </text>
-		      </view>
-		    </view>
-		    <view class="content-button" @click="goThemeAuthor('主题')">查看全部主题>></view>
-		  </view>
-		  <view class="content-ul" v-if="kolList.length && tagActive == '专家'">
-		    <view class="kol-li" v-for="(item, index) in kolList" :key="item.DepartmentId">
-		      <text class="li-serial serial-number" :style="{ background: serialBackground(index) }">
-		        {{ index + 1 }}
-		      </text>
-		      <image @click="authorDetails(item)" :src="item.ImgUrl" v-if="item.ImgUrl"></image>
-		      <view class="li-item kol-item">
-		        <view class="item-top">
-		          <text @click="authorDetails(item)">
-		            {{ item.NickName }}
-		          </text>
-		          <text :class="item.IsFollw ? 'cancel-attention' : 'attention'" @click="isAttention(item, '专家')">{{
-		            item.IsFollw ? "取消关注" : "+ 关注"
-		          }}</text>
-		        </view>
-		        <text @click="themeDetails(val, 'KOL榜')" class="kol-text text_oneLine" v-for="val in item.List" :key="val.IndustrialManagementId">
-		          # {{ val.IndustryName }}
-		        </text>
-		      </view>
-		    </view>
-		    <view class="content-button" @click="goThemeAuthor('作者')">查看全部作者>></view>
-		  </view>
-		</view>
-		<u-modal
-		  v-model="goFollowShow"
-		  :content-style="{ fontSize: '32rpx' }"
-		  @confirm="goFollowShowBtn"
-		  :show-cancel-button="isCancelBtn"
-		  :confirm-text="confirmText"
-		  @cancel="isCancelBtn = false"
-		  :show-title="false"
-		  :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
-		  :confirm-style="{ fontWeight: '700' }"
-		>
-		  <view class="slot-content">
-		    <rich-text :nodes="accounts"></rich-text>
-		  </view>
-		</u-modal>
-		<Loading />
-	</view>
+  <view class="container research-list-container">
+    <view class="top-content">
+      <view class="global_one_tabs">
+        <view v-for="(item, index) in researchTabBars" :key="index" :class="['item', tagActive == item.name && 'tabs-active']" @click="typeChange(item)">
+          {{ item.titel }}
+        </view>
+      </view>
+    </view>
+    <view class="content-ul" v-if="tagActive == '用户'">
+      <view class="global_card_content user-li" v-for="(item, index) in collectionList" :key="item.ArticleId">
+        <view class="li-item">
+          <view class="li-serial" :style="{ background: serialBackground(index) }">
+            {{ index + 1 }}
+          </view>
+          <view>
+            <text class="global_title" @click="goDetail(item)" :style="{ display: 'inline', marginLeft: item.Title.substr(0, 1) != '【' ? '14rpx' : 0 }">{{ item.Title }}</text>
+            <text class="li-industry" @click="themeDetails(key, '月度收藏榜')" v-for="key in item.List" :key="key.IndustrialManagementId"> # {{ key.IndustryName }} </text>
+          </view>
+        </view>
+        <view class="li-bottom" style="color: #999999">
+          <viwe class="time-user">
+            <view class="time">
+              {{ item.PublishDate }}
+            </view>
+            <view class="li-user" @click="authorDetails(item)">
+              <image class="user_report-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/user_report.png"></image>
+              <text class="text_oneLine"> {{ item.NickName }}</text>
+            </view>
+          </viwe>
+
+          <view class="user-img">
+            <view class="img-box">
+              <image class="user-pv" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/examine_icon.png"></image>
+              <text>
+                {{ item.Pv }}
+              </text>
+            </view>
+            <view class="img-box" @click="collectClick(item)">
+              <image v-if="item.IsCollect" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_act.png"></image>
+              <image v-else src="https://hzchart.oss-cn-shanghai.aliyuncs.com/new_cygx/collect_ico.png"></image>
+              <text class=""> {{ item.CollectNum }} </text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="content-ul" v-if="hotList.length && tagActive == '主题'">
+      <view class="global_card_content hot-li" v-for="(item, index) in hotList" :key="item.IndustrialManagementId">
+        <view class="li-item hot-item">
+          <view style="display: flex" class="text_oneLine hot-new" @click="themeDetails(item, '主题热度榜')">
+            <view class="li-serial serial-number" :style="{ background: serialBackground(index) }">
+              {{ index + 1 }}
+            </view>
+            <text class="global_title text_oneLine" style="display: inline"> # {{ item.IndustryName }} </text>
+            <image class="new-img" v-if="item.IsNew" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png"></image>
+          </view>
+          <view :class="['follw', 'global_content_center', item.IsFollw && 'cancel-follw']" @click="isAttention(item, '主题')">
+            {{ item.IsFollw ? "取消关注" : "+ 关注" }}
+          </view>
+        </view>
+        <view class="li-item read-more" @click="themeDetails(item, '主题热度榜')">
+          <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
+            {{ val.SubjectName }}
+          </text>
+        </view>
+      </view>
+      <view class="content-button" @click="goThemeAuthor('主题')">查看全部主题>></view>
+    </view>
+    <view class="content-ul" v-if="kolList.length && tagActive == '专家'">
+      <view class="global_card_content kol-li" v-for="(item, index) in kolList" :key="item.DepartmentId">
+        <view class="li-serial serial-number" :style="{ background: serialBackground(index) }">
+          {{ index + 1 }}
+        </view>
+        <image @click="authorDetails(item)" :src="item.ImgUrl" v-if="item.ImgUrl"></image>
+        <view class="li-item kol-item">
+          <view class="item-top">
+            <text @click="authorDetails(item)">
+              {{ item.NickName }}
+            </text>
+            <view :class="['follw', 'global_content_center', item.IsFollw && 'cancel-follw']" @click="isAttention(item, '专家')">
+              {{ item.IsFollw ? "取消关注" : "+ 关注" }}
+            </view>
+          </view>
+          <text @click="themeDetails(val, 'KOL榜')" class="kol-text text_oneLine" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
+        </view>
+      </view>
+      <view class="content-button" @click="goThemeAuthor('作者')">查看全部作者>></view>
+    </view>
+
+    <u-modal
+      v-model="goFollowShow"
+      :content-style="{ fontSize: '32rpx' }"
+      @confirm="goFollowShowBtn"
+      :show-cancel-button="isCancelBtn"
+      :confirm-text="confirmText"
+      @cancel="isCancelBtn = false"
+      :show-title="false"
+      :cancel-style="{ borderRight: '1rpx solid #EBEBEB' }"
+      :confirm-style="{ fontWeight: '700' }"
+    >
+      <view class="slot-content">
+        <rich-text :nodes="accounts"></rich-text>
+      </view>
+    </u-modal>
+    <Loading />
+  </view>
 </template>
 
 <script>
-	import { Reports, Research } from "@/config/api.js";
-	import purchaserReportListMixins from "../components/purchaser-report-list-mixins.js";
-	export default {
-		
-		data() {
-			return {
-				accounts: "",
-				tagActive: "用户",
-				collectionList: [], //用户收藏
-				hotList: [],
-				kolList: [],
-				researchTabBars:[
-					{ titel: "月度收藏榜", name: "用户" },
-					{ titel: "主题热度榜", name: "主题" },
-					{ titel: "KOL榜", name: "专家" },
-				],
-				confirmText: "知道了",
-				isCancelBtn: false,
-				goFollowShow: false,
-			}
-		},
-		// purchaserReportListMixins 混入了 收藏、作者详情、文章详情、主题详情-method
-		mixins:[purchaserReportListMixins],
-		watch: {
-		  tagActive: {
-		    handler(val) {
-		      val == "用户" ? this.researchCollectionList() : val == "主题" ? this.researchHotList() : this.researchKolList();
-		    },
-		    immediate: true,
-		  },
-		},
-		mounted() {
-		  // 处理数据 列表同步详情
-		  uni.$on("updateFllowTheme", (data) => {
-		    this.hotList.forEach((item) => {
-		      if (item.IndustrialManagementId == data.id) {
-		        item.IsFollw = data.isFollw;
-		      }
-		    });
-		  });
-		  // 处理数据 列表同步详情
-		  uni.$on("updateFllowAuthor", (data) => {
-		    this.kolList.forEach((item) => {
-		      if (item.DepartmentId == data.id) {
-		        item.IsFollw = data.isFollw;
-		      }
-		    });
-		  });
-		},
-		methods: {
-			//tabs切换
-			typeChange(item) {
-			  this.tagActive = item.name;
-			},
-			//计算遍历的颜色
-			serialBackground(index) {
-			  index += 1;
-			  return index == 1 ? "#D7584F" : index == 2 ? "#E98033" : index == 3 ? "#FDD367" : "#D3D3D3";
-			},
-			//用户收藏榜
-			async researchCollectionList() {
-			  const res = await Research.researchCollectionList({ ChartPermissionId: 31 });
-			  if (res.Ret === 200) {
-			    this.collectionList = res.Data.List || [];
-			  }
-			},
-			//主题热度/近期更新更多
-			async researchHotList() {
-			  const res = await Research.researchHotList({ ChartPermissionId: 31, ThemeType: 1 });
-			  if (res.Ret === 200) {
-			    this.hotList = res.Data.List || [];
-			  }
-			},
-			//KOL榜列表接口
-			async researchKolList() {
-			  const res = await Research.researchKolList({ ChartPermissionId: 31 });
-			  if (res.Ret === 200) {
-			    this.kolList = res.Data.List || [];
-			  }
-			},
-			//关注
-			async isAttention(item, val) {
-			  await this.$store.dispatch("showLoginModal");
-			  const res =
-			    val === "主题"
-			      ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId, PageRouter: this.$store.state.pageRouterReport })
-			      : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId, PageRouter: this.$store.state.pageRouterReport });
-			  if (res.Ret === 200) {
-			    item.IsFollw = !item.IsFollw;
-			    if (res.Data.Status == 1) {
-			      this.goFollowShow = true;
-			      this.confirmText = res.Data.GoFollow ? "去关注" : "知道了";
-			      if (res.Data.GoFollow) {
-			        this.accounts = `${val == "主题" ? "产业" : "作者"}关注成功 <br> 想要及时获取该${
-			          val === "主题" ? "产业内容的更新推送" : "作者的报告更新提示"
-			        },请关注【查研观向小助手】公众号`;
-			        this.isCancelBtn = true;
-			      } else {
-			        this.accounts =
-			          `${val == "主题" ? "产业" : "作者"}` +
-			          `关注成功<br>请关注【查研观向小助手】公众号,及时获取${val === "主题" ? "产业" : "作者"}报告更新提醒`;
-			      }
-			    } else {
-			      uni.showToast({
-			        title: "已取消关注",
-			        icon: "none",
-			        duration: 2000,
-			      });
-			    }
-			  }
-			},
-			//去关注
-			goFollowShowBtn() {
-			  if (this.confirmText == "去关注") {
-			    uni.navigateTo({
-			      url: "/activityPages/accountsOfficial/accountsOfficial",
-			    });
-			  }
-			  this.goFollowShow = false;
-			},
-			// 跳转主题 of 作者
-			goThemeAuthor(type) {
-			  type === "主题"
-			    ? uni.navigateTo({ url: "/pages-purchaser/researchTheme/researchTheme" })
-			    : uni.navigateTo({ url: "/pages-purchaser/researchAuthor/researchAuthor" });
-			},
-			loadShare(option){
-				this.tagActive = option.tagActive || "用户"
-			}
-		},
-		/** 用户点击分享 */
-		onShareAppMessage: function (res) {
-		  return {
-		    title: "研选榜单",
-		    path: "/pages-purchaser/researchList/researchList?tagActive=" + this.tagActive,
-		  };
-		},
-		onLoad(option) {
-			this.loadShare(option);
-		},
-	}
+import { Reports, Research } from "@/config/api.js";
+import purchaserReportListMixins from "../components/purchaser-report-list-mixins.js";
+export default {
+  data() {
+    return {
+      accounts: "",
+      tagActive: "用户",
+      collectionList: [], //用户收藏
+      hotList: [],
+      kolList: [],
+      researchTabBars: [
+        { titel: "月度收藏榜", name: "用户" },
+        { titel: "主题热度榜", name: "主题" },
+        { titel: "KOL榜", name: "专家" },
+      ],
+      confirmText: "知道了",
+      isCancelBtn: false,
+      goFollowShow: false,
+    };
+  },
+  // purchaserReportListMixins 混入了 收藏、作者详情、文章详情、主题详情-method
+  mixins: [purchaserReportListMixins],
+  watch: {
+    tagActive: {
+      handler(val) {
+        val == "用户" ? this.researchCollectionList() : val == "主题" ? this.researchHotList() : this.researchKolList();
+      },
+      immediate: true,
+    },
+  },
+  mounted() {
+    // 处理数据 列表同步详情
+    uni.$on("updateFllowTheme", (data) => {
+      this.hotList.forEach((item) => {
+        if (item.IndustrialManagementId == data.id) {
+          item.IsFollw = data.isFollw;
+        }
+      });
+    });
+    // 处理数据 列表同步详情
+    uni.$on("updateFllowAuthor", (data) => {
+      this.kolList.forEach((item) => {
+        if (item.DepartmentId == data.id) {
+          item.IsFollw = data.isFollw;
+        }
+      });
+    });
+  },
+  methods: {
+    //tabs切换
+    typeChange(item) {
+      this.tagActive = item.name;
+    },
+    //计算遍历的颜色
+    serialBackground(index) {
+      index += 1;
+      return index == 1 ? "#D7584F" : index == 2 ? "#E98033" : index == 3 ? "#FDD367" : "#D3D3D3";
+    },
+    //用户收藏榜
+    async researchCollectionList() {
+      const res = await Research.researchCollectionList({ ChartPermissionId: 31 });
+      if (res.Ret === 200) {
+        this.collectionList = res.Data.List || [];
+      }
+    },
+    //主题热度/近期更新更多
+    async researchHotList() {
+      const res = await Research.researchHotList({ ChartPermissionId: 31, ThemeType: 1 });
+      if (res.Ret === 200) {
+        this.hotList = res.Data.List || [];
+      }
+    },
+    //KOL榜列表接口
+    async researchKolList() {
+      const res = await Research.researchKolList({ ChartPermissionId: 31 });
+      if (res.Ret === 200) {
+        this.kolList = res.Data.List || [];
+      }
+    },
+    //关注
+    async isAttention(item, val) {
+      await this.$store.dispatch("showLoginModal");
+      const res =
+        val === "主题"
+          ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId, PageRouter: this.$store.state.pageRouterReport })
+          : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId, PageRouter: this.$store.state.pageRouterReport });
+      if (res.Ret === 200) {
+        item.IsFollw = !item.IsFollw;
+        if (res.Data.Status == 1) {
+          this.goFollowShow = true;
+          this.confirmText = res.Data.GoFollow ? "去关注" : "知道了";
+          if (res.Data.GoFollow) {
+            this.accounts = `${val == "主题" ? "产业" : "作者"}关注成功 <br> 想要及时获取该${val === "主题" ? "产业内容的更新推送" : "作者的报告更新提示"},请关注【查研观向小助手】公众号`;
+            this.isCancelBtn = true;
+          } else {
+            this.accounts = `${val == "主题" ? "产业" : "作者"}` + `关注成功<br>请关注【查研观向小助手】公众号,及时获取${val === "主题" ? "产业" : "作者"}报告更新提醒`;
+          }
+        } else {
+          uni.showToast({
+            title: "已取消关注",
+            icon: "none",
+            duration: 2000,
+          });
+        }
+      }
+    },
+    //去关注
+    goFollowShowBtn() {
+      if (this.confirmText == "去关注") {
+        uni.navigateTo({
+          url: "/activityPages/accountsOfficial/accountsOfficial",
+        });
+      }
+      this.goFollowShow = false;
+    },
+    // 跳转主题 of 作者
+    goThemeAuthor(type) {
+      type === "主题" ? uni.navigateTo({ url: "/pages-purchaser/researchTheme/researchTheme" }) : uni.navigateTo({ url: "/pages-purchaser/researchAuthor/researchAuthor" });
+    },
+    loadShare(option) {
+      this.tagActive = option.tagActive || "用户";
+    },
+  },
+  /** 用户点击分享 */
+  onShareAppMessage: function (res) {
+    return {
+      title: "研选榜单",
+      path: "/pages-purchaser/researchList/researchList?tagActive=" + this.tagActive,
+    };
+  },
+  onLoad(option) {
+    this.loadShare(option);
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	@import "../components/purchaser-report-list.scss";
-	.research-list-container{
-		background-color: #f7f7f7;
-		padding-top: 20rpx;
-		box-sizing: border-box;
-		.tab-cont {
-			height: 115rpx;
-			background-color: #fff;
-			font-size: 32rpx;
-			border-bottom: 1rpx solid #ececec;
-			.scroll-tab {
-				position: relative;
-				width: 100%;
-				white-space: nowrap;
-				display: flex;
-				justify-content: space-around;
-			}
-			.scroll-tab-item {
-				text-align: center;
-				display: inline-block;
-				padding: 32rpx 8rpx 30rpx 8rpx;
-				border-bottom: 8rpx solid transparent;
-				margin-right: 60rpx;
-				position: relative;
-				color: #999999;
-				font-size: 32rpx;
-				&:last-child {
-					margin-right: 0;
-				}
-				&.active {
-					border-bottom: none;
-					color: #333;
-					font-weight: 500;
-				}
-				.border_act {
-					width: 80%;
-					height: 8rpx;
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					transform: translateX(-50%);
-				}
-			}
-		}
-		// .content-bottom {
-		//   background-color: #fff;
-		//   text-align: center;
-		//   line-height: 100rpx;
-		//   color: #c4c4c4;
-		//   font-size: 20rpx;
-		// }
-		.content-button {
-			height: 100rpx;
-			width: 100%;
-			text-align: center;
-			line-height: 100rpx;
-			color: #3385ff;
-		}
-	}
+.research-list-container {
+  background-color: $uni-bg-color;
+  padding: 100rpx 30rpx 30rpx;
+  .top-content {
+    width: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 99;
+    background-color: #fff;
+    padding-bottom: 10rpx;
+    .item {
+      flex: 1 !important;
+    }
+  }
+  .content-ul {
+    margin: 20rpx 0 0;
+    border-top: 1px solid #f6f6f6;
+    .user-li,
+	.kol-li,
+    .hot-li {
+      margin-bottom: 20rpx;
+      background-color: #fff;
+    }
+    .li-serial {
+      width: 26rpx;
+      height: 26rpx;
+      line-height: 26rpx;
+      color: #fff;
+      font-size: 20rpx;
+      text-align: center;
+      border-radius: 4rpx 4rpx 4rpx 4rpx;
+      margin: 7rpx 10rpx 0 20rpx;
+      flex-shrink: 0;
+    }
+    .serial-number {
+      margin-top: 0 !important;
+    }
+    .li-item {
+      display: flex;
+      .li-industry {
+        color: $uni-color-new;
+        margin-left: 20rpx;
+        display: inline-block;
+      }
+
+      .li-title {
+        display: flex;
+      }
+    }
+    .kol-item {
+      display: flex;
+      flex-wrap: wrap;
+      width: 480rpx;
+      height: 120rpx;
+      align-items: baseline;
+      margin-bottom: 20rpx;
+
+      .item-top {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 29rpx;
+        font-weight: 700;
+      }
+
+      .kol-text {
+        width: 50%;
+        margin-top: 10rpx;
+        flex-shrink: 0;
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #333;
+      }
+    }
+    .li-bottom {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-top: 30rpx;
+      width: 100%;
+      font-size: 24rpx;
+      .user-img {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        width: 39%;
+        image {
+          width: 24rpx;
+          height: 24rpx;
+          margin-right: 10rpx;
+        }
+        view {
+          display: flex;
+          align-items: center;
+          flex-shrink: 0;
+          margin-left: 20rpx;
+        }
+        .user-pv {
+          width: 24rpx;
+          height: 24rpx;
+        }
+      }
+      .time-user {
+        display: flex;
+        align-items: center;
+        flex: 1;
+        .time {
+          width: 200rpx;
+        }
+        view {
+          display: flex;
+          align-items: center;
+          flex-shrink: 0;
+        }
+        image {
+          width: 24rpx;
+          height: 24rpx;
+          margin-right: 10rpx;
+        }
+      }
+    }
+    .read-more {
+      margin-top: 10rpx;
+      display: flex;
+      flex-wrap: wrap;
+      .industry-video-item {
+        height: 106rpx;
+        width: 150rpx;
+        margin: 0 10rpx 10rpx 0;
+        border-radius: 8rpx;
+        background-size: cover;
+        background-position: center;
+        background-repeat: no-repeat;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: white;
+        line-height: 45rpx;
+        padding: 20rpx;
+        position: relative;
+        overflow: hidden;
+
+        .industry-video-icon {
+          height: 0rpx;
+          width: 0rpx;
+          border-style: solid;
+          border-color: #3385ff #3385ff transparent transparent;
+          border-width: 28rpx;
+          position: absolute;
+          right: 0;
+          top: 0;
+          image {
+            position: absolute;
+            right: -24rpx;
+            bottom: 0;
+            height: 20rpx;
+            width: 20rpx;
+          }
+        }
+      }
+      .text-box {
+        padding: 0;
+        margin: 0 10rpx 10rpx 0;
+        font-size: 24rpx;
+        color: $uni-color-new;
+        width: 150rpx;
+        height: 48rpx;
+        text-indent: 0em;
+        line-height: 48rpx;
+        text-align: center;
+        background-color: #f8f8fa;
+        border-radius: 200rpx;
+      }
+    }
+    .hot-item {
+      justify-content: space-between;
+      align-items: center;
+      .hot-new {
+        align-items: center;
+        flex: 1;
+        padding-right: 20rpx;
+      }
+      .new-img {
+        width: 26rpx;
+        height: 28rpx;
+        margin-left: 15rpx;
+        flex-shrink: 0;
+      }
+    }
+  }
+
+  .kol-li {
+    display: flex;
+    align-items: center;
+    padding-bottom: 30rpx;
+    image {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 8rpx;
+      margin: 0 20rpx 0 15rpx;
+      overflow: hidden;
+      flex-shrink: 0;
+    }
+  }
+  .content-bottom {
+    background-color: $uni-bg-color;
+    text-align: center;
+    line-height: 100rpx;
+    color: #c4c4c4;
+    font-size: 20rpx;
+  }
+  .industry-color {
+    font-size: 26rpx;
+    padding: 0rpx 20rpx;
+    border-radius: 4rpx;
+    margin-left: 20rpx;
+  }
+  .follw {
+    color: #fff;
+    border-radius: 4rpx;
+    font-size: 24rpx;
+    width: 110rpx;
+    height: 42rpx;
+    background-color: $uni-color-new;
+  }
+  .cancel-follw {
+    background-color: #e5efff;
+    color: $uni-color-new;
+  }
+}
 </style>

+ 7 - 9
pages-search/components/activityBack.vue

@@ -43,10 +43,10 @@
                   <image v-else-if="item.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image>
                   {{ item.ActivityName }}
                 </view>
-                <text class="text_twoLine" v-if="item.Expert && item.SourceType == 1">专家背景:{{ item.Expert }} </text>
-                <text class="text_twoLine" v-if="item.DistinguishedGuest">嘉宾:{{ item.DistinguishedGuest }} </text>
-                <text class="text_twoLine" v-if="item.Speaker">主讲人:{{ item.Speaker }}</text>
-                <view style="display: flex" class="text_twoLine" v-if="item.ActivityTimeText && item.SourceType == 2">
+                <text class="global_activity_content text_twoLine" v-if="item.Expert && item.SourceType == 1">专家背景:{{ item.Expert }} </text>
+                <text class="global_activity_content text_twoLine" v-if="item.DistinguishedGuest">嘉宾:{{ item.DistinguishedGuest }} </text>
+                <text class="global_activity_content text_twoLine" v-if="item.Speaker">主讲人:{{ item.Speaker }}</text>
+                <view style="display: flex" class="global_activity_content text_twoLine" v-if="item.ActivityTimeText && item.SourceType == 2">
                   <text style="flex-shrink: 0"> 活动时间:</text>
                   <text> {{ item.ActivityTimeText }}</text>
                 </view>
@@ -64,9 +64,7 @@
                       <text v-if="item.IsShowMeetingReminder" @click="meetingReminderAdd(item.ActivityId, item.IsCancelMeetingReminder)">
                         {{ item.IsCancelMeetingReminder == 0 ? "消息提醒" : "取消提醒" }}
                       </text>
-                      <view v-if="item.IsShowHelpSsk" style="width: 130rpx">
-                        <text @click="askingGo(item)">帮我带问</text>
-                      </view>
+                      <text v-if="item.IsShowHelpSsk" @click="askingGo(item)">帮我带问</text>
                       <text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1" class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
                       <text v-if="item.IsShowDetails" @click="goDetail(item)" class="button">查看详情</text>
                       <block v-if="item.IsShowSignup">
@@ -241,7 +239,7 @@ export default {
 }
 @import "@/components/activity/indexActivity.scss";
 .activity-search-content {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   .ipt-right {
     z-index: 11;
   }
@@ -352,7 +350,7 @@ export default {
       padding-bottom: 20rpx;
       overflow: hidden;
       overflow-y: auto;
-      background-color: #f7f7f7;
+      background-color: $uni-bg-color;
       .search-cont-top {
         padding: 0 34rpx 0;
         margin-bottom: 10rpx;

+ 1 - 1
pages-search/components/report.vue

@@ -319,7 +319,7 @@ export default {
 </script>
 <style scoped lang="scss">
 .container-report-page {
-  background-color: #f5f6fa;
+  background-color: $uni-bg-color;
   .content-list {
     .list-ui {
       background-color: #fff;

+ 4 - 4
pages-search/indedxSearch/indedxSearch.vue

@@ -490,7 +490,7 @@ export default {
 
 <style lang="scss" scoped>
 .search-container {
-  background-color: #f5f6fa;
+  background-color: $uni-bg-color;
   padding: 200rpx 0 0rpx;
   min-height: 100vh;
   box-sizing: border-box;
@@ -619,7 +619,7 @@ export default {
   }
   .content {
     width: 100%;
-    background-color: #f5f6fa;
+    background-color: $uni-bg-color;
   }
   .nodata {
     font-size: 40rpx;
@@ -642,7 +642,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     font-size: 28rpx;
-    background-color: #f5f6fa;
+    background-color: $uni-bg-color;
     position: sticky;
     left: 0;
     z-index: 99;
@@ -694,7 +694,7 @@ export default {
     top: 184rpx;
     left: 0;
     z-index: 99;
-    background-color: #f5f6fa;
+    background-color: $uni-bg-color;
   }
   .select-roadshow {
     width: 345rpx !important;

+ 1 - 1
pages-signIn/isSignIn/components/uploadContact.vue

@@ -231,7 +231,7 @@ export default {
     }
     input {
       flex: 1;
-      background-color: #f7f7f7;
+      background-color: $uni-bg-color;
       height: 100%;
       border-radius: 8rpx;
       padding-left: 30rpx;

+ 1 - 1
pages/activity/activity.vue

@@ -307,7 +307,7 @@ export default {
 
 <style scoped lang="scss">
 .activity-content {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   padding-bottom: 90rpx;
   position: relative;
   .top-content-box {

+ 1 - 1
pages/index/index.vue

@@ -459,7 +459,7 @@ export default {
 
 <style lang="scss" scoped>
 .New-container {
-  background-color: #f5f6fa;
+  background-color: $uni-bg-color;
   .content-search {
     position: sticky;
     top: 0;

+ 1 - 1
pages/material/material.vue

@@ -528,7 +528,7 @@ export default {
 
 <style lang="scss">
 .Index-container {
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   font-size: 30rpx;
   /deep/ .search-box {
     margin-left: 30rpx !important;

+ 1 - 1
pages/reportForm/index.scss

@@ -108,7 +108,6 @@
   }
 
   .industrial_eport_one {
-    background-color: #f6f6f6;
     padding: 0 25rpx 10rpx;
   }
   .report_formcard_content {
@@ -172,6 +171,7 @@
       z-index: 90;
       width: calc(100% + 60rpx);
       margin-left: -30rpx;
+      padding-left: 60rpx;
     }
 
     .industry-box {

+ 1 - 1
reportPages/morningAll/morningAll.vue

@@ -68,7 +68,7 @@ export default {
 
 <style scoped lang="scss">
 .morning-all-content {
-  background: #f7f7f7;
+  background-color: $uni-bg-color;
   padding: 35rpx;
   .content-ul {
     padding: 20rpx 30rpx;

+ 1 - 1
reportPages/researchTheme/researchTheme.vue

@@ -185,7 +185,7 @@ export default {
 <style lang="scss" scoped>
 .theme-content {
   padding: 20rpx;
-  background-color: #f7f7f7;
+  background-color: $uni-bg-color;
   .box-content-top {
     position: relative;
     background-color: #fff;

+ 12 - 0
style/common.scss

@@ -209,6 +209,18 @@ button {
   background-color: #f8f8fa;
   border-radius: 4rpx;
 }
+
+.global_activity_content {
+  margin-top: 20rpx;
+  padding: 5rpx 12rpx;
+  font-size: 24rpx;
+  line-height: 34rpx;
+  font-weight: 400;
+  color: #333;
+  background-color: #f8f8fa;
+  border-radius: 4rpx;
+}
+
 // 居中
 .global_content_center {
   display: flex;