调整

main.js

@@ -203,17 +203,9 @@ Vue.mixin({
 	methods: {
 		quickChargeReduceMethod(station){
 			
-			if(station.quickChargeReduce){
+			if(station.quickChargeReduceResult){
 				
-				if(station.quickChargeStartTime&&station.quickChargeEndTime){
-					var start=newDate(station.quickChargeStartTime)
-					var end=newDate(station.quickChargeEndTime)
-					var now=new Date()
-					return now> start && now <end 
-					
-				}else{
-					return true 
-				}
+				return true 
 			}
 			return false 
 		},

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -137,7 +137,21 @@
 
 						<text class="free" v-if="gunDetail.chargingAppointment&&gunDetail.isMeAppoint">您已预约</text>
 						<text class="free" v-else-if="gunDetail.chargingAppointment&&!gunDetail.isMeAppoint">已被预约</text>
-						<text class="free" v-else>{{gun.workStatusText}}</text>
+						<text class="free " :class="'workStatusText'+gun.workStatus" v-else    >{{gun.workStatusText}}</text>
+					</view>
+					
+					<view v-if="gun.workStatus==6" @click="operating=true"
+					style="margin-top: 10rpx;color: rgba(255, 56, 56, 1);font-size: 28rpx;    display: flex; align-items: center;" >
+					
+						<span  style="color: #fff;background: linear-gradient(93.02deg, rgba(255,56,56,1) 39.4%,rgba(255,124,112,1) 92.42%);
+						   border-radius: 4px;
+						    padding: 0rpx 10rpx;
+						    margin-right: 8rpx;
+						    font-size: 24rpx;
+						   line-height:40rpx;
+						" >提醒</span>
+						点击查看恢复供电操作指示图
+						<u-icon name="arrow-right"></u-icon>
 					</view>
 					
 					<view v-if="quickChargeReduceMethod(station)&&personInfo&&personInfo.userType==2"
@@ -775,7 +789,15 @@
 		
 		
 		<quickRegistration v-if="show4" @login="loginMethod" :carNum="car?car.carNum:''" ></quickRegistration>
-		
+		<u-popup v-model="operating" mode="center"  >
+			<view @click="operating=false"
+			 style="background-color: #53a849;
+			     text-align: center;
+				  width: 600rpx; ">
+				<img  style="    width: 400rpx;"
+				src="@/assets/img/gologin/操作指引-tuya.png"></img>
+			</view>
+		</u-popup>
 		
 	</view>
 </template>
@@ -808,7 +830,7 @@
 				show2: false,
 				show3: false,
 				show4: false,
-				
+				operating:false,
 				carImg3Bl:false,
 				carImg4Bl:false,
 				carImg3span1:0,
@@ -1500,27 +1522,13 @@
 					}
 
 					this.gun = res.data.gun
-
+					if(this.gun &&this.gun.workStatus==6){
+						this.operating=true;
+					}
 					this.car =res.data.car
 					if (this.carplateMust && this.car && this.car.carNum) {
 						this.carplateMustModel=true;
-						// uni.showModal({
-						// 	title: "使用车牌" + this.car.carNum,
-						// 	content: "车牌号一致可减免停车费，不一致可使用临时车牌号，用于出入停车场，当前默认车牌号为" + this.car.carNum,
-						// 	confirmText: "默认车牌号",
-						// 	cancelText: "临时车牌号",
-						// 	success: res1 => {
-						// 		if (res1.confirm) {
-						// 			//this.carDet()	
-						// 		} else if (res1.cancel) {
-						// 			//('用户点击取消');
-						// 			this.carTempBl = true;
-						// 			this.getTemporaryCarNumByOpenId()
-
-						// 		}
-
-						// 	}
-						// })
+						
 					} else {
 						
 					}
@@ -2235,8 +2243,9 @@
 
 				.free {
 					display: inline-block;
-					width: 72px;
-					height: 20px;
+					//width: 72px;
+					padding:4rpx 24rpx ;
+					//height: 20px;
 					line-height: 20px;
 					border-radius: 50px;
 					background-color: rgba(208, 246, 228, 100);
@@ -2244,6 +2253,10 @@
 					font-size: 28rpx;
 					text-align: center;
 					margin-left: 12px;
+				}
+				.workStatusText6{
+					background-color: rgba(255, 214, 210, 1);
+					color: rgba(255, 56, 56, 1);
 				}
 
 			}