1

pages/friendcircle/activeContent.vue

@@ -107,8 +107,8 @@
 		 <view>
 		    <text class="avtice_Sperate" v-if="dataList.Tier==0">全部分销商</text>
 			<text class="avtice_Sperate" v-if="dataList.Tier==1">一级分销商</text>
-			<text class="avtice_Sperate" v-if="dataList.Tier==2">一级分销商</text>
-			<text class="avtice_Sperate" v-if="dataList.Tier==3">一级分销商</text>
+			<text class="avtice_Sperate" v-if="dataList.Tier==2">二级分销商</text>
+			<text class="avtice_Sperate" v-if="dataList.Tier==3">三级分销商</text>
 		 </view>
 		 <view>
 			 

pages/friendcircle/activitylist.vue

@@ -17,16 +17,27 @@
 					<view class="inter-item" v-for="(x, i) in g" :key="i" @click="goActiveContent(x)">
 						<view style="width: 100%;height: 190px;border-top-left-radius: 6px;border-top-right-radius: 6px;position: relative;">
 							<image :src="x.CoverImage" mode='aspectFill' style="width: 100%;height: 190px;;border-top-left-radius: 6px;border-top-right-radius: 6px;"></image>
-							<view class="imgview" v-if="x.IsFinish==1 && x.SurplusDay!=0" style="background: #CCCCCC;color: #777777;">活动已完成</view>
-							<view class="imgview" v-if="x.IsFinish==2 && x.SurplusDay!=0" :style="{background:mainColor,color:'#FFF'}">距离活动结束还有{{x.SurplusDay}}天</view>
-							<view class="imgview" v-if=" x.SurplusDay==0" style="background: #CCCCCC;color: #777777;">活动已结束{{x.SurplusDay}}天</view>
+							<!-- <view class="imgview imgview2" v-if="msg.QActivityState ==1 && x.IsFinish==1 && x.SurplusDay>0" >活动已完成</view> -->
+							<!-- <view class="imgview imgview2" v-if="msg.QActivityState ==1 && x.SurplusDay==0" >活动已结束</view> -->
+							<view class="imgview" v-if="msg.QActivityState ==1 " :style="{background:mainColor,color:'#FFF'}">距离活动结束还有{{x.SurplusDay}}天</view>
+							<view class="imgview imgview2" v-if=" msg.QActivityState ==2 && x.SurplusDay>0" >兑换截止期限:{{x.ReceiveTime}}</view>
+							
 						</view>
 						<view class="inter-item-title">
 							{{x.ActivityName}}
 						</view>
-						<view style="padding: 0 15px 15px;">
+						<view style="padding: 0 15px 15px;" >
 							<u-line-progress :active-color="mainColor" :percent="calculation(x)" height='6' :show-percent="false"></u-line-progress>
-							<text style="margin-top: 5px;font-size: 10px;color: #111111;">当前进度{{calculation(x)}}%</text>
+							
+							<view class="speed">
+								<text >当前进度{{calculation(x)}}%</text>
+								<view class="speed">
+									<text v-if="calculation(x)==100 && x.IsFinish==2" :style="{'color':mainColor}">已完成活动，等待发放奖励</text>
+									<text style="margin-left: 5px;" v-if="x.IsFinish==1" :style="{'color':mainColor}">已完成</text>
+									<text v-if="msg.QActivityState ==2 && x.IsFinish==2" style="color:  #777777;">未完成</text>
+								</view>
+								
+							</view>
 						</view>
 						
 					</view>
@@ -170,7 +181,7 @@
 				else if(x.Type==3){
 					percent = (x.MyGoodsNum/x.GoodsNum)*100
 				}
-				if(x.IsFinish ==1){ //如果完成了直接是百分百
+				if(x.IsFinish ==1 || percent>100){ //如果完成了直接是百分百
 					percent = 100
 				}else{
 					percent.toFixed(2)
@@ -265,4 +276,10 @@
 		font-weight: bold;
 		overflow: hidden;white-space: nowrap;text-overflow: ellipsis
 	}
+	.activitylist .imgview2{
+		background: #CCCCCC;color: #777777;
+	}
+	.activitylist .speed{
+		display: flex;flex-direction: row;align-items: center;justify-content: space-between;margin-top: 5px;font-size: 10px;color: #111111;
+	}
 </style>