Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

.env.dev.js

@@ -1,20 +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","da6e714d-c5a8-4f76-8132-5f4a56677130"],
-	defaultStation:["160cb8c6-5686-442a-8dbb-f067f30019dc"],
+	defaultStation:["160cb8c6-5686-442a-8dbb-f067f30019dc"],
+	defaultStation:[],
 	openId:"zkxtest",//zkx
 	
-	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
-	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
+	openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	//openId:"oK9Wr5-ViXQMUP2cjiW3bGIABj1Q",
 	//openId:"oK9Wr5wkU3OwWhQ7mRrLZ5MDZNHo",
 	//		openId:"oK9Wr50ojExHjOTC_wFcuAEI9s-M",

apis/site.js

@@ -23,22 +23,12 @@ export function getChargingStationPrice3(data){
 		data.recordId=""
 	}
 	var info=carhelp.getPersonInfo()
-	if(info){
-		return request({
-			method: 'post',
-			data: data,
-			url: '/mobile/chargingStation/chargingStationPrice2'
-		})
-	}else{
-		return requestWhite({
-			method: 'post',
-			data: data,
-			url: '/mobile/chargingStation/chargingStationPrice'
-		})
-	}
+	return requestWhite({
+		method: 'post',
+		data: data,
+		url: '/mobile/chargingStation/chargingStationPrice2'
+	})
 
-	
-	
 }
 export function getChargingStationData(data){
 	return requestWhite({

pages/searchPile/chargeProcess/dcCharging.vue

@@ -408,14 +408,26 @@
 							<p class="time">{{price.startTime}}-{{price.endTime}}</p>
 						</view>
 						<view class="detail">
-							<p class="electrovalence"><text class="num">{{chargingRecord.userCardId?price.electricityPrice.toFixed(2):price.costPrice.toFixed(2)}}</text> 元/度</p>
+							<p class="electrovalence">
+								<text class="num" v-if="chargingRecord.userCardId">{{price.electricityPrice.toFixed(2)}}</text>
+								<text  class="num" v-else>
+									<template v-if="(personInfo&&personInfo.userType==2)&&(chargingStation.giveDiscount||price.discountServicePrice)">
+										<span style="    text-decoration: line-through;">(item.electricityPrice+item.discountServicePrice).toFixed(2)}}</span>折后{{price.discountServicePrice}}
+									</template>
+									<template v-else>
+										{{(price.electricityPrice+price.servicePrice).toFixed(2)}}
+										 
+									</template>
+								
+								</text>
+							元/度</p>
 							<p class="electrovalence-monthlyCard">电价:{{price.electricityPrice}} | 服务费:
 							
 							<template v-if="chargingRecord.userCardId">
 								0(月卡)
 							</template>
 							<template v-else>
-								<template v-if="chargingStation.giveDiscount||price.discountServicePrice">
+								<template v-if="(personInfo&&personInfo.userType==2)&&(chargingStation.giveDiscount||price.discountServicePrice)">
 									<span style="    text-decoration: line-through;">{{price.servicePrice}}</span>折后{{price.discountServicePrice}}
 								</template>
 								<template v-else>

pages/searchPile/searchPile.vue

@@ -1113,14 +1113,14 @@
 		}
 	}
 .charing-slow-2{
-	 margin: 0 0 10px 0 !important;
+	 margin: 0 0 20rpx 0 !important;
 	 // border-bottom: 1px solid rgba(238, 242, 240, 100);
 	 
  }
 	.charing-slow {
 		box-shadow: 0px 4rpx 12rpx 0px #008c4a33;
 		background-color: #fff;
-		margin: 36rpx;
+		margin: 26rpx;
 		border-radius: 16rpx;
 		padding: 40rpx 24rpx 24rpx;
 		position: relative;

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -1399,7 +1399,7 @@
 }
 // 费用说明
 .cost-explain{
-	margin: 0px 40rpx 24rpx 40rpx;
+	margin: 24rpx 40rpx 24rpx 40rpx;
 	padding: 40rpx;
 	background-color: #fff;
 	border-radius: 12px;

pages/searchPile/stationAndPile/stationDetails.vue

@@ -2,8 +2,9 @@
 	<view>
 		<ujp-navbar title="站点详情">
 			<view slot="right" style="margin-right: 10px;" @click="openModalBl=true">
-				<view class="iconfont qr-code">
-					&#xe60d;
+				
+				<view class="iconfont service">
+					&#xe60d;
 				</view>
 			</view>
 		</ujp-navbar>
@@ -229,7 +230,7 @@
 							'off-line b':item.isRed&&item.workStatus!=2,
 						}">
 							<view class="state-icon">
