查研观向11.0 测试bug修复

activityPages/activityDetail/activityDetail.vue

@@ -14,8 +14,9 @@
           <!-- 内容部分 -->
           <view class="content">
             <view v-if="detailData.ActivityName" class="dialog-title brackets-title">
-              <image style="width:83rpx;height:33rpx"  v-if="detailData.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
-              <image v-if="!detailData.IsResearchPoints && detailData.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
+              <image v-if="detailData.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
+							<image v-else-if="detailData.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image>
+              <image v-else-if="!detailData.IsResearchPoints && detailData.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
               {{ detailData.ActivityName }}
             </view>
             <block v-if="detailData.FileType == 1">
@@ -834,10 +835,11 @@ export default {
       margin-bottom: 15rpx;
       color: #000;
       image {
-        width: 83rpx;
-        height: 33rpx;
+        width: 73rpx;
+        height: 30rpx;
         vertical-align: middle;
         margin-right: 5rpx;
+				margin-bottom: 5rpx;
       }
     }
     .brackets-title {

activityPages/activityDetail/jurisdiction/components.vue

@@ -35,7 +35,7 @@
         {{ jurisdictionList.IsResearch ? "提交申请" : "立即申请" }}
       </view>
       <view class="btn-cont back-btn" @click="backIndex"> 返回</view>
-      <view class="product-introduction-box" v-if="reportInfo.IsResearch">
+      <view class="product-introduction-box" v-if="jurisdictionList.IsResearch">
 <!--    <view class="research-btn" @click="goRouterResearch('介绍')">
           <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/report_Yx.png"></image>
           点击查看买方研选产品介绍

components/ItemComponent/activityItem.vue

@@ -10,12 +10,9 @@
       </block>
     </view>
     <view class="content-type"> {{ list.ActivityTypeName || "专项产业调研" }}</view>
-    <!-- <view :class="['content-title', 'text-Line', list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
-      <image v-if="list.IsResearchPoints" src="https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png"></image>
-			<image v-else-if="list.IsResearch" src="https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png"></image>
-      <image v-else-if="list.IsExternalLabel" src="https://hzstatic.hzinsights.com/cygx/icon/activity_external.png"></image>
-      {{ list.ActivityName || list.ResearchTheme }} -->
-    <view :class="['content-title', list.ResearchTheme && 'content-min-hight']" v-if="list.ActivityName || list.ResearchTheme">
+    <view :class="['content-title', list.ResearchTheme && 'content-min-hight',
+    list.IsResearchPoints?'yan-xuan-point-tag':list.IsResearch?'yan-xuan-tag':'external-label']" 
+    v-if="list.ActivityName || list.ResearchTheme">
       <mp-html :content="richTextClamp(3) + (list.ActivityName || list.ResearchTheme) + '</div>'" />
     </view>
     <view style="display: flex" class="content-text content-min-hight text_twoLine" v-if="list.ActivityTimeText && list.SourceType !== 1">
@@ -677,6 +674,7 @@ export default {
     font-weight: 400;
     color: #333333;
     line-height: 44rpx;
+    position: relative;
     image {
       width: 73rpx;
       height: 30rpx;
@@ -685,6 +683,48 @@ export default {
       margin-right: 16rpx;
     }
   }
+  .yan-xuan-point-tag{
+		text-indent: 82rpx;
+		&::before {
+		  content: "";
+		  position: absolute;
+		  top: 8rpx;
+			background-image: url(https://hzstatic.hzinsights.com/cygx/icon/Research_Points.png);
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		  left: 0;
+		  width: 73rpx;
+		  height: 30rpx;
+		}
+	}
+  .yan-xuan-tag{
+		text-indent: 82rpx;
+		&::before {
+		  content: "";
+		  position: absolute;
+		  top: 8rpx;
+			background-image: url(https://hzstatic.hzinsights.com/cygx/icon/Research_normal.png);
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		  left: 0;
+		  width: 73rpx;
+		  height: 30rpx;
+		}
+	}
+  .external-label{
+    text-indent: 82rpx;
+		&::before {
+		  content: "";
+		  position: absolute;
+		  top: 8rpx;
+			background-image: url(https://hzstatic.hzinsights.com/cygx/icon/activity_external.png);
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+		  left: 0;
+		  width: 73rpx;
+		  height: 30rpx;
+		}
+  }
   .content-text {
     font-size: 28rpx;
     font-weight: 400;

components/activity/purchaserActivityList.vue

@@ -2,7 +2,7 @@
 	<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?'#E7E0CD':'#8FA4C4'}">
+			: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>
@@ -177,10 +177,10 @@
 				font-weight: 500;
 			}
 			.online{
-				background-color: #F2E8CC;
+				background-color: #DFE8FF;
 			}
 			.offline{
-				background-color: #DFE8FF;
+				background-color: #F2E8CC;
 			}
 			.activity-label-text{
 				white-space: nowrap;
@@ -202,7 +202,7 @@
 					text-overflow: ellipsis;
 					white-space: nowrap;
 					display: block;
-					padding: 3rpx 12rpx;
+					padding: 4rpx 12rpx;
 					text-align: center;
 				}
 			}

pages/purchaser/purchaser.vue

@@ -263,7 +263,9 @@ export default {
 				.content-box-head-more{
 					height: 36rpx;
 					min-width: 120rpx;
-					padding: 4rpx 10rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
 					border-radius: 36rpx;
 					background-color: #E5EFFF;
 					display: flex;
@@ -303,7 +305,7 @@ export default {
 						color: white;
 						font-size: 20rpx;
 						line-height: 28rpx;
-						font-weight: 500;
+						font-weight: bold;
 						border-radius: 38rpx;
 						color: #928563;
 						background-color: #F2E8CC;
@@ -399,3 +401,12 @@ export default {
   // }
 }
 </style>
+<style lang="scss">
+	wx-swiper .wx-swiper-dot {
+		width: 6rpx;
+		height: 6rpx;
+		border-radius: 6rpx;
+		margin-bottom: -16rpx;
+	}
+	
+</style>