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

.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",
 }  

apis/site.js

@@ -30,7 +30,7 @@ export function getChargingStationData(data){
 
 export function searchStationData(data){
 	console.log('搜索站点数据')
-	return request({
+	return requestWhite({
 		method: 'post',
 		data: data,
 		url: '/mobile/chargingStation/searchStationData'

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/login/welcome.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="welcome">
 			<view class="welcome-state1">
-				<view class="welcome-next" @click="gotoIndex()">{{step}}|跳过</view>
+				<view class="welcome-next" @click="gotoIndex()">{{step?step+'|':''}}跳过</view>
 				<view class="welcome-foot">
 					<u-image width="185px" height="48px" src="../../static/img/logo.png"></u-image>
 				</view>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -407,10 +407,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;
@@ -425,6 +427,8 @@
 		/deep/.u-circle-progress {
 			margin-left: 23.3% !important;
 			position: relative;
+			// min-width:220px;
+			// min-height: 220px;
 		}
 
 		.u-progress-content {
@@ -558,7 +562,7 @@
 	}
 
 	.bottom2 {
-		width: 343px;
+		width: 91.4%;
 		position: fixed;
 		bottom: 0;
 		left: 0;
@@ -639,7 +643,7 @@
 
 	.bottom {
 		display: flex;
-		width: 343px;
+		width: 91.4%;
 		padding: 12px 16px;
 		position: fixed;
 		bottom: 0;
@@ -649,7 +653,7 @@
 
 		.u-size-default {
 			border: 1px solid rgba(0, 185, 98, 100);
-			color: #00b962;
+			color: #00b962;	
 			width: 44%;
 		}
 	}

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>