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

.env.test.js

@@ -8,13 +8,13 @@ const UNI_APP = {
 	NODE_ENV :"test",
 	SIMPLE_RUN:false,
 	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
-	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",
+	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",D
 	//小鹏管家appid
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
 	//zkx的测试openId
-	//openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
+	openId:"oHjCawsJ5blME36lHaSpSVfEhleU",
 	// openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
-	openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",
+	// openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",
 	//zq的测试openId
 	//openId:"oHjCawsxTJkxixR74OVp7aCKahj8",
 }  

components/Chargermap.vue

@@ -207,17 +207,25 @@
 			updateCharger(pos){
 //				console.log('更新充电桩'+JSON.stringify(this.chargerList.length) ) 
 //				console.log('更新充电桩1'+JSON.stringify(pos) ) 
-//				console.log('更新充电桩2'+JSON.stringify(this.chargerList[0].info)) 
 //				let index = this.chargerList.findIndex(item => item.info.latitude === pos.latitude && item.info.longitude === pos.longitude);
 				//let index = this.chargerList.findIndex(item => (Math.abs(item.info.longitude-pos.longitude)<0.000001 && Math.abs(item.info.longitude - pos.latitude)<0.000001));
 				let index = this.chargerList.findIndex(item => item.info.id === pos.id);
 //					console.log('更新充电桩['+ index + ']'+JSON.stringify(pos)) 
+				let colorBg = '#00BAC8';//#00b962
+				if(this.chargerList[index].info.type =='快充'){
+					colorBg = '#8486FF'
+				}else if(this.chargerList[index].info.type =='慢充'){
+					colorBg = '#9d9fff'
+				} 
+				console.log('colorBg'+colorBg)
+				console.log('更新充电桩2'+JSON.stringify(this.chargerList[index].info)) 
+				
 				if(index>=0){
-					let station_icon2 = "width: 100px;height: 36px;line-height: 20px;border-radius: 50px;background-color: rgba(0, 185, 98, 100);text-align: center;display: flex;";
-					let corner2=" width: 0;height: 0;position: absolute;top: 36px;left: 0;right: 0;margin: auto;border-bottom: 6px solid transparent;border-left: 6px solid transparent;border-right: 6px solid transparent;border-top: 8px solid #00b962 ;";
+					let station_icon2 = "width: 100px;height: 36px;line-height: 20px;border-radius: 50px;background-color: " + colorBg +";text-align: center;display: flex;";
+					let corner2=" width: 0;height: 0;position: absolute;top: 36px;left: 0;right: 0;margin: auto;border-bottom: 6px solid transparent;border-left: 6px solid transparent;border-right: 6px solid transparent;border-top: 8px solid " + colorBg +" ;";
 					
 					let content = "<div style='" + station_icon2 + "'>";
-					content+="<div style='width: 36px;height: 36px;line-height: 36px;text-align: center;border: 1px solid rgba(0, 185, 98, 100);border-radius: 999px;background-color: #fff;color: #00b962;' class='iconfont'>&#xe606;</div>";
+					content+="<div style='width: 36px;height: 36px;line-height: 36px;text-align: center;border: 1px solid " + colorBg +";border-radius: 999px;background-color: #fff;color: " + colorBg +";' class='iconfont'>&#xe606;</div>";
 					content+="<div style='color: #ffffff;line-height: 14px;padding: 4px;'>";
 					content+="<div style='"+corner2+"'></div>";
 					content+="<div class=''>";
@@ -240,8 +248,8 @@
 					if(this.chargerList[i].info.selected != null && 
 						this.chargerList[i].info.selected)
 						{
-							let station_icon = "width: 36px;height: 36px;line-height: 36px;text-align: center;border: 1px solid rgba(133, 140, 255, 100);	color: #b58cff;	border-radius: 999px;";
-							let corner =  "width: 0;height: 0;position: absolute;top: 34px;left: 0;right: 0;margin: auto;border-bottom: 4px solid transparent;border-left: 4px solid transparent;border-right: 4px solid transparent;border-top: 6px solid #b58cff ;";
+							let station_icon = "width: 36px;height: 36px;line-height: 36px;text-align: center;border: 1px solid " + colorBg +";	color: " + colorBg +";	border-radius: 999px;";
+							let corner =  "width: 0;height: 0;position: absolute;top: 34px;left: 0;right: 0;margin: auto;border-bottom: 4px solid transparent;border-left: 4px solid transparent;border-right: 4px solid transparent;border-top: 6px solid " + colorBg +" ;";
 							let  content = "<div style='"+station_icon+"'><text class='iconfont'>&#xe606;</text><div style='" + corner+"'></div></div>"
 							
 							//let content = "<img src='"+this.chargerIcon+"' style='height: 40px;width: 40px' />";
@@ -254,10 +262,18 @@
 				
 			},
  		    addCharger(pos) {
+				
+				let colorBg = '#00BAC8';//#00b962
+				if(pos.type =='快充'){
+					colorBg = '#8486FF'
+				}else if(pos.type =='慢充'){
+					colorBg = '#9d9fff'
+				} 
+				
 //				console.log('添加充电桩'+JSON.stringify(pos))
 				//let content = "<div  style='height: 40px;width: 100px;display: flex;flex-direction: row;   flex-wrap: wrap; background-color: #00B962!important;border-radius: 20px;'>		    <div><img src='"+this.chargerIcon+"' style='idth: 40px;height: 40px'></div><div style='display: flex;flex-direction:column;color:#FFFFFF'><div>¥1.5</div><div>空闲10</div> </div></div>";
-				let station_icon = "width: 36px;height: 36px;line-height: 36px;text-align: center;border: 1px solid rgba(133, 140, 255, 100);	color: #b58cff;	border-radius: 999px;";	
-				let corner =  "width: 0;height: 0;position: absolute;top: 34px;left: 0;right: 0;margin: auto;border-bottom: 4px solid transparent;border-left: 4px solid transparent;border-right: 4px solid transparent;border-top: 6px solid #b58cff ;";
+				let station_icon = "width: 36px;height: 36px;line-height: 36px;text-align: center;border: 1px solid "+ colorBg+";	color: "+ colorBg+";	border-radius: 999px;";	
+				let corner =  "width: 0;height: 0;position: absolute;top: 34px;left: 0;right: 0;margin: auto;border-bottom: 4px solid transparent;border-left: 4px solid transparent;border-right: 4px solid transparent;border-top: 6px solid "+ colorBg+" ;";
 				let  content = "<div style='"+station_icon+"'><text class='iconfont'>&#xe606;</text><div style='" + corner+"'></div></div>"
 				
 				let marker = new AMap.Marker({

pages/index/index.vue

@@ -513,10 +513,8 @@
 	.station {
 		width:91.4%;
 		height: 120px;
-		margin-top: 20px auto 0 ;
-		padding-top: 20px;
+		margin: 20px auto 0 ;
 		position: relative;
-
 		.img-box {
 			width: 100%;
 			height: 100%;
@@ -624,7 +622,7 @@
 
 			// 数量
 			.count {
-				margin-top: 12px !important;
+				margin-top: 14px !important;
 				width: 100%;
 				display: flex;
 				justify-content: space-between;

pages/searchPile/chargeProcess/dcCharging.vue

@@ -409,10 +409,12 @@
 	}
 
 	.bot {
-		width: 220px;
-		height: 220px;
+		width:100%;
+		height:0;
+		padding-top: 100%;
 		border: 2px #00b962 dotted;
-		border-radius: 999px;
+		border-radius:100%;
+		box-sizing: border-box;
 		position: absolute;
 		top: 0px;
 		left: 0px;
@@ -427,6 +429,8 @@
 		/deep/.u-circle-progress {
 			margin-left: 23.3% !important;
 			position: relative;
+			// min-width:220px;
+			// min-height: 220px;
 		}
 
 		.u-progress-content {
@@ -560,7 +564,7 @@
 	}
 
 	.bottom2 {
-		width: 343px;
+		width: 91.4%;
 		position: fixed;
 		bottom: 0;
 		left: 0;
@@ -641,7 +645,7 @@
 
 	.bottom {
 		display: flex;
-		width: 343px;
+		width: 91.4%;
 		padding: 12px 16px;
 		position: fixed;
 		bottom: 0;
@@ -651,7 +655,7 @@
 
 		.u-size-default {
 			border: 1px solid rgba(0, 185, 98, 100);
-			color: #00b962;
+			color: #00b962;	
 			width: 44%;
 		}
 	}

pages/searchPile/searchPile.vue

@@ -607,8 +607,8 @@ export default {
 				
 
 				if(data1.findType == "0")
-				{
-//					console.log('getChargingStationData res1'+JSON.stringify(res));
+				{					
+					console.log('getChargingStationData res1'+JSON.stringify(res));
 					_self.stationsmap = [];
 					for(let i = 0;i<items.length;i++)
 					{
@@ -678,7 +678,7 @@ export default {
 				}else if(data1.findType == "1")
 				{
 					_self.stationslist = [];
-	//				console.log('getChargingStationData res2'+JSON.stringify(res));
+					console.log('getChargingStationData res2'+JSON.stringify(res));
 					for(let i = 0;i<items.length;i++)
 					{
 						

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -1,12 +1,10 @@
 <template>
 	<view style="padding-bottom: 148px;">
 		<u-navbar title="充电价格详情"></u-navbar>
-		<view class="main">
+		<view class="main" >
 			<view class="tabs-box">
-				<u-tabs itemStyle="width:300px" inactive-color="#888888" active-color="#101010" :list="list" :is-scroll="true"
-        :style="{
-          width: '650rpx',
-        }"					:current="current" @change="change"></u-tabs>
+				<u-tabs  inactive-color="#888888" active-color="#101010" :list="list" :is-scroll="true"
+      					:current="current" @change="change"></u-tabs>
 			</view>
 			<view class="line-box"><u-line color="#999999" /></view>
 			<view  class="time-frame" v-for="(item,index) in items" :key="index">
@@ -41,7 +39,17 @@
 				list: [
 			 	{
 					name: '直流快充', 
-				}, {
+				}, 
+				{
+					name: '交流慢充', 
+				} ,
+				{
+					name: '交流慢充', 
+				} ,
+				{
+					name: '交流慢充', 
+				} ,
+				{
 					name: '交流慢充', 
 				} 
 				],
@@ -107,15 +115,16 @@
        
 		.tabs-box {
 			width: 55%;
+			height: 44px;
 			margin: 0 auto;
-			line-height: 44px;
+			// line-height: 44px;
 			position: relative;
 		}
 			.line-box{
 				width: 100%;
-				height: 100%;
+				height: 44px;
 				position: absolute;
-				top: 79px;
+				top: 86px;
 			}
 
 		.time-frame {
@@ -164,4 +173,8 @@
 		left: 0;
 		
 		}
+		
+		.tabs-box{
+			width: 90% !important;
+		}
 </style>

pages/searchPile/stationAndPile/stationDetails.vue

@@ -434,7 +434,6 @@
 			}
 
 			.right-text {
-				width: 15%;
 				font-size: 14px;
 				position: absolute;
 				top: 23px;

pages/user/finance/recharge.vue

@@ -53,7 +53,7 @@
 					
 			<view class="recharge-btn">
 				<u-checkbox-group>
-					<u-checkbox v-model="checked" shape="circle" @change="checkboxChange()">我已阅读并同意《充值协议》</u-checkbox>
+					<u-checkbox active-color="green" v-model="checked" shape="circle" @change="checkboxChange()">我已阅读并同意《充值协议》</u-checkbox>
 				</u-checkbox-group>
 				<u-button class="success-btn" shape="circle" type="success" @click="rechargeNow">
 					<span>立即充值</span>