活动标签调整

main.js

@@ -201,9 +201,18 @@ Vue.mixin({
 	},
 	
 	methods: {
-		quickChargeReduceMethod(station){
-			
-			if(station.quickChargeReduceResult&& !station.quickChargeJoinActivity){
+		
+		quickChargeReduceMethod1(station){
+			//普通满减活动
+			if(station.quickChargeReduceResult&& station.quickChargeJoinActivity==0){
+				
+				return true 
+			}
+			return false 
+		},
+		quickChargeReduceMethod2(station){
+			//转盘
+			if(station.quickChargeReduceResult&& station.quickChargeJoinActivity==1){
 				
 				return true 
 			}

pages/index/index.vue

@@ -349,7 +349,7 @@
 								style="color:#666666">&#xe615;</text>{{stationData.distance!=null&&stationData.distance>0.1 ? stationData.distance.toFixed(1)+'公里':'小于100米'}}
 						</view>
 					</view>
-					<view v-if="quickChargeReduceMethod(stationData)&&personInfo&&personInfo.userType==2" 
+					<view v-if="quickChargeReduceMethod1(stationData)&&personInfo&&personInfo.userType==2" 
 					style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
 					
 						<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
@@ -361,6 +361,19 @@
 						
 						" >活动</span>
 						快充订单满{{stationData.quickChargeDegree}}度服务费{{discountRatio10(stationData.quickChargeDiscountRatio)}}折
+					</view>
+					<view v-if="quickChargeReduceMethod2(stationData)&&personInfo&&personInfo.userType==2"
+					style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
+					
+						<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
+						   border-radius: 4px;
+						    padding: 0rpx 10rpx;
+						    margin-right: 8rpx;
+						    font-size: 24rpx;
+						   line-height:40rpx;
+						
+						" >活动</span>
+						喜迎国庆，充电有奖
 					</view>
 					<view class="sign" v-if="stationData.stationType==50">
 						<view class="sign-tag sign-0" v-if="stationData.isRecommend">推荐</view>
@@ -530,7 +543,7 @@
 				</view>
 			</view>
 			
-			<view v-if="quickChargeReduceMethod(stationData)&&personInfo&&personInfo.userType==2"
+			<view v-if="quickChargeReduceMethod1(stationData)&&personInfo&&personInfo.userType==2"
 			style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
 			
 				<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
@@ -541,6 +554,18 @@
 				   line-height:40rpx;
 				" >活动</span>
 				快充订单满{{stationData.quickChargeDegree}}度服务费{{discountRatio10(stationData.quickChargeDiscountRatio)}}折
+			</view>
+			<view v-if="quickChargeReduceMethod2(stationData)&&personInfo&&personInfo.userType==2"
+			style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
+			
+				<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
+				    border-radius: 4px;
+				    padding: 0rpx 10rpx;
+				    margin-right: 8rpx;
+				    font-size: 24rpx;
+				   line-height:40rpx;
+				" >活动</span>
+				喜迎国庆，充电有奖
 			</view>
 
 			<view class="sign">

pages/search/search.vue

@@ -31,7 +31,7 @@
 			<view class="sign" >
 				{{item.address}}
 			</view>
-			<view v-if="quickChargeReduceMethod(item)&&personInfo&&personInfo.userType==2"
+			<view v-if="quickChargeReduceMethod1(item)&&personInfo&&personInfo.userType==2"
 			style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
 			
 				<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
@@ -42,7 +42,20 @@
 				   line-height:40rpx;
 				" >活动</span>
 				快充订单满{{item.quickChargeDegree}}度服务费{{discountRatio10(item.quickChargeDiscountRatio)}}折
-			</view>
+			</view>
+			<view v-if="quickChargeReduceMethod2(item)&&personInfo&&personInfo.userType==2"
+			style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
+			
+				<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
+				   border-radius: 4px;
+				    padding: 0rpx 10rpx;
+				    margin-right: 8rpx;
+				    font-size: 24rpx;
+				   line-height:40rpx;
+				" >活动</span>
+				喜迎国庆，充电有奖
+			</view>
+			
 			<view class="sign" >
 				<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">会员{{discountRatio10(item.discountRatio)}}折</view>
 				<view class="sign-3" v-if="item.category=='超充'">160kW超充站</view>

pages/searchPile/searchPile.vue

@@ -224,7 +224,7 @@
 								</view>
 
 							</view>
-							<view v-if="quickChargeReduceMethod(item)&&personInfo&&personInfo.userType==2"
+							<view v-if="quickChargeReduceMethod1(item)&&personInfo&&personInfo.userType==2"
 							style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
 							
 								<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
@@ -235,6 +235,18 @@
 								   line-height:40rpx;
 								" >活动</span>
 								快充订单满{{item.quickChargeDegree}}度服务费{{discountRatio10(item.quickChargeDiscountRatio)}}折
+							</view>
+							<view v-if="quickChargeReduceMethod2(item)&&personInfo&&personInfo.userType==2"
+							style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
+							
+								<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
+								   border-radius: 4px;
+								    padding: 0rpx 10rpx;
+								    margin-right: 8rpx;
+								    font-size: 24rpx;
+								   line-height:40rpx;
+								" >活动</span>
+								喜迎国庆，充电有奖
 							</view>
 							<view class="sign">
 								<!-- <view class="sign-tag sign-0" v-if="item.isRecommend||stationslist.length==0">推荐</view>

pages/searchPile/stationAndPile/stationDetails.vue

@@ -37,7 +37,7 @@
 			<view class="title">
 				{{stationDetail.station.name}}
 			</view>
-			<view v-if="quickChargeReduceMethod(stationDetail.station)&&personInfo&&personInfo.userType==2"
+			<view v-if="quickChargeReduceMethod1(stationDetail.station)&&personInfo&&personInfo.userType==2"
 			style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
 			
 				<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
@@ -49,6 +49,18 @@
 				" >活动</span>
 				快充订单满{{stationDetail.station.quickChargeDegree}}度服务费{{discountRatio10(stationDetail.station.quickChargeDiscountRatio)}}折
 			</view>
+			<view v-if="quickChargeReduceMethod2(stationDetail.station)&&personInfo&&personInfo.userType==2"
+			style="margin-top: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
+			
+				<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
+				   border-radius: 4px;
+				    padding: 0rpx 10rpx;
+				    margin-right: 8rpx;
+				    font-size: 24rpx;
+				   line-height:40rpx;
+				" >活动</span>
+				喜迎国庆，充电有奖
+			</view>
 			<!-- 标签 -->
 			<view class="tags sign">
 				<view class="tags1 sign-1"
@@ -205,7 +217,7 @@
 			</view>
 			<!-- 充电桩状态 -->
 			<view class="pile-state" >
-				<view v-if="quickChargeReduceMethod(stationDetail.station)&&personInfo&&personInfo.userType==2"
+				<view v-if="quickChargeReduceMethod1(stationDetail.station)&&personInfo&&personInfo.userType==2"
 				style="margin-bottom: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
 				
 					<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
@@ -217,6 +229,18 @@
 					" >活动</span>
 					快充订单满{{stationDetail.station.quickChargeDegree}}度服务费{{discountRatio10(stationDetail.station.quickChargeDiscountRatio)}}折
 				</view>
+				<view v-if="quickChargeReduceMethod2(stationDetail.station)&&personInfo&&personInfo.userType==2"
+				style="margin-bottom: 10rpx;color: rgba(255, 121, 0, 1);font-size: 28rpx;    display: flex; align-items: center;" >
+				
+					<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,121,0,1) 39.4%,rgba(255,174,0,1) 93.51%);
+					  border-radius: 4px;
+					   padding: 0rpx 10rpx;
+					   margin-right: 8rpx;
+					   font-size: 24rpx;
+					  line-height:40rpx;
+					" >活动</span>
+					喜迎国庆，充电有奖
+				</view>
 				<!-- 总计 -->
 				<view class="statistics" >
 					<view class="free">