-								<img src="../../../assets/img/pileIcon.png" alt="">
+								<img src="../../../assets/img/pileIcon.svg" alt="">
 							</view>
 							<view class="state-text" v-if="item.workStatus == 0&&item.insertStatus&&stationDetail.station.stationType!=50">
 								已插枪
@@ -245,7 +246,7 @@
 						</view>
 						<view class="state off-line" v-else>
 							<view class="state-icon">
-								<img src="../../../assets/img/pileIcon.png" alt="">
+								<img src="../../../assets/img/pileIcon.svg" alt="">
 							</view>
 							<view class="state-text ">
 								离线
@@ -301,14 +302,19 @@
 						</template>
 						<!-- 电量 -->
 												<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">
+													<img src="../../../assets/img/electricQuantity.svg" alt="">
+													<view class=""  v-if="true"
+													:class="{
+														percentage:item.soc,
+														percentage2:!item.soc
+													}">
 														{{item.soc?item.soc+'%':'充电中'}}
+													</view>
+													<view v-else class="percentage2"
+													>
+														充电中
 													</view>
 												</view>
 												
@@ -389,17 +395,18 @@
 			</view>
 
 			<!-- 价格信息 -->
-			<view class="price-infos" v-if="pricesInfoCurrent">
+			<view class="price-infos" v-if="pricesInfoCurrent2">
 				<view class="title">
-					价格信息<text>（{{pricesInfoCurrent.startTime}}-{{pricesInfoCurrent.endTime}}）</text>
-				</view>
-				<view class="classify" v-if="!personInfo||personInfo.userType==1">
+					价格信息<text>（{{pricesInfoCurrent2.startTime}}-{{pricesInfoCurrent2.endTime}}）</text>
+				</view>
+				
+				<view class="classify" v-if="(!personInfo||personInfo.userType==1)&&station&&(station.giveDiscount||(pricesInfoCurrent2.discountServicePrice))">
 					<view class="item item-visitor">
 						<view class="visitor">
 							游客价
 						</view>
 						<view class="unit-price">
-							<text>{{(pricesInfoCurrent.servicePrice+pricesInfoCurrent.electricityPrice).toFixed(2)}}</text>
+							<text>{{(pricesInfoCurrent2.servicePrice+pricesInfoCurrent2.electricityPrice).toFixed(2)}}</text>
 							
 							<text class="unit">元/度</text>
 						</view>
@@ -411,12 +418,28 @@
 						</view>
 						<view class="unit-price">
 							
-							<text>{{pricesInfoCurrent.costPrice}}</text>
+							<text>{{pricesInfoCurrent2.costPrice.toFixed(2)}}</text>
 							
 							<text class="unit">元/度</text>
 							<text class="register" @click="gotoUrl('pages/login/login')">注册</text>
 						</view>
 					</view>
+				</view>
+				<view class="classify" v-else>
+					
+				
+					<view class="item item-member-all">
+						<view class="visitor">
+							当前电价
+						</view>
+						<view class="unit-price">
+							
+							<text>{{pricesInfoCurrent2.costPrice.toFixed(2)}}</text>
+							
+							<text class="unit">元/度</text>
+							
+						</view>
+					</view>
 				</view>
 				<!-- 提示 -->
 				<p class="hint">*该价格为含服务费价格，实际价格以扫码价格为准。</p>
@@ -483,7 +506,7 @@
 					>
 						
 						<template v-if="station">
-							<template  v-if="(personInfo&&personInfo.userType==2)&&(station.giveDiscount||(pricesInfoCurrent2.discountServicePrice))">
+							<template  v-if="(personInfo&&personInfo.userType==2)&&(station.giveDiscount||(item.discountServicePrice))">
 								<span class="chats1" :style="'height:'+getH(item.discountServicePrice)">{{item.discountServicePrice}}</span>
 								
 							</template>
