补全细节

.env.dev.js

@@ -1,21 +1,21 @@
 const UNI_APP = {  
 	ProjectName :"51充电联盟",
 	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
-	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
+	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//PARK_URL: 'http://192.168.11.120:8082/charging-parking/' ,
 	//PARK_URL: 'https://51team.xiaoxinda.com/charging-parking/' ,
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
-	//defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2","160cb8c6-5686-442a-8dbb-f067f30019dc"],
-	defaultStation:[],
+	defaultStation:["3865b3a3-13fd-461a-8145-ee9711df35a2","da6e714d-c5a8-4f76-8132-5f4a56677130"],
+	defaultStation:["160cb8c6-5686-442a-8dbb-f067f30019dc"],
 	openId:"zkxtest",//zkx
 	
-	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
-	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s-b",//杨所
+	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
 	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
-	
+	//openId:"oK9Wr5-ViXQMUP2cjiW3bGIABj1Q",
 	//openId:"oK9Wr5wkU3OwWhQ7mRrLZ5MDZNHo",
 	//		openId:"oK9Wr50ojExHjOTC_wFcuAEI9s-M",
 	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq

pages/index/index.vue

@@ -540,7 +540,7 @@
 				<view class="sign-tag sign-0" >推荐</view>
 				
 				
-				<template v-if="personInfo&&personInfo.userType!=1">
+				
 					<!-- 	 -->
 					<view class="sign-1"
 						v-if="stationData.giveDiscount&&stationData.discountRatio&&stationData.discountRatio!=100">
@@ -550,13 +550,13 @@
 						v-if="stationData.nightLowPriceEnabled">
 						夜间超低价</view>
 		
-				</template>
+				
 				<view class="sign-2" v-if="stationData.tagList.length != 0"
 					v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
 			</view>
 			<view class="price-free oldTextClass">
-				<view class="price">
-					<view class="price-1">
+				<view class="price" v-if="personInfo&&personInfo.userType==2">
+					<view class="price-1 ">
 						<text class="num">
 							{{!stationData.giveDiscount ? (stationData.electricityPrice+stationData.servicePrice).toFixed(2)
 							: (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
@@ -568,6 +568,19 @@
 						<text class="unit ">元/度</text>
 					</view>
 				</view>
+				<!-- 游客价格-->
+				<view class="price" v-else>
+					<view class="price-1">
+						<text class="num">
+							{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
+						<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+					</view>
+					<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
+						<text class="num1">会员</text>
+						<text class="num">{{ (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
+						<text class="unit ">元/度</text>
+					</view>
+				</view>
 		
 				<view class="free">
 		

pages/login/login.vue

@@ -71,35 +71,37 @@
 				</view>
 				<view>
 					<table  class="classtable">
-						
-						<tr>
-							<td class="td1">
-								<img src="@/assets/img/Nipic_youke.png" style="width: 24px;"></img>
-								<p style="color: rgb(74, 164, 97);line-height: 10px;">游客</p>
-							</td>
-							<td class="td2">
-									<p><span class="dian">·</span><span  style="color:#4aa461">临时车牌</span>快速充电</p>
-									<p><span class="dian">·</span>无需注册 先付后退</p>
-									<p><span class="dian">·</span><span style="color:#F44336">不可使用</span>平台各类代金券</p>
-								
-							</td>
+						
+						
+						<tr>
+							<td class="td1">
+								<img src="@/assets/img/Nipic_vip.png" style="width: 24px;"></img>
+								<p style="color: #FF9800;line-height: 10px;">会员</p>
+							</td>
+							<td class="td2">
+								
+									<p><span class="dian">·</span>充电最低<span  style="color:#4aa461">0.66元</span>/度（含服务费）</p>
+									<p><span class="dian">·</span>账户充值赠送代金券</p>
+									<p><span class="dian">·</span>更有<span  style="color:#4aa461">会员充电折扣、服务费包月会员资格</span>等超多福利</p>
+								
+							</td>
 						</tr>
 						<tr>
 							<td style="color: #fff;line-height: 3px;" >.</td>
-						</tr>
-						<tr>
-							<td class="td1">
-								<img src="@/assets/img/Nipic_vip.png" style="width: 24px;"></img>
-								<p style="color: #FF9800;line-height: 10px;">会员</p>
-							</td>
-							<td class="td2">
-								
-									<p><span class="dian">·</span>充电最低<span  style="color:#4aa461">0.66元</span>/度（含服务费）</p>
-									<p><span class="dian">·</span>账户充值赠送代金券</p>
-									<p><span class="dian">·</span>更有服务费包月会员等超多福利</p>
-								
-							</td>
-						</tr>
+						</tr>
+						<tr>
+							<td class="td1">
+								<img src="@/assets/img/Nipic_youke.png" style="width: 24px;"></img>
+								<p style="color: rgb(74, 164, 97);line-height: 10px;">游客</p>
+							</td>
+							<td class="td2">
+									<p><span class="dian">·</span>临时车牌快速充电</p>
+									<p><span class="dian">·</span>无需注册 先付后退</p>
+									<p><span class="dian">·</span><span style="color:#F44336">不可使用</span>平台各类代金券</p>
+								
+							</td>
+						</tr>
+						
 					</table>
 
 				</view>
@@ -109,11 +111,11 @@
 						szie="mini" type="success" plain>继续充电</u-button> -->
 					<view class="btnview1">
 						<u-button shape="circle" style=" float: left;   width: 400rpx; margin: 20rpx; "
-							szie="mini" type="success" @click="gotoUrl('pages/login/login')">注册会员</u-button>
+							szie="mini" type="success" @click="show3=false">注册会员</u-button>
 							
 					</view>
 					
-					<view  class="btnview2"  @click="show3=false">暂不注册,先充电</view>
+					<view  class="btnview2"  @click="touristConfirm">游客模式</view>
 				</view>
 			</view>
 		</u-modal>

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -219,7 +219,7 @@
 					{{stationData.address}}
 				</view>
 				<view class="sign" v-else>
-					<template v-if="userInfo&&userInfo.userType!=1">
+					 
 						<!-- 	 -->
 						<view class="sign-1"
 							v-if="stationData.giveDiscount&&stationData.discountRatio&&stationData.discountRatio!=100">
@@ -231,21 +231,34 @@
 
 						<view class="sign-2" v-if="stationData.tagList.length != 0"
 							v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
-					</template>
+				 
 				</view>
 				<view class="price-free oldTextClass">
-					<view class="price">
-						<view class="price-1">
-							<text class="num">
-								{{!stationData.giveDiscount ? (stationData.electricityPrice+stationData.servicePrice).toFixed(2)
-								: (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
-							<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
-						</view>
-						<view class="price-2 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
-							<text
-								class="num">{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
-							<text class="unit ">元/度</text>
-						</view>
+					<view class="price" v-if="userInfo&&userInfo.userType==2">
+						<view class="price-1">
+							<text class="num">
+								{{!stationData.giveDiscount ? (stationData.electricityPrice+stationData.servicePrice).toFixed(2)
+								: (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
+							<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+						</view>
+						<view class="price-2 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
+							<text
+								class="num">{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
+							<text class="unit ">元/度</text>
+						</view>
+					</view>
+					<!-- 游客价格-->
+					<view class="price" v-else>
+						<view class="price-1">
+							<text class="num">
+								{{(stationData.electricityPrice+stationData.servicePrice).toFixed(2)}}</text>
+							<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+						</view>
+						<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="stationData.giveDiscount">
+							<text class="num1">会员</text>
+							<text class="num">{{ (stationData.electricityPrice+stationData.discountServicePrice).toFixed(2)}}</text>
+							<text class="unit ">元/度</text>
+						</view>
 					</view>
 
 					<view class="free">
@@ -1381,7 +1394,24 @@
 					color: rgba(153, 153, 153, 100);
 				}
 			}
-
+			.price-3 {
+				font-size: 24rpx;
+				color: #fff;
+				margin-left: 8rpx;
+				padding-right: 9rpx;
+				 background:#00B962 ;
+				 border-radius: 8rpx;
+				.num1{
+					 padding-left:  12rpx;
+					border-radius: 8rpx 0 8rpx 8rpx;
+					 padding-right: 18rpx;
+					 background: #121212;
+					 -webkit-clip-path: polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+					 clip-path:  polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+					 
+				}
+				 
+			}
 			.price-2 {
 				font-size: 24rpx;
 				color: rgba(153, 153, 153, 100);

pages/newPage/stationDetailVmode/stationDetailVmode.vue

@@ -235,7 +235,12 @@
 								已插枪
 							</view>
 							<view class="state-text" v-else>
-								{{item.workStatusText}}
+								<span v-if="item.workStatusText.length<4">{{item.workStatusText}}</span>
+								<span v-else-if="item.workStatusText.length==4" style="    display: flex; flex-direction: column;">
+									<span>{{item.workStatusText.substring(0,2)}}</span>
+									<span>{{item.workStatusText.substring(2)}}</span>
+								</span>
+								<span v-else>{{item.workStatusText}}</span>
 							</view>
 						</view>
 						<view class="state off-line" v-else>
@@ -378,7 +383,7 @@
 			</view>
 
 			<!-- 价格信息 -->
-			<view class="price-infos">
+			<view class="price-infos" v-if="pricesInfoCurrent">
 				<view class="title">
 					价格信息<text>（{{pricesInfoCurrent.startTime}}-{{pricesInfoCurrent.endTime}}）</text>
 				</view>
@@ -388,7 +393,7 @@
 							游客价
 						</view>
 						<view class="unit-price">
-							<text>{{pricesInfoCurrent.servicePrice+pricesInfoCurrent.electricityPrice}}</text>
+							<text>{{(pricesInfoCurrent.servicePrice+pricesInfoCurrent.electricityPrice).toFixed(2)}}</text>
 							
 							<text class="unit">元/度</text>
 						</view>
@@ -450,12 +455,12 @@
 									服务费
 								</view>
 							</view>
-							<view class="value"  v-if="station&&station.giveDiscount||(pricesInfoCurrent2.discountServicePrice)">
-								{{pricesInfoCurrent2.discountServicePrice.toFixed(2)}}元/度
-							</view>
-							<view class="value"   v-if="station&&!station.giveDiscount&&(!pricesInfoCurrent2.discountServicePrice)">
-								{{pricesInfoCurrent2.servicePrice.toFixed(2)}}元/度
+							<view class="value"  v-if="station">
+								<span v-if="(personInfo&&personInfo.userType==2)&&station.giveDiscount||(pricesInfoCurrent2.discountServicePrice)">
+								{{pricesInfoCurrent2.discountServicePrice.toFixed(2)}}元/度</span>
+								<span v-else>{{pricesInfoCurrent2.servicePrice.toFixed(2)}}元/度</span>
 							</view>
+							
 						</view>
 					</view>
 					
@@ -585,7 +590,7 @@
 
 				},
 				openlist: null,
-				personInfo: {},
+				personInfo: null,
 				info: {
 					station: {
 
@@ -1504,7 +1509,7 @@
 
 			// 总计
 			.statistics {
-				width: 316rpx;
+				width: 406rpx;
 				border: 1px solid rgba(204, 204, 204, 1);
 				padding: 0 16rpx;
 				height: 48rpx;
@@ -1525,8 +1530,10 @@
 				.item{
 					.open-time{
 						border-bottom: 1px solid rgba(238, 242, 240, 100);
-						padding-left: 150rpx;
-						padding-bottom: 40rpx;
+						// padding-left: 150rpx;
+						// padding-bottom: 40rpx;
+						    display: flex;
+							    justify-content: center;
 						line-height: 18px;
 						font-size: 14px;
 						color: rgb(136, 136, 136);
@@ -1577,7 +1584,11 @@
 									color: rgba(51, 51, 51, 1);
 									font-size: 36rpx;
 									font-weight: bold;
-
+									    width: 320rpx;
+									 white-space: nowrap;
+									overflow: hidden;
+									    text-overflow: ellipsis;
+										
 									text {
 										color: #D6D6D6;
 										font-weight: normal;
@@ -1611,8 +1622,19 @@
 					background-color: rgba(0, 185, 98, 1);
 					color: rgba(255, 255, 255, 1);
 
-					text-align: center;
+					text-align: center;
+					
 					
+				}
+				.not-open-tag {
+					background-color: rgba(192, 196, 208, 100);
+				
+				}
+				.not-enable-Appointment{
+					width: 84px;
+					height: 28px;
+					line-height: 28px;
+					font-size: 16px;
 				}
 
 				.electric-quantity {
@@ -1665,7 +1687,7 @@
 					border-radius: 4px;
 					background-color: rgba(230, 245, 237, 1);
 					padding: 22rpx;
-
+					
 					.unit-price {
 						font-size: 56rpx;
 					}
@@ -1679,12 +1701,13 @@
 				// 游客价
 				.item-visitor {
 					color: #333333;
-
+					width: 39%;
 				}
 
 				// 会员价
 				.item-member {
-					color: #27B148;
+					color: #27B148;
+					width: 60%;
 				}
 
 				.register {
@@ -1796,7 +1819,7 @@
 					}
 					.chats1{
 						background: #dcdcdc;
-						min-height: 30rpx
+						min-height: 40rpx
 					}
 					.chats2{
 						background: #80e0a6;

pages/search/search.vue

@@ -31,7 +31,7 @@
 			<view class="sign" >
 				{{item.address}}
 			</view>
-			<view class="sign" v-if="item.stationType!=50&&personInfo&&personInfo.userType!=1">
+			<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>
 				<view class="sign-4" v-if="item.nightLowPriceEnabled">夜间超低价</view>
@@ -40,12 +40,12 @@
 			
 			</view>
 			<view class="price-free price-freeList">
-			<view class="price">
+			<view class="price"  v-if="personInfo&&personInfo.userType==2">
 				<view class="price-1">
 					<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
 					: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
 					<text class="unit " oldstyle="font-size: 14px;">
-						 元/度
+						元/度
 					</text>
 				</view>
 				<view class="price-2 " oldstyle="font-size: 14px;" v-if="item.giveDiscount">
@@ -53,6 +53,19 @@
 					<text class="unit">元/度</text>
 				</view>
 			</view>
+			<!-- 游客价格-->
+			<view class="price" v-else>
+				<view class="price-1">
+					<text class="num">
+						{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
+					<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+				</view>
+				<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
+					<text class="num1">会员</text>
+					<text class="num">{{ (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+					<text class="unit ">元/度</text>
+				</view>
+			</view>
 			
 				<view class="free"  >
 					
@@ -483,7 +496,24 @@ font-weight: 600;
  		display: flex;
 		align-items: baseline;
 		line-height: 40rpx;
-		
+		.price-3 {
+			font-size: 24rpx;
+			color: #fff;
+			margin-left: 8rpx;
+			padding-right: 9rpx;
+			 background:#00B962 ;
+			 border-radius: 8rpx;
+			.num1{
+				 padding-left:  12rpx;
+				border-radius: 8rpx 0 8rpx 8rpx;
+				 padding-right: 18rpx;
+				 background: #121212;
+				 -webkit-clip-path: polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+				 clip-path:  polygon(0 0, 93% 0, 84% 100%, 0% 100%);
+				 
+			}
+			 
+		}
 		.price-1{
 		
 			

pages/searchPile/searchPile.vue

@@ -180,8 +180,7 @@
 						<view class="sign-tag sign-0" v-if="item.isRecommend||stationslist.length==0">推荐</view>
 						<view class="sign-tag sign-5" v-if="item.isAlways" >常用</view>	
 						
-						<template v-if="personInfo&&personInfo.userType!=1">
-						</template>	
+					
 							<view class="sign-1" v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">
 								会员服务费{{discountRatio10(item.discountRatio)}}折</view>
 							
@@ -291,8 +290,7 @@
 									</view>
 								</view>
 								<view class="sign min-h">
-									<template v-if="personInfo&&personInfo.userType!=1">
-		
+									
 		
 										<view class="sign-1"
 											v-if="item.giveDiscount&&item.discountRatio&&item.discountRatio!=100">
@@ -304,27 +302,35 @@
 										<view class="sign-2" v-if="item.tagList.length != 0"
 											v-for="(tagName,tagIndex) in item.tagList" :key="tagIndex">{{tagName}}
 										</view>
-									</template>
+									
 								</view>
 								<view class="price-free  price-freeOne">
-									<view class="price">
+									<view class="price"  v-if="personInfo&&personInfo.userType==2">
 										<view class="price-1">
-											<view class="num">
-												{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
-												: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}
-		
-												<span class="unit " oldstyle="font-size: 14px;">
-													元/度
-												</span>
-											</view>
-		
+											<text class="num">{{!item.giveDiscount ? (item.electricityPrice+item.servicePrice).toFixed(2)
+											: (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+											<text class="unit " oldstyle="font-size: 14px;">
+												元/度
+											</text>
 										</view>
 										<view class="price-2 " oldstyle="font-size: 14px;" v-if="item.giveDiscount">
-											<text
-												class="num">{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
+											<text class="num">{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
 											<text class="unit">元/度</text>
 										</view>
 									</view>
+									<!-- 游客价格-->
+									<view class="price" v-else>
+										<view class="price-1">
+											<text class="num">
+												{{(item.electricityPrice+item.servicePrice).toFixed(2)}}</text>
+											<text class="unit " oldstyle="font-size: 48rpx;">元/度</text>
+										</view>
+										<view class="price-3 " oldstyle="font-size: 48rpx;" v-if="item.giveDiscount">
+											<text class="num1">会员</text>
+											<text class="num">{{ (item.electricityPrice+item.discountServicePrice).toFixed(2)}}</text>
+											<text class="unit ">元/度</text>
+										</view>
+									</view>
 		
 		
 									<view class="free">

pages/searchPile/stationAndPile/stationDetails.vue

@@ -225,8 +225,8 @@
 							'charging b ':item.enableShare&&item.workStatus!=0,
 							'charging c ':item.workStatus==2,
 							//插枪
-							'charging d ':(item.workStatus == 0&&item.insertStatus&&stationDetail.station.stationType!=50),
-							'off-line':item.isRed&&item.workStatus!=2,
+							'off-line a ':(item.workStatus == 0&&item.insertStatus&&stationDetail.station.stationType!=50),
+							'off-line b':item.isRed&&item.workStatus!=2,
 						}">
 							<view class="state-icon">
 								<img src="../../../assets/img/pileIcon.png" alt="">
@@ -235,7 +235,12 @@
 								已插枪
 							</view>
 							<view class="state-text" v-else>
-								{{item.workStatusText}}
+								<span v-if="item.workStatusText.length<4">{{item.workStatusText}}</span>
+								<span v-else-if="item.workStatusText.length==4" style="    display: flex; flex-direction: column;">
+									<span>{{item.workStatusText.substring(0,2)}}</span>
+									<span>{{item.workStatusText.substring(2)}}</span>
+								</span>
+								<span v-else>{{item.workStatusText}}</span>
 							</view>
 						</view>
 						<view class="state off-line" v-else>
@@ -295,7 +300,12 @@
 							</view>
 						</template>
 						<!-- 电量 -->
-												<view class="electric-quantity" v-if="item.workStatus == 2 ">
+												<view class="electric-quantity" 
+												:class="{
+												
+													'not-enable-Appointment2':enableAppointmentBl(item)
+												}"
+												v-if="item.workStatus == 2 ">
 													<img src="../../../assets/img/electricQuantity.png" alt="">
 													<view class="percentage">
 														{{item.soc?item.soc+'%':'充电中'}}
@@ -306,10 +316,11 @@
 					<view class="open-time" v-show="openlist&&openlist.get(item.id)" >
 						<table>
 							<tr v-if="pricesInfoCurrent">
-								<td colspan="2">当前电价:<b
-										style="color:#080808;margin-left: 4px;">{{pricesInfoCurrent.costPrice.toFixed(2)}}元/度</b>
-									<span style="    text-decoration: line-through;"
-										v-if="station&&station.giveDiscount">{{((pricesInfoCurrent.servicePrice*1000+pricesInfoCurrent.electricityPrice*1000)/1000).toFixed(2)}}元/度</span>
+								<td colspan="2">当前电价:
+								<b style="color:#080808;margin-left: 4px;"
+										v-if="(station&&station.giveDiscount||pricesInfoCurrent2.discountServicePrice)&&(!personInfo||personInfo.userType==1)">{{((pricesInfoCurrent.servicePrice*1000+pricesInfoCurrent.electricityPrice*1000)/1000).toFixed(2)}}元/度</b>
+								<b  v-else style="color:#080808;margin-left: 4px;">{{pricesInfoCurrent.costPrice.toFixed(2)}}元/度</b>
+									
 								</td>
 						
 							</tr>
@@ -378,7 +389,7 @@
 			</view>
 
 			<!-- 价格信息 -->
-			<view class="price-infos">
+			<view class="price-infos" v-if="pricesInfoCurrent">
 				<view class="title">
 					价格信息<text>（{{pricesInfoCurrent.startTime}}-{{pricesInfoCurrent.endTime}}）</text>
 				</view>
@@ -388,7 +399,7 @@
 							游客价
 						</view>
 						<view class="unit-price">
-							<text>{{pricesInfoCurrent.servicePrice+pricesInfoCurrent.electricityPrice}}</text>
+							<text>{{(pricesInfoCurrent.servicePrice+pricesInfoCurrent.electricityPrice).toFixed(2)}}</text>
 							
 							<text class="unit">元/度</text>
 						</view>
@@ -450,12 +461,12 @@
 									服务费
 								</view>
 							</view>
-							<view class="value"  v-if="station&&station.giveDiscount||(pricesInfoCurrent2.discountServicePrice)">
-								{{pricesInfoCurrent2.discountServicePrice.toFixed(2)}}元/度
-							</view>
-							<view class="value"   v-if="station&&!station.giveDiscount&&(!pricesInfoCurrent2.discountServicePrice)">
-								{{pricesInfoCurrent2.servicePrice.toFixed(2)}}元/度
+							<view class="value"  v-if="station">
+								<span v-if="(personInfo&&personInfo.userType==2)&&(station.giveDiscount||(pricesInfoCurrent2.discountServicePrice))">
+								{{pricesInfoCurrent2.discountServicePrice.toFixed(2)}}元/度</span>
+								<span v-else>{{pricesInfoCurrent2.servicePrice.toFixed(2)}}元/度</span>
 							</view>
+							
 						</view>
 					</view>
 					
@@ -470,30 +481,42 @@
 						 }"
 						 @click="pricesInfoCurrent2=item"
 					>
-						<span class="chats0" v-if="pricesInfoCurrent.startTime==item.startTime" >
-							<span>当前</span>
-							<span>时段</span>
-							
-						</span>
 						
-						<template  v-if="station&&station.giveDiscount||(item.discountServicePrice)">
-							<span class="chats1" :style="'height:'+getH(item.discountServicePrice)">{{item.discountServicePrice}}</span>
-							
-						</template>
-						<template  v-if="station&&!station.giveDiscount&&(!item.discountServicePrice)">
-							<span class="chats1" :style="'height:'+getH(item.servicePrice)">{{item.servicePrice}}</span>
-							
+						<template v-if="station">
+							<template  v-if="(personInfo&&personInfo.userType==2)&&(station.giveDiscount||(pricesInfoCurrent2.discountServicePrice))">
+								<span class="chats1" :style="'height:'+getH(item.discountServicePrice)">{{item.discountServicePrice}}</span>
+								
+							</template>
+							<template  v-else>
+								<span class="chats1" :style="'height:'+getH(item.servicePrice)">{{item.servicePrice}}</span>
+								
+							</template>
 						</template>
 						
 						
+						
 						<span class="chats2" :style="'height:'+getH(item.electricityPrice)">
 							<span>{{item.electricityPrice}}</span>
-							
-							<span style="text-align: start;color: #9E9E9E;" v-if="i%2==0" >{{item.startTime}}</span>
+							<span class="chats0" v-if="pricesInfoCurrent.startTime==item.startTime" >
+								<span>当前</span>
+								<span>时段</span>
+								
+							</span>
+							<span class="chats9" v-else >
+								<span>当前</span>
+								<span>时段</span>
+								
+							</span>
 						</span>
 					</view>
+				</view>
+				<view class="chat_hhh_time">
+					<span>00:00</span>
+					<span>12:00</span>
+					<span>24:00</span>
 				</view>
-			</view>
+			</view>
+			
 			<!-- 附加信息 -->
 			<view class="overhead-infos">
 				<view class="item"  v-if="stationDetail.station.describe" >
@@ -585,7 +608,7 @@
 
 				},
 				openlist: null,
-				personInfo: {},
+				personInfo: null,
 				info: {
 					station: {
 
@@ -1504,7 +1527,7 @@
 
 			// 总计
 			.statistics {
-				width: 316rpx;
+				width: 406rpx;
 				border: 1px solid rgba(204, 204, 204, 1);
 				padding: 0 16rpx;
 				height: 48rpx;
@@ -1525,8 +1548,10 @@
 				.item{
 					.open-time{
 						border-bottom: 1px solid rgba(238, 242, 240, 100);
-						padding-left: 150rpx;
-						padding-bottom: 40rpx;
+						// padding-left: 150rpx;
+						// padding-bottom: 40rpx;
+						    display: flex;
+							    justify-content: center;
 						line-height: 18px;
 						font-size: 14px;
 						color: rgb(136, 136, 136);
@@ -1577,7 +1602,11 @@
 									color: rgba(51, 51, 51, 1);
 									font-size: 36rpx;
 									font-weight: bold;
-
+									    width: 320rpx;
+									 white-space: nowrap;
+									overflow: hidden;
+									    text-overflow: ellipsis;
+										
 									text {
 										color: #D6D6D6;
 										font-weight: normal;
@@ -1611,17 +1640,30 @@
 					background-color: rgba(0, 185, 98, 1);
 					color: rgba(255, 255, 255, 1);
 
-					text-align: center;
+					text-align: center;
+					
 					
+				}
+				.not-open-tag {
+					background-color: rgba(192, 196, 208, 100);
+				
+				}
+				.not-enable-Appointment{
+					width: 168rpx ;
+					height: 56rpx  ;
+					line-height: 56rpx;
+					font-size: 32rpx;
 				}
 
 				.electric-quantity {
-					width: 96rpx;
+					width: 126rpx;
 					height: 52rpx;
 					
 					position: relative;
 
-					img {}
+					img {
+						width: 100%;
+					}
 
 					.percentage {
 						    text-align: center;
@@ -1633,8 +1675,10 @@
 						top: 50%;
 						transform: translate(-50%, -50%);
 
-					}
-				}
+					}
+					
+				}
+				
 			}
 		}
 
@@ -1665,7 +1709,7 @@
 					border-radius: 4px;
 					background-color: rgba(230, 245, 237, 1);
 					padding: 22rpx;
-
+					
 					.unit-price {
 						font-size: 56rpx;
 					}
@@ -1679,12 +1723,13 @@
 				// 游客价
 				.item-visitor {
 					color: #333333;
-
+					width: 39%;
 				}
 
 				// 会员价
 				.item-member {
-					color: #27B148;
+					color: #27B148;
+					width: 60%;
 				}
 
 				.register {
@@ -1761,6 +1806,10 @@
 
 			}
 
+		}
+		.chat_hhh_time{
+			    display: flex;
+			    justify-content: space-between;
 		}
 		.chat_hhh {
 			background: #f9f9f9;
@@ -1774,9 +1823,17 @@
 					}
 				}
 				.current2{
+					.chats1{
+						border: 1px solid #333333;
+						
+						
+						border-bottom: 0px;
+					}
 					.chats2{
 						border: 1px solid #333333;
 						background: #26FF6B !important;
+						
+						border-top: 0px;
 					}
 					
 				}
@@ -1787,16 +1844,25 @@
 					justify-content: flex-end;
 					border :1px solid #f9f9f9;
 					.chats0{
-						background-color: #ffecdd;
-						color: #ff8b17;
+						    background-color: #ff8b17;
+						    color: #ffecdd;
+						    display: flex;
+						    justify-content: center;
+						  
+							flex-wrap:wrap;
+							flex-direction: column;
+					}
+					.chats9{
+						       opacity: 0;
 						    display: flex;
 						    justify-content: center;
-						    
-							flex-wrap:wrap
+						  
+							flex-wrap:wrap;
+							flex-direction: column;
 					}
 					.chats1{
 						background: #dcdcdc;
-						min-height: 30rpx
+						min-height: 40rpx
 					}
 					.chats2{
 						background: #80e0a6;

pages/user/index.vue

@@ -519,6 +519,7 @@
 						console.log("setPersonInfoPlus")
 					}
 				}).catch(error => {
+					this.carhelp.logoff()
 					uni.showToast({
 						title: error,
 						icon: "none"