1

pages/friendcircle/activeContent.vue

@@ -78,6 +78,7 @@
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		margin-top: 10px;
 	}
 	.active_text{
 		width: 100%;

pages/friendcircle/activitylist.vue

@@ -18,7 +18,7 @@
 						<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="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 class="imgview imgview2" v-if=" msg.QActivityState ==2 " >兑换截止期限:{{x.ReceiveTime}}</view>
 							
 						</view>
 						<view class="inter-item-title">

pages/friendcircle/myreward.vue

@@ -76,8 +76,8 @@
 					<view style="padding-left:10px;flex: 1;width: 1px;">
 						<view class="rewardTop Chaochu">{{x.ActivityName}}</view>
 						<!-- <view class="reDuihuan Chaochu">{{x.PrizeName}}</view> -->
-						<view class="reDuihuan Chaochu" v-if="x.SurplusDay>0">剩余{{x.SurplusDay}}天兑换</view>
-						<view class="reDuihuan Chaochu" v-if="x.SurplusDay<1">兑换截止期限:{{x.ReceiveTime}}</view>
+						
+						<view class="reDuihuan Chaochu" style="font-family: aa;" >截止:{{x.ReceiveTime}}之前兑换</view>
 						<view class="reDuihuan Chaochu" style="display:flex;flex-direction: row;align-items: center;font-family: aa;">
 							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/tiaoxingma.png" style="width: 13px;height: 10px;margin-right: 5px;"></image>
 						{{x.Code}}</view>