@@ -518,7 +541,7 @@
 			</view>
 			
 			<!-- 附加信息 -->
-			<view class="overhead-infos">
+			<view class="overhead-infos"  v-if="stationDetail&&(stationDetail.station.describe||stationDetail.station.parkingDescription)">
 				<view class="item"  v-if="stationDetail.station.describe" >
 					<view class="title">
 						营业时间
@@ -1280,7 +1303,32 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped>
+	.oldTextClassF{
+		.stationDetail .title{
+			font-size: 62rpx;
+			
+		}
+		.stationDetail .position .address{
+			font-size: 38rpx;
+		}
+		.stationDetail .type .type-box .box-top .pile-type{
+			font-size: 38rpx;
+			color: #101010;
+		}
+		.stationDetail .pile-state .gun-details .item .itemShowOpen .itemView .infos .gun-name{
+			font-size: 48rpx;
+		}
+		.stationDetail .price-infos .title{
+			font-size: 38rpx;
+		}
+		
+	}
+	.service {
+		font-size: 24px;
+		color: #101010;
+		
+	}
 	page {
 		background-color: #F2F2F2;
 
@@ -1375,19 +1423,20 @@
 			margin-bottom: 24rpx;
 
 			.block {
-				width: 88rpx;
+				width: 96rpx;
 				height: 40rpx;
 				line-height: 40rpx;
 				border-radius: 50px;
 				background-color: rgba(0, 185, 98, 1);
 				color: rgba(255, 255, 255, 1);
 				font-size: 22rpx;
-				text-align: center;
+				text-align: center;
+				padding:0 4rpx;
 			}
 
 			.address {
 				width: 460rpx;
-				margin-left: 16rpx;
+				//margin-left: 16rpx;
 				color: rgba(16, 16, 16, 1);
 				font-size: 32rpx;
 				line-height: 44rpx;
@@ -1440,7 +1489,7 @@
 			}
 			.type-box {
 				//width: 334rpx;
-				//padding: 16rpx 84rpx;
+				padding: 8rpx 0;
 				width: 32%;
 				border-radius: 8rpx;
 				background-color: rgba(255, 255, 255, 1);
@@ -1592,7 +1641,7 @@
 
 							//充电中
 							.charging {
-								background: linear-gradient(180deg, rgba(154, 192, 255, 1) 0%, rgba(22, 119, 255, 1) 100%);
+								background: linear-gradient(180deg, #FFC146 0%, #FF6B00 100%);
 							}
 
 							// 离线
@@ -1662,20 +1711,37 @@
 				}
 
 				.electric-quantity {
-					width: 126rpx;
+					width: 168rpx;
 					height: 52rpx;
 					
 					position: relative;
 
 					img {
-						width: 100%;
+						
+						width: 168rpx;
+						height: 72rpx;
 					}
+					.percentage2 {
+						    text-align: center;
+						width: 126rpx;
+						height: 72rpx;
+						color: rgba(255, 255, 255, 1);
+						font-size: 30rpx;
+						line-height:  88rpx;
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						transform: translate(-50%, -50%);
 
+					}
+					
 					.percentage {
 						    text-align: center;
-						width: 86rpx;
+						width: 126rpx;
+						height: 72rpx;
 						color: rgba(255, 255, 255, 1);
-						font-size: 24rpx;
+						font-size: 34rpx;
+						line-height:  88rpx;
 						position: absolute;
 						left: 50%;
 						top: 34rpx;
@@ -1741,7 +1807,12 @@
 					color: #27B148;
 					width: 60%;
 				}
-
+				// 会员价
+				.item-member-all {
+					color: #27B148;
+					width: 100%;
+				}
+				
 				.register {
 					padding: 4rpx 12rpx;
 					height: 24px;
@@ -1854,8 +1925,8 @@
 					justify-content: flex-end;
 					border :1px solid #f9f9f9;
 					.chats0{
-						    background-color: #ff8b17;
-						    color: #ffecdd;
+						    // background-color: #ff8b17;
+						    // color: #ffecdd;
 						    display: flex;
 						    justify-content: center;
 						  
@@ -1872,7 +1943,7 @@
 					}
 					.chats1{
 						background: #dcdcdc;
-						min-height: 40rpx
+						min-height: 30rpx
 					}
 					.chats2{
 						background: #80e0a6;

pages/user/index.vue

@@ -138,7 +138,7 @@
 				<view class="item-icon">
 					<img src="@/assets/img/gologin/img3.svg">
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					充电记录
 				</view>
 			</view>
@@ -147,7 +147,7 @@
 					
 					<img src="@/assets/img/gologin/img4.svg">
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					我的预约
 				</view>
 			</view>
@@ -157,7 +157,7 @@
 				<view class="item-icon">
 						<img src="@/assets/img/gologin/img1.svg">
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					我的发票
 				</view>
 			</view>
@@ -165,7 +165,7 @@
 				<view class="item-icon">
 						<img src="@/assets/img/gologin/img2.svg">
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					我要充值
 				</view>
 			</view>
@@ -177,7 +177,7 @@
 				<view class="item-icon">
 					<i class="ri-customer-service-2-line"></i>
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					联系客服
 				</view>
 			</view>
@@ -185,7 +185,7 @@
 				<view class="item-icon">
 					<i class="ri-feedback-line"></i>
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					意见反馈
 				</view>
 			</view>
@@ -193,7 +193,7 @@
 				<view class="item-icon">
 					<i class="ri-compass-3-line"></i>
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					操作指南
 				</view>
 			</view>
@@ -201,7 +201,7 @@
 				<view class="item-icon">
 					<i class="ri-account-pin-box-line"></i>
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					关于我们
 				</view>
 			</view>
@@ -217,7 +217,7 @@
 				<view class="item-icon">
 					<i class="ri-file-add-line"></i>
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					免费安桩
 				</view>
 			</view>
@@ -225,7 +225,7 @@
 				<view class="item-icon">
 					<i class="ri-service-line"></i>
 				</view>
-				<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+				<view class="item-name " oldstyle="font-size: 16px;">
 					我要加盟
 				</view>
 			</view>
@@ -235,7 +235,7 @@
 						<u-icon name="setting" size="24px" ></u-icon>
 
 					</view>
-					<view class="item-name oldTextjp" oldstyle="font-size: 16px;">
+					<view class="item-name " oldstyle="font-size: 16px;">
 						设置
 					</view>
 				</view>
@@ -484,10 +484,12 @@
 					title: "加载中",
 					mask: true,
 				})		
+				
 				loginApi.findByOpenId({
 					openId: this.carhelp.getOpenId()
 				}).then((res) => {
 					uni.hideLoading();
+					
 					this.businessVipList=res.data.businessVipList;
 					if(this.businessVipList.length){
 						var b=false;
@@ -505,9 +507,12 @@
 					this.nickName = res.data.regUser.nickName;
 					this.userCard=res.data.userCard;
 					var phone = res.data.regUser.phone;
-					var phone1 = phone.slice(0,3);
-					var phone2 = phone.slice(-4);
-					this.userPhone = phone1 + '****' + phone2;
+					if(phone){
+						var phone1 = phone.slice(0,3);
+						var phone2 = phone.slice(-4);
+						this.userPhone = phone1 + '****' + phone2;
+					}
+					
 					
 					if (res.code == 200&&res.result) {
 						var token = res ? res.data.token : '';	
@@ -986,8 +991,8 @@
 	.menu {
 		background-color: #fff;
 		width: 91.4%;
-		margin: 12px auto 0;
-		padding: 0 12px 9px 12px;
+		margin: 24px auto 0;
+		padding: 0 24rpx 18rpx 24rpx;
 		border-radius: 8px;
 		display: flex;
 		flex-wrap: wrap;
@@ -995,8 +1000,8 @@
 
 		.item {
 			width: 25%;
-			margin-top: 20px;
-			margin-bottom: 11px;
+			margin-top: 40rpx;
+			margin-bottom: 22rpx;
 			display: flex;
 			flex-direction: column;
 			align-items: center;