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

_theme.scss

@@ -7,22 +7,24 @@ $themes: (
  
 elder: (
 //字体
-font-size0: 12px,
-font-size1: 14px,
-font-size2: 16px,
-font-size3: 18px,
-font-size4: 20px,
-font-size5: 22px,
-font-size6: 24px,
-font-size7: 26px,
-font-size8: 28px,
-font-size9: 30px,
-font-size10: 32px,
-font-size11: 34px,
-font-size12: 36px,
-font-size13: 38px,
-font-size14: 40px,
-font-size15: 42px,
+font-size0: 24rpx,
+font-size1: 28rpx,
+font-size2: 32rpx,
+font-size3: 36rpx,
+font-size4: 40rpx,
+font-size5: 44rpx,
+font-size6: 48rpx,
+font-size7: 52rpx,
+font-size8: 56rpx,
+font-size9: 60rpx,
+font-size10: 64rpx,
+font-size11: 68rpx,
+font-size12: 72rpx,
+font-size13: 76rpx,
+font-size14: 80rpx,
+font-size15: 84rpx,
+font-size16: 88rpx,
+font-size17: 92rpx,
 
 buttonWidth: 300rpx,
 fontWeight: bold!important,
@@ -44,22 +46,24 @@ border_color1: #3d414a,
  
 standard: (
 //字体
-font-size0: 10px,
-font-size1: 12px,
-font-size2: 14px,
-font-size3: 16px,
-font-size4: 18px,
-font-size5: 20px,
-font-size6: 22px,
-font-size7: 24px,
-font-size8: 26px,
-font-size9: 28px,
-font-size10: 30px,
-font-size11: 32px,
-font-size12: 34px,
-font-size13: 36px,
-font-size14: 38px,
-font-size15: 40px,
+font-size0: 20rpx,
+font-size1: 24rpx,
+font-size2: 28rpx,
+font-size3: 32rpx,
+font-size4: 36rpx,
+font-size5: 40rpx,
+font-size6: 44rpx,
+font-size7: 48rpx,
+font-size8: 52rpx,
+font-size9: 56rpx,
+font-size10: 60rpx,
+font-size11: 64rpx,
+font-size12: 68rpx,
+font-size13: 72rpx,
+font-size14: 76rpx,
+font-size15: 80rpx,
+font-size16: 84rpx,
+font-size17: 88rpx,
 
 font_color1: #a77439,
 font_color2: white,

pages/search/search.vue

@@ -43,7 +43,7 @@
 			return {
 				inputStyle:{
 					backgroundColor: 'transparent',
-					"font-size":'18px',
+					"font-size":'36rpx',
 					"font-weight":"normal"
 				},
 				nav_height:44,
@@ -111,7 +111,7 @@
 				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 				 let data = {
 				 	backgroundColor: 'transparent',
-				 	"font-size":'18px',
+				 	"font-size":'32rpx',
 				 	"font-weight":"bold!important"
 				 };
 				 this.inputStyle = data;
@@ -121,7 +121,7 @@
 				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 				  let data  ={
 				  	backgroundColor: 'transparent',
-				  	"font-size":'16px',
+				  	"font-size":'32rpx',
 				  	"font-weight":"normal"
 				  };
 				  this.inputStyle = data;
@@ -151,6 +151,11 @@
 				MapLoader().then(AMap1 => {
 					
 					this.AMap=AMap;
+					
+					var lnglat = new AMap.LngLat(startLngLat.longitude,startLngLat.latitude);
+					var myDistance = lnglat.distance([obj.longitude, obj.latitude]);
+					obj.distance = myDistance/1000;
+					obj.time = myDistance/500;
 				/*
 					var map=new AMap.Map("container", {
 						center: [116.397559, 39.89621],
@@ -294,14 +299,11 @@
 							obj.park = items[i].park;
 							
 							
-						//var startLngLat = [_self.longitude,_self.latitude];
+						var startLngLat = {longitude: _self.longitude,latitude:  _self.latitude};
 						 //var endLngLat = [obj.longitude,obj.latitude];
-						 //_self.calculateDistance(startLngLat,obj);
+						 _self.calculateDistance(startLngLat,obj);
 						 
-						 var lnglat = new AMap.LngLat(_self.longitude,_self.latitude);
-						 var myDistance = lnglat.distance([obj.longitude, obj.latitude]);
-						 obj.distance = myDistance/1000;
-						 obj.time = myDistance/500;
+						
 						 
 						 /*
 						 _self.item.distance = myDistance/1000;

pages/searchPile/searchPile.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class='font1'>
-		<u-navbar :is-back="false" height="88" style="background-color: bisque;">
+		<u-navbar :is-back="false" :height='nav_height'style="background-color: bisque;">
 			<view style="display: flex;flex-direction: column; width: 100%;height: 100%;">
 				<view style="display: flex;flex-direction: row; height: 100%; align-items: center;margin-top:0rpx;padding-top: 0rpx;padding-bottom: 20rpx;">
 					<view style="margin-left:20rpx;width: 160rpx;">
 						<uni-combox class='font2' ref="city" :border="false" v-model="area" :candidates="cities" @updateModel='updateCity' @updateSelector="updateCitySelector"></uni-combox> 
  					</view>
 					<view style="margin-left: 20rpx;margin-right: 20rpx; flex:1" >
-						<u-search :input-style='inputStyle' placeholder="搜索站点名称" v-model="keyword" :showAction="false"  @focus="navigate"></u-search></view>
+						<u-search height="88" :input-style='inputStyle' placeholder="搜索站点名称" v-model="keyword" :showAction="false"  @focus="navigate"></u-search></view>
 					<view style="margin-right: 20rpx;" v-show="viewMode" @click="listMode">
 						<text class="iconfont">&#xe613;</text> <text class="list font2">列表</text>
 <!--						<u-icon name="list-dot" size="26" color="#c0c4cc"></u-icon>
@@ -179,7 +179,7 @@
 				<view>
 					<Chargermap @onMoveStart="moveStart"   @onMoveEnd="moveEnd" ref="amap" @onClicked="onClicked" @onload="mapdown" @clickMap="clickMap"></Chargermap>
 					<!--@location="location"-->
-					<u-image style='position:absolute;z-index:1023;right:20px;bottom:260px;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
+					<u-image style='position:absolute;z-index:1023;right:40rpx;bottom:520rpx;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
 					 
 				</view>
 				<view v-if="stationsmap.length>0" class="chargerCard" style="border-radius: 20rpx;"> 
@@ -289,6 +289,7 @@ export default {
 				"font-size":'18px',
 				"font-weight":"normal"
 			},
+			nav_height:88,
 			elderMode:false,
 			showCity:false,
 			showType:false,
@@ -357,6 +358,9 @@ export default {
 	},
 	onLoad(op) {
 		_self = this;
+		
+		var px = uni.upx2px(172);
+		this.nav_height = px;
 //		console.log('longitude0  ' + _self.longitude);
 //		console.log('latitude0  ' + _self.latitude);
 		if (op != null) {
@@ -1163,7 +1167,7 @@ export default {
 			document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 			let data = {
 				backgroundColor: 'transparent',
-				"font-size":'18px',
+				"font-size":'36rpx',
 				"font-weight":"bold!important"
 			};
 			this.inputStyle = data;
@@ -1173,7 +1177,7 @@ export default {
 			document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 			let data  ={
 				backgroundColor: 'transparent',
-				"font-size":'16px',
+				"font-size":'36rpx',
 				"font-weight":"normal"
 			};
 			this.inputStyle = data;
@@ -1227,7 +1231,7 @@ export default {
 	text-align: center;
 	border-style: none;
 	width: 20%;
-	height: 28px;
+	height: 56rpx;
 	@include themeify{
 		font-size: themed('font-size1');
 		line-height: themed('font-size2');
@@ -1241,7 +1245,7 @@ export default {
 	text-align: center;
 	border-style: none;
 	width: 22%;
-	height: 28px;
+	height: 56rpx;
 	@include themeify{
 		font-size: themed('font-size1');
 		line-height: themed('font-size2');
@@ -1256,7 +1260,7 @@ export default {
 	text-align: center;
 	width: 28%;
 	border-style: none;
-	height: 28px;
+	height: 56rpx;
 	@include themeify{
 		font-size: themed('font-size1');
 		line-height: themed('font-size2');
@@ -1274,13 +1278,13 @@ export default {
 }
 .pre-btn{
 	width: 100%;
-	height: 48px;
+	height: 96rpx;
 	z-index: 999;
 }
 
 .btn-1,.btn-2{
-	height: 48px;
-	line-height: 48px;
+	height: 96rpx;
+	line-height: 96rpx;
 	text-align: center;
 	border-top: 1px solid rgba(225, 228, 232, 100);
 }
@@ -1302,9 +1306,9 @@ export default {
 	z-index:1021
 */
 	background-color: #fff;
-	margin: 0 12px;
-	border-radius: 8px;
-	padding: 10px 12px 0px;
+	margin: 0 24rpx;
+	border-radius: 16rpx;
+	padding: 20rpx 24rpx 0rpx;
 	bottom: 68px;
 	left: 0;
 	right: 0;	
@@ -1374,28 +1378,29 @@ export default {
  }
  
  .list {
- 	margin-left: 2px;
+ 	margin-left: 4rpx;
  
  }
  
  .charing-slow {
  	background-color: #fff;
-	margin: 20rpx;
-	border-radius: 8px;
- 	padding: 10px 12px 0px;
+	margin: 40rpx;
+	border-radius: 16rpx;
+ 	padding: 20rpx 24rpx 0rpx;
  	position: relative;
  	left: 0;
  	right: 0;
 }
  	.fast-charge {
  		display: inline-block;
- 		width: 44px;
-/* 		height: 20px;
+ /*		width: 44px;
+ 		height: 20px;
  		line-height: 20px;*/
- 		border-radius: 50px;
+ 		border-radius: 100rpx;
  		background-color: #9d9fff;
  		color: rgba(255, 255, 255, 100);
 		@include themeify{
+			width: themed('font-size17');
 			font-size: themed('font-size1');
 			line-height: themed('font-size5');
 			height: themed('font-size5');
@@ -1405,13 +1410,14 @@ export default {
 	
 	.fast-trickle-charge {
 		display: inline-block;
-		width: 66px;
-/*		height: 20px;
+	/*	width: 66px;
+		height: 20px;
 		line-height: 20px;*/
-		border-radius: 50px;
+		border-radius: 100rpx;
 		background-color: #00BAC8;
 		color: rgba(255, 255, 255, 100); 
 		@include themeify{
+			width: themed('font-size17');
 			font-size: themed('font-size1');
 			line-height: themed('font-size5');
 			height: themed('font-size5');
@@ -1420,13 +1426,14 @@ export default {
 	}
 	.trickle-charge {
 		display: inline-block;
-		width: 44px;
-/*		height: 20px;
+	/*	width: 44px;
+		height: 20px;
 		line-height: 20px;*/
-		border-radius: 50px;
+		border-radius: 100rpx;
 		background-color: rgba(0, 185, 98, 100);
 		color: rgba(255, 255, 255, 100);
 		@include themeify{
+			width: themed('font-size17');			
 			font-size: themed('font-size1');
 			line-height: themed('font-size5');
 			height: themed('font-size5');
@@ -1445,7 +1452,7 @@ export default {
 			height: themed('font-size3');
 		}
 /* 		font-size: 16px;*/
- 		margin-left: 4px;
+ 		margin-left: 8rpx;
  		color: #101010;
  
  
@@ -1453,8 +1460,8 @@ export default {
 	
 	.fast-charge {
 		display: inline-block;
-		width: 44px;
-/*		height: 20px;
+	/*	width: 44px;
+		height: 20px;
 		line-height: 20px;*/
 		border-radius: 50px;
 		background-color: #9d9fff;
@@ -1462,6 +1469,7 @@ export default {
 /*		font-size: 12px;*/
 		
 		@include themeify{
+			width: themed('font-size17');
 			font-size: themed('font-size1');
  			line-height: themed('font-size5');
 			height: themed('font-size5');
@@ -1470,7 +1478,7 @@ export default {
 	}
  
  	.address {
- 		margin-top: 8px;
+ 		margin-top: 16rpx;
 /* 		line-height: 16px;*/
 		@include themeify{
 			font-size: themed('font-size1');
@@ -1482,7 +1490,7 @@ export default {
  
  	.price {
  		display: flex;
- 		height: 20px;
+ 		height: 40rpx;
  
  	}
  
@@ -1511,11 +1519,11 @@ export default {
 /* 	font-size: 14px;*/
  	text-align: left;
  	font-family: AlibabaPuHui-regular;
- 	margin-top: 6px;
- 	margin-left: 4px;
+ 	margin-top: 12rpx;
+ 	margin-left: 8rpx;
  }
  	.park {
- 		margin-top: 8px;
+ 		margin-top: 16rpx;
  		display: flex;
  
  		

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -118,7 +118,7 @@
 				this.items = this.list[index].items;
 			},
 			theme(type) {
-			  if(type == 'dark')	
+			  if(type == 'elder')	
 			  {
 				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 				  

pages/searchPile/stationAndPile/stationDetails.vue

@@ -469,7 +469,7 @@
 					 
 				})
 			},theme(type) { 
-			  if(type == 'dark')	
+			  if(type == 'elder')	
 			  {
  				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
  				  

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -5,7 +5,7 @@
 			 
 			<view>
 				<Chargermap   ref="amap" @onload="mapdown" @clickMap="clickMap"></Chargermap>
-				<u-image style='position:absolute;z-index:1023;right:20px;bottom:220px;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
+				<u-image style='position:absolute;z-index:1023;right:40rpx;bottom:440rpx;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
 			</view>
 			 
 			 <view class="chargerCard" @click="stationDetail(item)">

pages/user/finance/refundApp.vue

@@ -37,7 +37,7 @@
 		},
 		methods: {
 			theme(type) {
-			  if(type == 'dark')	
+			  if(type == 'elder')	
 			  {
 				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 				  
@@ -70,33 +70,47 @@
 		text-align: center;
 		padding: 50px 0;
 		.title{
-			font-size: 20px;
-			margin-top: 20px;
+/*			font-size: 20px;*/
+			margin-top: 40rpx;
+			@include themeify{
+				font-size:themed('font-size5'); 
+				font-weight: themed('fontWeight');
+				letter-spacing: themed('letterSpacing');
+			}
 		}
 		.payPrice{
 			display: flex;
 			align-items: flex-end;
 			justify-content: center;
 			font{
-				font-size: 36px;
-				line-height: 36px;
+				@include themeify{
+					font-size:themed('font-size13');  
+					line-height: themed('font-size13');
+				}
+/*				font-size: 36px;
+				line-height: 36px;*/
 			}
-			margin-top: 20px;
+			margin-top: 40rpx;
 		}
 		p{
 			color:#999;
-			margin-top: 4px;
+			margin-top: 8rpx;
 		}
 	}
 	.paySuccess-btn{
 		display: flex;
 		justify-content: space-between;
-		padding: 0 40px;
+		padding: 0 80rpx;
 	}
 	.success-btn{
 		background-color:#00B962!important;
 		flex: 1;
 		border-color: #00B962!important;
 		color:#fff!important;
+		@include themeify{
+			font-size:themed('font-size2');  
+			line-height: themed('font-size2');
+			letter-spacing: themed('letterSpacing');
+		}
 	}
 </style>

pages/user/finance/refundDet.vue

@@ -13,7 +13,7 @@
 				<p>退费订单</p><span>{{refund.refundOrderNo}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>手续费</p><span>￥{{refund.proceduresAmount.toFixed(2)}}</span>
+				<p>手续费</p><span>￥{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):''}}</span>
 			</view>
 			<view class="rechargeDet-list">
 				<p>退费时间</p><span>{{refund.applicationTime}}</span>
@@ -22,7 +22,7 @@
 				<p>退费渠道</p><span>{{refund.refundChannelText}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>退费金额</p><span>￥{{refund.refundRealAmount.toFixed(2)}}</span>
+				<p>退费金额</p><span>￥{{refund.refundRealAmount!=null?refund.refundRealAmount.toFixed(2):''}}</span>
 			</view>
 		</view>
 		<view class="rechargeDet-main">
@@ -40,7 +40,7 @@
 		data() {
 			return {
 				elderMode:false,
-				refund :{}
+				refund :{"id":3,"regUserId":"c9ab09fb-1a91-4dc5-8573-cebb353cffae","refundAmount":0.01,"status":"0","refundOrderNo":"RE0525151604592452","refundTime":null,"refundChannel":"wechat","refundRealAmount":0.01,"proceduresAmount":0,"applicationTime":"2022-05-25 15:16","applicationBy":"c9ab09fb-1a91-4dc5-8573-cebb353cffae","examineTime":null,"examineBy":null,"remark":null,"createBy":"c9ab09fb-1a91-4dc5-8573-cebb353cffae","createTime":"2022-05-25 15:16","updateBy":null,"updateTime":null,"delFlag":false,"phone":null,"headImg":null,"applicationByN":null,"examineByN":null}
 			}
 		},
 		onLoad(op){
@@ -88,7 +88,7 @@
 		},
 		methods: {
 			theme(type) { 
-			  if(type == 'dark')	
+			  if(type == 'elder')	
 			  {
  				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
  				  
@@ -107,7 +107,7 @@
 	@import "@/_theme.scss";
 	.rechargeDet-head{
 		background-color: #fff;
-		padding: 24px 0;
+		padding: 48rpx 0;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -116,25 +116,33 @@
 			align-items: flex-end;
 			justify-content: center;
 			font{
+				@include themeify{
+					font-size:themed('font-size13'); 
+					line-height:themed('font-size13'); 
+				}
+				/*
 				font-size: 36px;
-				line-height: 36px;
+				line-height: 36px;*/
 			}
 		}
 		p{
 			color:#999;
-			margin-top: 4px;
+			margin-top: 8rpx;
 		}
 	}
 	.rechargeDet-main{
 		background-color: #fff;
-		padding-left: 16px;
-		margin-top: 12px;
+		padding-left: 32rpx;
+		margin-top: 24rpx;
 		.rechargeDet-list{
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			padding: 12px 16px 12px 0;
-			border-bottom: 1px solid #f7f7f7;
+			padding: 24rpx 32rpx 24rpx 0;
+			border-bottom: 2rpx solid #f7f7f7;
+			@include themeify{
+				font-size:themed('font-size1'); 
+ 			}
 			&:last-child{
 				border-bottom: none;
 			}

pages/user/finance/refundList.vue

@@ -57,7 +57,7 @@
 			</u-modal> 
 		</view>
 				
-		<view style="bottom:0;position:absolute;width: 100%;padding: 20px;" v-show="account.totalAmount>0">
+		<view style="bottom:0;position:absolute;width: 100%;padding: 40rpx;" v-show="account.totalAmount>0">
 			<u-button shape="circle"    style="background-color:#00b962;color:white" @click="show=true">申请退款</u-button>
 		</view>
 	</view>
@@ -142,7 +142,7 @@
 		},
 		methods: {
 			theme(type) {
-			  if(type == 'dark')	
+			  if(type == 'elder')	
 			  {
 				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 				  
@@ -187,12 +187,15 @@
 <style lang="scss" scoped> 
 	@import "@/_theme.scss";
 	.slot-content {
-		font-size: 28rpx;
+		@include themeify{
+			font-size:themed('font-size2'); 
+		}
+/*		font-size: 28rpx;*/
 		color: $u-content-color;
 		padding-left: 30rpx;
 		padding-right: 30rpx;
-		padding-top: 20px;
-		padding-bottom: 20px;
+		padding-top: 40rpx;
+		padding-bottom: 40rpx;
 	}
 	.refundList-none{
 		display: flex;
@@ -201,7 +204,7 @@
 	}
 	.balanceHead{
 		background-color: #fff;
-		padding: 24px 0;
+		padding: 48rpx 0;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -210,36 +213,45 @@
 			align-items: flex-end;
 			justify-content: center;
 			font{
-				font-size: 36px;
-				line-height: 36px;
+/*				font-size: 36px;
+				line-height: 36px;*/
+				@include themeify{
+					font-size:themed('font-size13'); 
+					line-height:themed('font-size13'); 
+				}
 			}
 		}
 		.tips{
 			display: flex;
 			align-items: center;
-			margin-top: 4px;
+			margin-top: 8rpx;
 			p{
 				color:#999;
-				margin-right: 4px;
+				margin-right: 8rpx;
 			}
 		}
 	}
 	.balanceMain{
 		background-color: #fff;
-		margin-top: 12px;
+		margin-top: 24rpx;
 		.balanceMain-title{
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			height: 48px;
-			border-bottom: 1px solid #f7f7f7;
-			padding: 0 16PX;
+			height: 96rpx;
+			border-bottom: 2rpx solid #f7f7f7;
+			padding: 0 32rpx;
 			.title{
 				display: flex;
 				align-items: center;
 				span{
-					margin-left: 8px;
-					font-size: 16px;
+					margin-left: 16rpx;
+/*					font-size: 16px;*/
+					@include themeify{
+						font-size:themed('font-size3'); 
+						font-weight: themed('fontWeight');
+						letter-spacing: themed('letterSpacing');
+ 					}
 				}
 			}
 		}
@@ -250,9 +262,12 @@
 				align-items: center;
 				justify-content: space-between;
 				p{
-					font-size: 12px;
+					@include themeify{
+						font-size:themed('font-size1'); 
+					}
+/*					font-size: 12px;*/
 					color:#888;
-					margin-top: 3px;
+					margin-top: 6rpx;
 				}
 				.state1{
 					color:#FF9600;