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

_theme.scss

@@ -25,6 +25,8 @@ font-size14: 80rpx,
 font-size15: 84rpx,
 font-size16: 88rpx,
 font-size17: 92rpx,
+font-size18: 96rpx,
+font-size19: 100rpx,
 
 buttonWidth: 300rpx,
 fontWeight: bold!important,
@@ -64,6 +66,8 @@ font-size14: 76rpx,
 font-size15: 80rpx,
 font-size16: 84rpx,
 font-size17: 88rpx,
+font-size18: 92rpx,
+font-size19: 96rpx,
 
 font_color1: #a77439,
 font_color2: white,

components/Tabbar.vue

@@ -49,6 +49,9 @@
 			};
 			
 		},methods:{
+			setcount(c){
+				this.myCurrent=c
+			},
 			beforeSwitch(index){
 			
 				
@@ -72,8 +75,10 @@
 		},mounted(){
 			
 		},destroyed(){
+			
 		}
 		
+		
 	}
 </script>
 

main.js

@@ -98,8 +98,16 @@ Vue.mixin({
 				// 	list[i].style = str
 
 				// }
-		
-
+				var list_u_title = document.getElementsByClassName("u-title")
+				for (var i = 0; i < list_u_title.length; i++) {
+						
+						if (g) {
+							list_u_title[i].style ="line-height: 26px;color: rgb(96, 98, 102);  font-size: 20px;"
+						}else{
+							list_u_title[i].style ="color: rgb(96, 98, 102); font-size: 13px; font-weight: normal;"
+						}
+					
+				}
 
 
 		})

pages/index/index.vue

@@ -3,10 +3,15 @@
 
 		<!-- 头部图片 -->
 		<view class="banner">
-			<img :src="indexLogo?indexLogo:'static/img/banner1.jpg'" alt="">
+			 <u-swiper  bg-color="#fff" 
+			 :img-mode="'scaleToFill'" height="600" 
+			 :list="bannerList" @click="clickBanner"  :name="'picUrl'" >
+			</u-swiper> 
+			
+<!-- 			<img :src="indexLogo?indexLogo:'static/img/banner1.jpg'" alt="">
+ -->			
 		</view>
 
-
 		<!-- 选项列表 -->
 		<view class="option-list">
 
@@ -50,7 +55,9 @@
 		</view>
 
 		<!-- 模式选择 -->
-		<u-mask :show="show">
+
+		<u-mask :show="show=false">
+
 			<view class="wrap">
 
 
@@ -102,11 +109,17 @@
 
 				<view class="park">
 					<text class="park-p">p</text>
-					<text class="park-text">2小时免费停车</text>
+					<text class="park-text oldTextjp2" oldstyle="font-size: 14px;">2小时停车免费</text>
 				</view>
 				<view class="count">
-					<view class="count-left">空闲{{stationData.availableNum}}/总数{{stationData.totalNum}}</view>
-					<view class="count-right"><text class="iconfont">&#xe615;</text>{{stationData.distance}}公里</view>
+					<view class="count-left">
+						<span class="oldTextjp2" oldstyle="font-size: 16px;">空闲{{stationData.availableNum}}/</span>
+						<span class="oldTextjp" oldstyle="font-size: 16px;">总数{{stationData.totalNum}}</span>
+					</view>
+					<view class="count-right oldTextjp" oldstyle="font-size: 16px;" v-if="distance > 0.1">
+						<text class="iconfont">&#xe615;</text>{{distance.toFixed(1)}}公里</view>
+					<view class="count-right oldTextjp" oldstyle="font-size: 16px;" v-else>
+						<text class="iconfont">&#xe615;</text>小于100米</view>
 				</view>
 			</view>
 		</view>
@@ -114,13 +127,13 @@
 		<view class="location-box" v-if="message != 'getLocation:ok' && chargeList.length == 0">
 			<view class="location">
 				<view class="location-text">
-					<view class="text-1">
+					<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
 						定位中...
 					</view>
-					<view class="text-2">
+					<view class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 						授权定位后可查询附近充电站
 					</view>
-					<view class="text-3" @click="getPoint()">
+					<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;" @click="getPoint()">
 						重新定位
 					</view>
 				</view>
@@ -136,22 +149,22 @@
 		<view class="state1 state" v-if="chargeList.length > 0" v-for="(item,index) in chargeList" :key="item.id"
 			@click="gotoUrl('pages/searchPile/chargeProcess/dcCharging?id=' + item.id)">
 			<view class="state-text">
-				<view class="text-1">
+				<view class="text-1 oldTextjp" oldstyle="font-size: 20px;">
 					{{item.statusText}}
 				</view>
-				<view v-if="item.status == '0'" class="text-2">
+				<view v-if="item.status == '0'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 					启动中
 				</view>
-				<view v-if="item.status == '1'" class="text-2">
+				<view v-if="item.status == '1'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 					已充{{item.dueFee != null ? item.dueFee : '0.00'}}元
 				</view>
 				<!-- <view v-if="item.status == '2'" class="text-2" style="color: red;">
 				超出时间将收取占位费
 			</view> -->
-				<view v-if="item.status == '4'" class="text-2">
+				<view v-if="item.status == '4'" class="text-2 oldTextjp2" oldstyle="font-size: 16px;">
 					前方等待{{item.waitNum}}位
 				</view>
-				<view class="text-3">
+				<view class="text-3 oldTextjp2" oldstyle="font-size: 16px;">
 					{{item.deviceName}}/<br />{{item.deviceNo}}
 				</view>
 			</view>
@@ -211,7 +224,7 @@
 				<text class="button" @click="toLogin">登录/注册</text>
 			</view>
 		</view>
-		<Tabbar :current="0"></Tabbar>
+		<Tabbar :current="0" ref="tabbarMain" ></Tabbar>
 	</view>
 </template>
 
@@ -229,6 +242,8 @@
 		},
 		data() {
 			return {
+				bannerList:[],
+				distance: 0,
 				timeOut: false,
 				pointTimeOut: true,
 				stationData: {},
@@ -271,6 +286,8 @@
 					})
 				}
 			}
+			this.getBannerInfo("homepage")
+			
 		},
 		onUnload() {
 			this.timeOut = false;
@@ -284,6 +301,13 @@
 			if (this.newsList.length < this.recordsTotal) {
 				this.myLoadmore();
 			}
+		},
+		onShow() {
+			if(this.$refs.tabbarMain){
+				this.$refs.tabbarMain.setcount(0);
+			}
+			
+			
 		},
 		onReady() {
 			if (this.carhelp.getPersonInfo()) {
@@ -314,6 +338,44 @@
 			this.getActivityInfoList();
 		},
 		methods: {
+			clickBanner(index){
+				var mod= this.bannerList[index]
+				
+				if(mod.linkUrl.indexOf('http')==0){
+				    window.location=mod.linkUrl;
+				}
+				else if(mod.linkUrl.indexOf('#/')==0){
+					if(mod.linkUrl.indexOf("?")==-1){
+						mod.linkUrl+='?';
+					}
+				    window.location=mod.linkUrl;
+				}
+				else if(mod.linkUrl=='#'||mod.linkUrl==''){
+				
+				}
+				else{
+					uni.navigateTo({
+						url:mod.linkUrl
+					})
+				}
+				
+			},
+			getBannerInfo(code){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				newsApi.getBannerInfo(code).then((res) => {
+					this.bannerList =res.data;
+					
+					 document.getElementsByClassName("uni-swiper-wrapper")[0].parentNode.style="background-color: rgb(255, 255, 255); height: 300px;"
+				 }).catch(error => {
+						uni.showToast({
+						
+							title: error,icon: "none"
+						})
+				})
+			},
 			elderClick() {
 				if(this.value == "长辈模式") {
 					this.elderStatus = true;
@@ -474,6 +536,10 @@
 							latitude: this.latitude
 						}).then((response) => {
 							this.stationData = response.data.data[0];
+							
+							var lnglat = new AMap.LngLat(this.longitude,this.latitude);
+							var myDistance = lnglat.distance([this.stationData.longitude,this.stationData.latitude]);
+							this.distance = myDistance/1000;
 						}).catch(error => {
 							uni.showToast({
 								title: error,
@@ -525,6 +591,7 @@
 </script>
 
 <style lang="scss" scoped>
+	 
 	// 头部图片
 	img {
 		width: 100%;

pages/login/welcome.vue

@@ -43,7 +43,7 @@
 		data() {
 			return {
 				isReady:true,
-				step:3,
+				step:2,
 				imgH:'',
 				imgmode:true
 			}

pages/record/index.vue

@@ -26,7 +26,7 @@
 					</view>
 					<view class="recordList-row">
 						<p>充电时长：{{item.chargingMinute != null ? item.chargingMinute+'分' : '00分00秒'}}</p>
-						<h4>{{item.actualFee != null ? item.actualFee : '0.00'}}</h4>
+						<h4>{{item.actualFee != null ? item.actualFee : '0.00'}}元</h4>
 					</view>
 				</view>
 			</view>

pages/search/search.vue

@@ -24,7 +24,8 @@
 					  <text style="color:#009143;">空闲{{item.idleNum}}</text>/总数{{item.total}}
 				</view>
 				<view class="distance" @click="navigateTo(item)">
-					<text class="iconfont distance-font">&#xe615;</text>{{item.distance.toFixed(2)}}公里 {{item.time.toFixed(0)}}分钟
+					<text class="iconfont distance-font">&#xe615;</text>
+					{{item.distance!=null&&item.distance>0.1 ? item.distance.toFixed(1)+'公里':'小于100米'}} {{item.time.toFixed(0)}}分钟
 				</view>
 			</view>
 		</view>		
@@ -215,6 +216,7 @@
 				})
 			},
 			getChargingStationData(pos){
+				console.log('getChargingStationData')
 						//return;
 				if(pos == null)
 					return ;		 
@@ -268,7 +270,7 @@
 									id: i,									
 									distance:0.9,
 									time:9,
-									park: '以实际费用为准',
+									park: '2小时免费停车',
 //									longitude: 112.28541 + i * 0.001,
 //									latitude: 30.308354 + i * 0.01
 									};
@@ -276,6 +278,13 @@
 							obj.id = items[i].id;
 						else
 							continue;
+						if(items[i].type.indexOf("1")>=0 && items[i].type.indexOf("2")>=0)
+						{
+							obj.type = '快/慢'
+						}
+						if(items[i].costPrice!=null)
+							obj.price = items[i].costPrice;
+							
 						if(items[i].name!=null)
 							obj.name = items[i].name;
 						if(items[i].address!=null)

pages/searchPile/chargeProcess/charge.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="充电"  :is-back="isback" ></u-navbar>
 		<view class="recharge" >
 			<view class="title">请选择充电金额</view>
-			<p>当前余额￥{{user.balance}}</p>
+			<p>当前余额{{user.balance}}元</p>
 			<view class="rechargeMain">
 				<view class="recharge-item" @click="moneyClick(item.id)"
 					:class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''" v-for="(item,index) in moneyList"
@@ -36,7 +36,7 @@
 						每次只能使用1张
 					</span>
 					<span class="title-3">
-						-￥6.00
+						-6.00
 					</span>
 				</view>
 				<view class="select">
@@ -60,17 +60,31 @@
 			 <view class="discounts2">
 			 	<view class="left">
 			 		优惠券
-			 	</view>
-				<view class="right"  @click="chooseCoupons"  v-if="listlength">
-					未选择，剩余{{listlength}}张优惠券
+			 	</view>
+				<view class="right" @click="chooseCoupons"  v-if="selectObj.id">
+					{{selectObj.threshold == 0 ? '无门槛' : '满'+selectObj.threshold+'元可用'}},
+					
+					<span class="price" v-if="selectObj.classify == '1'">抵扣{{selectObj.value}}元</span>
+					<span class="price" v-if="selectObj.classify == '2'">可享{{selectObj.value*10}}折</span>
+					
+					<view class="iconfont">&#xe600;</view>
+				</view>
+				<view class="right"  @click="chooseCoupons"  v-else-if="listlength">
+					未选择,剩余{{listlength}}张优惠券
 					<view class="iconfont">&#xe600;</view>
 				</view>
-				<view class="right" v-else>
+				<view class="right" @click="chooseCoupons"   v-else>
 					无优惠券
 					<view class="iconfont">&#xe600;</view>
 				</view>
 				
 			 </view>
+			 <view style="color: rgba(153, 153, 153, 100);
+			 margin-top: 10px;
+			 font-size: 12px;
+			 text-align: left;
+			 font-family: AlibabaPuHui-regular;"><span style="color:red">*</span>{{couponsuse}}</view>
+			 
 			
 		</view>
 		<view class="bottom">
@@ -99,7 +113,8 @@
 			return {
 				isback:true,
 				moneyActiveClass: "20",
-				detail: {},
+				detail: {},
+				couponsuse:'',
 				//提交信息
 				submitForm: {
 					deviceNo: '',
@@ -135,6 +150,7 @@
 					},
 
 				],
+				selectObj:{},
 				value:"",
 				// 优惠券
 				listlength:0,
@@ -152,9 +168,22 @@
 			if(op.isback){
 				this.isback=false;
 			}
-			this.useCoupon()
+			this.useCoupon()
+			
+			var  couponsuse=this.carhelp.getConfig().couponsuse
+						// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+			if(couponsuse){
+							this.couponsuse=couponsuse
+				}
 		},
-		onShow() {
+		onShow() {
+			var obj=this.carhelp.get("chooseCoupons");
+			if(obj){
+				if(obj.uuid==this.uuid){
+					this.selectObj=obj.selectObj;
+				}
+			}
+			
 			this.getHomePage()
 		},
 		methods: {
@@ -187,21 +216,34 @@
 					})
 				
 				}
-				
+				
+				this.selectJudge();
 
 			},
 			moneyClick(index) {
 				this.otherNum = ''
 				this.moneyActiveClass = index;
-			
+				this.selectJudge();
 
 			},
+			selectJudge(){
+				this.submitInit()
+				if(this.submitForm.amount==0){
+					return
+				}
+				if(this.selectObj.id&&this.selectObj.threshold>this.submitForm.amount){
+					uni.showToast({
+						title:"请重新选择优惠券"
+					})
+					this.selectObj={}
+				}
+			},
 			radioChange(e){},
 			confirm() {
 
 				//console.log(JSON.stringify(this.submitForm))
-				if(this.value){
-					this.submitForm.userCouponId=this.value
+				if(this.selectObj.id){
+					this.submitForm.userCouponId=this.selectObj.id
 				}
 
 				uni.showLoading({

pages/searchPile/chargeProcess/exChanging.vue

@@ -105,6 +105,36 @@
 </template>
 
 <script>
+	export default{
+		data() {
+			return {
+				elderMode:false,
+				}
+		},
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
+		methods:{
+			theme(type) {
+				
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 
+				  
+			  } 
+			}
+		}
+	}
 </script>
 <style>
 	page{
@@ -113,8 +143,12 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
 	.tittle-font {
-		font-size: 24px;
+		@include themeify{
+			font-size: themed('font-size7');
+		}
+/*		font-size: 24px;*/
 		position: fixed;
 		top: 12px;
 		right: 16px;
@@ -156,7 +190,10 @@
 		}
 		
 		.u-progress-info {
-			font-size: 28px;
+			@include themeify{
+				font-size: themed('font-size9');
+			}
+			/*font-size: 28px;*/
 			padding-left: 16rpx;
 			letter-spacing: 2rpx;
 			color: #8161ff;
@@ -173,22 +210,34 @@
 }
 
 .starting{
-	height: 22px;
+	/*height: 22px;*/
 	color: rgba(0, 185, 98, 100);
-	font-size: 16px;
+	@include themeify{
+		font-size: themed('font-size3');
+		height:themed('font-size6');
+	}
+/*	font-size: 16px;*/
 	text-align: center;
 }
 .timer{
-	height: 43px;
+/*	height: 43px;*/
 	color: rgba(51, 51, 51, 100);
-	font-size: 36px;
+	@include themeify{
+		font-size: themed('font-size13');
+		height:themed('font-size17');
+	}
+/*	font-size: 36px;*/
 	text-align: center;
 	margin-top: 40px;
 }
 .charged{
-	height: 20px;
+/*	height: 20px;*/
 	color: rgba(153, 153, 153, 100);
-	font-size: 14px;
+	@include themeify{
+		font-size: themed('font-size2');
+		height:themed('font-size5');
+	}
+/*	font-size: 14px;*/
 	text-align: center;
 	margin-top: 4px;
 }
@@ -199,9 +248,14 @@
 	display: flex;
 	justify-content: space-between;
 	.cost-top{
-		line-height: 33px;
+/*		line-height: 33px;*/
 		text-align: center;
-		font-size: 24px;
+		@include themeify{
+			font-size:themed('font-size7');
+			line-height:themed('font-size12');
+		}
+		
+/*		font-size: 24px;*/
 		position: relative;
 		.cost-font{
 			position: absolute;
@@ -229,15 +283,23 @@
 	padding: 0 55px;
 	margin-top: 40px;
 	.power-num{
-		height: 27px;
+		@include themeify{
+			font-size:themed('font-size5');
+			height:themed('font-size9');
+		}
+/*		height: 27px;*/
 		color: rgba(51, 51, 51, 100);
-		font-size: 20px;
+/*		font-size: 20px;*/
 		text-align: center;
 	}
 	.power-text{
-		height: 20px;
+/*		height: 20px;*/
 		color: rgba(153, 153, 153, 100);
-		font-size: 14px;
+		@include themeify{
+			font-size:themed('font-size2');
+			height:themed('font-size5');
+		}
+/*		font-size: 14px;*/
 		text-align: center;
 	}
 }
@@ -247,7 +309,10 @@
 	justify-content: space-between;
 	margin: 0 40px;
 	// height: 48px;
-	line-height: 48px;
+	@include themeify{ 
+		line-height:themed('font-size19');
+	}
+/*	line-height: 48px;*/
 	background-color: rgba(255, 255, 255, 100);
 	color: rgba(16, 16, 16, 100);
 	border-bottom: 1px solid #ededed;

pages/searchPile/chargeProcess/exChargeEnd.vue

@@ -43,6 +43,36 @@
 </template>
 
 <script>
+	export default{
+		data() {
+			return {
+				elderMode:false,
+				}
+		},
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
+		methods:{
+			theme(type) {
+				
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 
+				  
+			  } 
+			}
+		}
+	}
 </script>
 <style>
 	page{
@@ -50,6 +80,8 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
+	
 	.progress-bar{
 		
 		
@@ -76,12 +108,18 @@
 			
 			.u-progress-info {
 				display: block;
-				font-size: 36px;
+				@include themeify{
+					font-size: themed('font-size13');
+				}
+/*				font-size: 36px;*/
 				padding-left: 16rpx;
 				letter-spacing: 2rpx;
 				color: #333333 ;
 				.progress-text{
-					font-size: 14px;
+					@include themeify{
+						font-size: themed('font-size2');
+					}
+/*					font-size: 14px;*/
 					text-align: center;
 					color: #666666;
 				}
@@ -100,15 +138,22 @@
 	justify-content: space-between;
 	padding: 0 65px;
 	.item-num{
-		height: 33px;
+/*		height: 33px;*/
 		color: rgba(51, 51, 51, 100);
-		font-size: 24px;
+		@include themeify{
+			font-size: themed('font-size7');
+			height:themed('font-size12');
+		}
+/*		font-size: 24px;*/
 		text-align: center;
 	}
 	.item-text{
 		eight: 20px;
 		color: rgba(153, 153, 153, 100);
-		font-size: 14px;
+		@include themeify{
+			font-size: themed('font-size2');
+ 		}
+/*		font-size: 14px;*/
 		text-align: center;
 	}
 }

pages/searchPile/searchPile.vue

@@ -93,7 +93,7 @@
 						></u-tag>
 					</view>
 				</view>
-				<view class="preference_group">
+<!--				<view class="preference_group">
 					<view class="preference_group_item"><label class="preference_label">充电桩电压 (V)</label></view>
 					<view>
 						<u-tag
@@ -108,7 +108,7 @@
 					</view>
 				</view>
 				<view class="preference_group">
-					<view class="preference_group_item"><label class="preference_label">充电桩电压 (kw)</label></view>
+					<view class="preference_group_item"><label class="preference_label">充电桩功率 (kw)</label></view>
 					<view style="height: 50rpx;margin-left: 30rpx;">
 						<DoubleSlider
 							ref="obc_voltage"
@@ -130,7 +130,7 @@
 							@change="handlerDoubleSlider"
 					>	</DoubleSlider>
 					</view>
-				</view>
+				</view>-->
 				<view class="preference_group">
 					<view style="margin-left: 30rpx;"><u-checkbox shape="circle" v-model="preference.save_preference" @change="radioChange">保存偏好设置</u-checkbox></view>
 				</view>
@@ -165,7 +165,7 @@
 							<text style="color:#009143;">空闲{{item.idleNum}}</text>/总数{{item.total}}
 						</view>
 						<view class="distance">
-							<text class="iconfont distance-font">&#xe615;</text>{{item.distance.toFixed(2)}}公里 {{item.time.toFixed(0)}}分钟
+							<text class="iconfont distance-font">&#xe615;</text>{{item.distance.toFixed(1)}}公里 {{item.time.toFixed(0)}}分钟
 						</view>
 					</view>
 				</view>
@@ -237,7 +237,7 @@
 									<view class="round" @click.stop="navigateTo(item)"> 
 											<text class="iconfont distance-font">&#xe615;</text>
 											<view  style="margin-right: 10rpx;">
-												{{item.distance!=null?item.distance.toFixed(2):''}}公里											
+												{{item.distance!=null&&item.distance>0.1 ? item.distance.toFixed(1)+'公里':'小于100米'}}												
 											</view>
 											<view  style="margin-right: 10rpx;">
 												{{item.time!=null?item.time.toFixed(0):''}}分钟
@@ -254,7 +254,7 @@
 		</view>
 		 
 		
-		<Tabbar :current="1"></Tabbar> 
+		<Tabbar :current="1"  ref="tabbarMain"></Tabbar> 
 	</view>
 </template>
 
@@ -426,6 +426,9 @@ export default {
 		//		console.log('latitude3  '+this.latitude)
 	},
 	onShow() {
+		if(this.$refs.tabbarMain){
+			this.$refs.tabbarMain.setcount(1);
+		}
 		
 //		console.log('onShow')
 		if (this.isReady) {
@@ -771,12 +774,12 @@ export default {
 				data1.findType = pos.findType;
 			else
 				data1.findType = "0";
-			
+			/*
 			if(this.preference.obc_power.minValue!=null)
 				data1.powerStart = this.preference.obc_power.minValue.toString();
 			if(this.preference.obc_power.maxValue!=null)
 				data1.powerEnd = this.preference.obc_power.maxValue.toString();
-			
+			*/
 //			console.log('data1'+JSON.stringify(data1))
 			api.getChargingStationData(data1).then(function(res){
 				
@@ -805,7 +808,7 @@ export default {
 									id: i,									
 									distance:0.9,
 									time:9,
-									park: '以实际费用为准',
+									park: '2小时免费停车',
 //									longitude: 112.28541 + i * 0.001,
 //									latitude: 30.308354 + i * 0.01
 									};

pages/searchPile/searchPileList.vue

@@ -39,7 +39,7 @@
 			<view class="price">
 				<view class="num">1.20</view>
 				<view class="unit">
-					起 元/度
+					 元/度 起
 				</view>
 			</view>
 			<view class="park">
@@ -63,7 +63,7 @@
 			<view class="price">
 				<view class="num">1.25</view>
 				<view class="unit">
-					起 元/度
+					 元/度 起
 				</view>
 			</view>
 			<view class="park">
@@ -87,7 +87,7 @@
 			<view class="price">
 				<view class="num">1.25</view>
 				<view class="unit">
-					起 元/度
+					元/度 起
 				</view>
 			</view>
 			<view class="park">
@@ -111,7 +111,7 @@
 			<view class="price">
 				<view class="num">1.20</view>
 				<view class="unit">
-					起 元/度
+					元/度 起
 				</view>
 			</view>
 			<view class="park">

pages/searchPile/searchPileMap.vue

@@ -39,7 +39,7 @@
 				<view class="icon2-right">
 					<view class="corner2"></view>
 					<view class="corner2-top">
-						￥1.25
+						1.25元
 					</view>
 					<view class="corner2-bottom">
 						空闲10
@@ -60,7 +60,7 @@
 			<view class="price">
 				<view class="num">1.20</view>
 				<view class="unit">
-					起 元/度
+					元/度 起
 				</view>
 			</view>
 			<view class="park">

pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -14,12 +14,12 @@
 							{{item.time}}
 						</view>
 						<view class="price">
-							<text style="color: #ff3d00; font-size: 36rpx;">{{item.price.toFixed(2)}}</text>
+							<text  class="price-text">{{item.price.toFixed(2)}}</text>
 							<text class="unit">元/度</text>
 						</view>
 					</view>
 					<view class="unitPrice-serviceCharge">
-						充电单价：￥{{item.single_price.toFixed(4)}} | 服务费：￥{{item.service_price.toFixed(4)}}
+						充电单价：{{item.single_price.toFixed(2)}}元 | 服务费：{{item.service_price.toFixed(2)}}元
 					</view>
 				</view> 
 			</view>
@@ -107,6 +107,7 @@
 			);*/
 		},
 		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
 			if(this.elderMode)
 				this.theme('elder')
 			else
@@ -166,13 +167,26 @@
 
 					.time {
 						color: rgba(16, 16, 16, 100);
-						font-size: 32rpx;
+						@include themeify{
+							font-size:themed('font-size3'); 
+						}
+/*						font-size: 32rpx;*/
 					}
 
 					.price {
+						.price-text{
+							color: #ff3d00; 
+							@include themeify{
+								font-size:themed('font-size4'); 
+							}
+/*							font-size: 36rpx;*/
+						}
 						.unit {
 							color: rgba(102, 102, 102, 100);
-							font-size: 28rpx;
+							@include themeify{
+								font-size:themed('font-size2'); 
+							}
+/*							font-size: 28rpx;*/
 							margin-left: 8rpx;
 						}
 					}
@@ -181,7 +195,10 @@
 
 				.unitPrice-serviceCharge {
 					float: right;
-					font-size: 24rpx;
+					@include themeify{
+						font-size:themed('font-size1'); 
+					}
+/*					font-size: 24rpx;*/
 					color: #888888;
 				}
 			}
@@ -191,7 +208,10 @@
 		width: 100%;
 		text-align: center;
 		color: #999999;
-		font-size: 24rpx;
+		@include themeify{
+			font-size:themed('font-size1'); 
+		}
+/*		font-size: 24rpx;*/
 		position: absolute;
 		bottom: 24rpx;
 		left: 0;

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -55,7 +55,7 @@
 			<!-- 收费标准 -->
 			<view class="rates ">
 				<view class="rates-title">
-					<view class="title-left">
+					<view class="title-left font-weight3">
 						收费标准
 					</view>
 					<view class="title-right">
@@ -78,7 +78,7 @@
 						</view>
 						<view class="part-bottom">
 							<view class="unitPrice-servicePrice">
-								充电单价：￥{{item.electricityPrice}} | 服务费：￥{{item.servicePrice}}
+								充电单价：{{item.electricityPrice}}元 | 服务费：{{item.servicePrice}}元
 							</view>
 						</view>
 
@@ -109,6 +109,7 @@
 	export default {
 		data() {
 			return {
+				elderMode:false,
 				isReady: false,
 				onShowRole: false,
 				id: "",
@@ -141,6 +142,13 @@
 			}
 		},
 		onReady() {
+			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式'; 
+			
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+				
 			var  carDet=this.carhelp.getConfig().carDet
 						// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
 						if(carDet){
@@ -155,7 +163,19 @@
 			}
 
 		},
-		methods: {
+		methods: {
+			theme(type) {
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				  
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				  
+			  } 
+			},
 			customback(){
 				uni.reLaunch({
 					url:"/pages/login/welcome"
@@ -249,7 +269,8 @@
 </script>
 
 
-<style lang="scss">
+<style lang="scss">
+	@import "@/_theme.scss";
 	.ratesbottom{
 		  
 		padding-bottom: 90px;
@@ -257,7 +278,10 @@
 	// 头部
 	.title {
 		width: 100%;
-		line-height: 44px;
+		@include themeify{
+			line-height:themed('font-size17'); 
+		}
+/*		line-height: 44px;*/
 		background-color: rgba(255, 255, 255, 100);
 		text-align: center;
 		border: 1px solid rgba(242, 242, 242, 100);
@@ -281,18 +305,28 @@
 
 			.detail-name {
 				margin-left: 16px;
-				height: 20px;
-				line-height: 23px;
-				color: rgba(102, 102, 102, 100);
+				@include themeify{
+					line-height:themed('font-size2'); 
+					height: themed('font-size5');
+					line-height: themed('font-size6');
+				}
+/*				height: 20px;
 				font-size: 14px;
+				line-height: 23px;*/
+				color: rgba(102, 102, 102, 100);
 
 			}
 
 			.detail-content {
-				height: 23px;
-				line-height: 23px;
+/*				height: 23px;
+				line-height: 23px;*/
 				color: rgba(51, 51, 51, 100);
-				font-size: 14px;
+				@include themeify{
+					line-height:themed('font-size2'); 
+					height: themed('font-size6');
+					line-height: themed('font-size6');
+				}
+/*				font-size: 14px;*/
 
 			}
 		}
@@ -301,15 +335,19 @@
 		.rates {
 			width: 100%;
 			background-color: #fff;
-			margin-top: 12px;
+			margin-top: 24rpx;
 
 			.rates-title {
 				display: flex;
 				justify-content: space-between;
-				height: 48px;
-				line-height: 48px;
-				padding: 0px 16px 0;
-				border-bottom: 1px solid rgba(242, 242, 242, 100);
+				@include themeify{
+ 					height: themed('font-size19');
+					line-height: themed('font-size199');
+				}
+/*				height: 48px;
+				line-height: 48px;*/
+				padding: 0px 32rpx 0;
+				border-bottom: 2rpx solid rgba(242, 242, 242, 100);
 			}
 
 			.time-part {
@@ -318,51 +356,68 @@
 				.part-top {
 					display: flex;
 					justify-content: space-between;
-					padding: 16px;
+					padding: 32rpx;
 
 					.time {
 						color: rgba(16, 16, 16, 100);
-						font-size: 16px;
+						@include themeify{
+							font-size: themed('font-size3');
+ 						}
+/*						font-size: 16px;*/
 					}
 
 					.price {
 						.price-number {
 							color: rgba(255, 61, 0, 100);
-							font-size: 18px;
+							@include themeify{
+								font-size: themed('font-size4');
+								height:themed('font-size5');
+							}
+/*							font-size: 18px;*/
 							text-align: right;
 							font-family: Roboto-regular;
 							display: inline-block;
-							height: 20px;
+/*							height: 20px;*/
 							font-weight: 600;
 						}
 
 						.price-unit {
 							color: rgba(102, 102, 102, 100);
-							font-size: 14px;
+							@include themeify{
+								font-size: themed('font-size2');
+								height:themed('font-size5');
+							}
+/*							font-size: 14px;*/
 							text-align: right;
 							margin-left: 4px;
 							display: inline-block;
-							height: 20px;
+/*							height: 20px;*/
 						}
 					}
 				}
 
 				.part-bottom {
 					.unitPrice-servicePrice {
-						height: 18px;
+/*						height: 18px;*/
 						color: rgba(119, 119, 119, 100);
-						font-size: 14px;
+						@include themeify{
+							font-size: themed('font-size2');
+							height:themed('font-size4');
+						}
+/*						font-size: 14px;*/
 						text-align: right;
-						padding-right: 16px;
-						padding-bottom: 18px;
+						padding-right: 32px;
+						padding-bottom: 36px;
 					}
 				}
 			}
 		}
 
 		.tips {
-
-			font-size: 12px;
+			@include themeify{
+				font-size: themed('font-size1');
+ 			}
+/*			font-size: 12px;*/
 		
 			background-color: #fff;
 			position: relative;
@@ -370,8 +425,8 @@
 			.tips-font {
 				color: #ff7300;
 				position: absolute;
-				top: 16px;
-				left: 16px;
+				top: 32rpx;
+				left: 32rpx;
 			}
 
 			/deep/.u-alert-tips--border--warning-disabled[data-v-4d234687] {
@@ -380,12 +435,18 @@
 
 			/deep/.u-alert-tips--bg--warning-light[data-v-4d234687] {
 				background-color: #fff;
-				padding: 12px 16px 12px 36px;
-				line-height: 17px;
+				padding: 24rpx 32rpx 24rpx 72rpx;
+				@include themeify{
+					line-height: themed('font-size4');
+				}
+/*				line-height: 17px;*/
 			}
 
 			/deep/.u-alert-desc[data-v-4d234687] {
-				font-size: 12px;
+				@include themeify{
+					font-size: themed('font-size1');
+				}
+/*				font-size: 12px;*/
 				color: #ff7300;
 
 			}
@@ -397,22 +458,28 @@
 		background-color: #fff;
 		;
 		width: 100%;
-		height: 64px;
-		line-height: 64px;
+		height: 128rpx;
+		line-height: 128rpx;
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		z-index: 999;
-		padding: 12px 16px;
+		padding: 24rpx 32rpx;
 
 		.botton {
 			//width: 343px;
-			height: 40px;
-			line-height: 40px;
-			border-radius: 50px;
+		/*	height: 40px;
+			line-height: 40px;*/
+			border-radius: 100rpx;
 			background-color: rgba(0, 185, 98, 100);
 			color: rgba(255, 255, 255, 100);
-			font-size: 16px;
+			
+			@include themeify{
+				font-size: themed('font-size3');
+				height: themed('font-size15');
+				line-height: themed('font-size15');
+			}
+/*			font-size: 16px;*/
 			text-align: center;
 			margin: 0 auto;
 		}

pages/searchPile/stationAndPile/stationDetails.vue

@@ -14,7 +14,9 @@
 			</view>
 			<view class="details-item">
 				<text class="iconfont font5" style="color: #4e94ff;">&#xe60e;</text> 
-				<text class="item-text">{{stationDetail.station.distance!=null ? stationDetail.station.distance.toFixed(3):''}}公里</text>
+				<text class="item-text">
+					{{stationDetail.station.distance!=null&&stationDetail.station.distance>0.1 ? stationDetail.station.distance.toFixed(1)+'公里':'小于100米'}}
+				</text>
 			</view>
 			<view class="details-item">
 				<text class="iconfont font5" style="color: #ffad79;">&#xe621;</text>
@@ -44,7 +46,7 @@
 				<view style="display:flex;flex-direction:row">
 					<view class="text1">慢充</view>
 					<view class="text2">{{stationDetail.slowPrice.costPrice}}</view>
-					<view class="text3">起 元/度</view>
+					<view class="text3">元/度 起 </view>
 				</view>
 				<view class="text4">{{stationDetail.slowPrice.startTime}}-{{stationDetail.slowPrice.endTime}}</view>
 			</view>
@@ -52,7 +54,7 @@
 				<view style="display:flex;flex-direction:row">
 					<view class="text5">快充</view>
 					<view class="text2">{{stationDetail.fastPrice.costPrice}}</view>
-					<view class="text3">起 元/度</view>					
+					<view class="text3">元/度 起 </view>					
 				</view>				
 				<view class="text4">{{stationDetail.fastPrice.startTime}}-{{stationDetail.fastPrice.endTime}}</view>
 			</view> 
@@ -123,7 +125,7 @@
 						充电枪{{item1.channelNo<10?'0'+item1.channelNo.toString():item1.channelNo.toString()}}
 					</view>
 					<view :class="item1.workStatus==0?'free-state':'recharge-state'">
- 						{{item1.workStatus == 0?item1.workStatusText: item1.workStatusText + ' SOC ' + item1.soc.toFixed(1)+'%'}}
+ 						{{item1.workStatus != 2 ?item1.workStatusText: item1.workStatusText + ' SOC ' + item1.soc.toFixed(1)+'%'}}
 					</view>
 				</view>			
 			</view> 
@@ -177,7 +179,7 @@
 							{name:'快充',price:1.20,time:'00:00:00 ~ 23:59.59'},
 						]	 ,
 					park:{ 
-						price:'免费'
+						price:'2小时免费停车'
 					},
 					priceList:[],
 					devices:{
@@ -405,6 +407,7 @@
 				for(let i = 0;i <_self.stationDetail.devices.length;i++){
 					if(!_self.stationDetail.devices[i].online)
 					{
+						_self.stationDetail.devices[i].workStatus = 99;
 						_self.stationDetail.devices[i].workStatusText ='不在线';
 						continue;
 					}
@@ -857,13 +860,14 @@
 		}
 	}
 	.tag-recharge{
-		width: 38px;
-/*		height: 16px;		
+	/*	width: 38px;
+		height: 16px;		
 		line-height: 15px;*/
 		@include themeify{
 			font-size: themed('font-size0'); 
 			line-height: themed('font-size2'); 
 			height: themed('font-size3'); 
+			width: themed('font-size14');
 		}
 		border-radius: 2px;
 		color: rgba(255, 98, 0, 100);
@@ -875,11 +879,12 @@
 		
 	}
 	.tag-free{
-		width: 28px;
+/*		width: 28px;*/
 		@include themeify{
 			font-size: themed('font-size0'); 
 			line-height: themed('font-size2'); 
 			height: themed('font-size3'); 
+			width: themed('font-size9');
 		}		
 /*		height: 16px;
 		line-height: 15px;*/

pages/searchPile/stationAndPile/stationDetailsMap.vue

@@ -56,8 +56,8 @@
 				 		<view class="round">
 				 			<text class="iconfont distance-font">&#xe615;</text>
 				 			<view  style="margin-right: 10rpx;">
-				 				{{item.distance!=null?item.distance.toFixed(2):''}}公里											
-				 			</view>
+								{{item.distance!=null&&item.distance>0.1 ? item.distance.toFixed(1)+'公里':'小于100米'}}												
+ 				 			</view>
 				 			<view  style="margin-right: 10rpx;">
 				 				{{item.time!=null?item.time.toFixed(0):''}}分钟
 				 			</view>
@@ -94,12 +94,12 @@
 				area: '荆州市',
 				action: '筛选',
 				 
-				item:{"id":"3865b3a3-13fd-461a-8145-ee9711df35a2","name":"荆鹏充电站","address":"江津东路附155号","longitude":112.276578,"latitude":30.306499,"type":"快/慢","costPrice":1.14,"electricityPrice":null,"servicePrice":null,"availableNum":5,"totalNum":5,"distance":null,"image":"http://oss.xiaoxinda.com/charging/chargingnewsInfo/2022/5/27/ccb8da40-7322-4448-9f9a-31fb64755a9c/0406204653.jpg","time":0,"park":"以实际费用为准"},
+				item:{"id":"3865b3a3-13fd-461a-8145-ee9711df35a2","name":"荆鹏充电站","address":"江津东路附155号","longitude":112.276578,"latitude":30.306499,"type":"快/慢","costPrice":1.14,"electricityPrice":null,"servicePrice":null,"availableNum":5,"totalNum":5,"distance":null,"image":"http://oss.xiaoxinda.com/charging/chargingnewsInfo/2022/5/27/ccb8da40-7322-4448-9f9a-31fb64755a9c/0406204653.jpg","time":0,"park":"2小时免费停车"},
 				/*{
 					name:'',
 				position:'',
 				price:1,idleNum:0,total:0,distance:0,time:0,type:'慢充',id: 0,
-							park: '以实际费用为准',
+							park: '2小时免费停车',
 							longitude: 112.28541,
 							latitude: 30.308354 },*/
 				stations:[]
@@ -233,7 +233,7 @@
 							data.station.time = 0;
 							_self.item = data.station;
 							if(_self.item.park == null)
-								_self.item.park = '以实际费用为准'
+								_self.item.park = '2小时免费停车'
 							if(_self.item.type == '2')
 								_self.item.type = '慢充'
 							else if(_self.item.type == '1')
@@ -471,7 +471,10 @@
 		text-align: center;
 		justify-content: center;
 		align-items: center;
-		width: 250rpx;
+		@include themeify{
+			width: themed('buttonWidth');
+		}
+/*		width: 250rpx;*/
 		display: flex;
 		flex-direction: row;
 	}

pages/user/coupon/chooseCoupons.vue

@@ -6,13 +6,26 @@
 		 description="同类型优惠券只显示一张"></u-alert-tips>
 		
 		
-		<view class="list-item"  v-for="(item,index) in myCouponList" :key="item.id">
+		<view class="list-item"  
+		
+		v-for="(item,index) in myCouponList"
+		:style="item.chooseStatus == '0' ? 'opacity: 0.5':'' "
+		 @click="ckselectObj(item)"
+		 :key="item.id">
+			
+			<view 
+			:style="item.chooseStatus == '0' ? 'background-color:#9F9F9F':'' "
+			
+			class="voucher" v-if="item.classify == '1'">优惠券</view>
+			<view 
+			:style="item.chooseStatus == '0' ? 'background-color:#9F9F9F':'' "
 			
-			<view class="voucher" v-if="item.classify == '1'">优惠券</view>
-			<view class="voucher" v-if="item.classify == '2'">折扣卷</view>
-			<view class="checked">
+			class="voucher" v-if="item.classify == '2'">折扣卷</view>
+			<view class="checked" v-if="selectObj.id==item.id">
 				<img src="../../../static/img/选中.png" alt="">
 			</view>
+			
+			 
 			<view class="item-left">
 				<view class="title">
 					{{item.couponName}}
@@ -23,14 +36,20 @@
 			</view>
 			<view class="item-right">
 				
-					<view class="price" v-if="item.classify == '1'">￥{{item.value}}</view>
-					<view class="price" v-if="item.classify == '2'">{{item.value*10}}折</view>
+					<view class="price" 
+					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
+					
+					v-if="item.classify == '1'">{{item.value}}元</view>
+					<view class="price"
+					 :style="item.chooseStatus == '0' ? 'color:#666':'' "
+					 
+					 v-if="item.classify == '2'">{{item.value*10}}折</view>
 				 
 				  <view class="contidion">
-				  	{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'可用'}}
+				  	{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'元可用'}}
 				  </view>
 			</view>
-			
+		
 		</view>
 		<u-divider  v-if="myCouponList.length > 0" style="padding-bottom: 80px;margin-top: 10px;">已经到底了</u-divider>
 		
@@ -41,12 +60,18 @@
 		
 	<view class="bottom">
 		<view class="text">
-			已选1张，预计可减
+			
 			<view class="num">
-				<text style="font-size: 14px;">￥</text><text>6</text>
+				 
+				<view class="price" v-if="selectObj.classify == '1'">抵扣{{selectObj.value}}元</view>
+				<view class="price" v-if="selectObj.classify == '2'">可享{{selectObj.value*10}}折</view>
+								 
 			</view>
 		</view>
-		<u-button class="confirm" >
+		<u-button 
+		:style="selectObj.id  ?'' : 'background-color:#9F9F9F'"
+		@click="submitBtn"
+		class="confirm" >
 			<span>确定</span>
 		</u-button>
 	</view>
@@ -63,6 +88,7 @@
 	export default{
 		data(){
 			return{
+				selectObj:{},
 				amount:0,
 				uuid:0,
 				myCouponList: [],
@@ -86,6 +112,27 @@
 				this.getCouponList();
 		},
 		methods:{
+			submitBtn(){
+				if(this.selectObj.id){
+					this.carhelp.set("chooseCoupons",{
+						uuid:this.uuid,
+						selectObj:this.selectObj
+					})
+					uni.navigateBack({
+						
+					})
+				}
+			},
+			ckselectObj(item){
+				if(item.chooseStatus==1){
+					this.selectObj=item;
+				}else{
+					uni.showToast({
+						title:"不满足使用条件"
+					})
+				}
+				
+			},
 			toConversion() {
 				uni.navigateTo({
 					url: '/pages/user/coupon/conversion'
@@ -207,6 +254,18 @@
 		}
 	}
 
+  .have-used{
+	  
+	  width: 54px;
+	  height: 54px;
+	  position: absolute;
+	  top: -12px;
+	 right: 0;
+	  img{
+		  width: 100%;
+		  height: 100%;
+	  }
+  }
 .bottom{
 	position: fixed;
 	bottom: 0;

pages/user/coupon/couponDetails.vue

@@ -13,10 +13,10 @@
 						</view>		
 					</view>
 					<view class="content-right">
-						 <view class="price" v-if="userCoupon.classify == '1'">￥{{userCoupon.value}}</view>
+						 <view class="price" v-if="userCoupon.classify == '1'">{{userCoupon.value}}元</view>
 						 <view class="price" v-if="userCoupon.classify == '2'">{{userCoupon.value*10}}折</view>
 						 <view class="price-condition">
-							{{userCoupon.threshold == 0 ? '无门槛' : '满'+userCoupon.threshold+'可用'}}
+							{{userCoupon.threshold == 0 ? '无门槛' : '满'+userCoupon.threshold+'元可用'}}
 						 </view>
 					</view>
 				</view>

pages/user/coupon/myCoupon.vue

@@ -20,10 +20,10 @@
 						</view>	
 					</view>
 					<view class="content-right">
-						<view class="price" v-if="item.classify == '1'">￥{{item.value}}</view>
+						<view class="price" v-if="item.classify == '1'">{{item.value}}元</view>
 						<view class="price" v-if="item.classify == '2'">{{item.value*10}}折</view>
 						<view class="price-condition">
-							{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'可用'}}
+							{{item.threshold == 0 ? '无门槛' : '满'+item.threshold+'元可用'}}
 						</view>
 					</view>
 				</view>

pages/user/finance/balance.vue

@@ -23,8 +23,8 @@
 						<view class="balanceCard-btn" @click="rechargeNow">立即充值</view>
 					</view>
 					<view class="balanceCard-foot">
-						<view class="balanceCard-item" v-if="personAccount.totalAmount != null">可用余额{{personAccount.totalAmount.toFixed(2)}}</view>
-						<view class="balanceCard-item" v-if="personAccount.frozenTotal != null">冻结金额{{personAccount.frozenTotal.toFixed(2)}}</view>
+						<view class="balanceCard-item" v-if="personAccount.totalAmount != null">可用余额{{personAccount.totalAmount.toFixed(2)}}元</view>
+						<view class="balanceCard-item" v-if="personAccount.frozenTotal != null">冻结金额{{personAccount.frozenTotal.toFixed(2)}}元</view>
 					</view>
 				</view>
 			</view>
@@ -45,7 +45,7 @@
 							<font>{{item.payNameStr}}</font>
 							<p>{{item.createTime}}</p>
 						</view>
-						<h4>{{item.amount}}</h4>
+						<h4>{{item.amount}}元</h4>
 					</view>
 				</view>
 			</view>

pages/user/finance/recharge.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="充值"></u-navbar>
 		<view class="recharge">
 			<view class="title">选择充值金额</view>
-			<p>当前余额{{detail.balance}}</p>
+			<p>当前余额{{detail.balance}}元</p>
 			<view class="rechargeMain">
 				<view class="recharge-item" :class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''"
 					v-for="(item,index) in moneyList" :key="item.id" @click="moneyClick(item.id,item)">

pages/user/finance/rechargeDet.vue

@@ -4,7 +4,7 @@
 		<u-navbar title="充值详情"></u-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
-				<span>￥</span><font>{{detail.payFee}}</font>
+				<font>{{detail.payFee}}</font><span>元</span>
 			</view>
 			<p>充值金额(元)</p>
 		</view>
@@ -22,7 +22,9 @@
 				<p>充值渠道</p><span>{{detail.payNameStr}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>充值金额</p><span>￥{{detail.payFee}}</span>
+
+				<p>充值金额</p><span>{{detail.payFee}}元</span>
+
 			</view>
 		</view>
 		<view class="rechargeDet-main">

pages/user/finance/rechargeList.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="rechargeList" v-if="accountList.length > 0">
 			<view class="rechargeList-item" v-for="(item,index) in accountList" :key="item.id" @click="gotoUrl('pages/user/finance/rechargeDet?id=' + item.id)">
-				<view class="rechargeList-row"><span>充值金额</span><h4>{{item.amount}}</h4></view>
+				<view class="rechargeList-row"><span>充值金额</span><h4>{{item.amount}}元</h4></view>
 				<view class="rechargeList-row"><p>{{item.payNameStr}}</p><p>{{item.createTime}}</p></view>
 			</view>
 		</view>

pages/user/finance/rechargeRes.vue

@@ -5,7 +5,6 @@
 			<u-icon name="chenggong" custom-prefix="custom-icon" size="180" color="#00B962"></u-icon>
 			<view class="title">{{detail.payStatusStr}}</view>
 			<view class="payPrice">
-				<span>￥</span>
 				<font>{{detail.totalFee}}</font><span>元</span>
 			</view>
 			<p>{{detail.payNameStr}}</p>

pages/user/finance/refundDet.vue

@@ -4,7 +4,7 @@
 		<u-navbar title="退费详情"></u-navbar>
 		<view class="rechargeDet-head">
 			<view class="payPrice">
-				<span>￥</span><font>{{refund.refundRealAmount}}</font>
+				<font>{{refund.refundRealAmount}}</font><span>元</span>
 			</view>
 			<p>退费金额(元)</p>
 		</view>
@@ -13,7 +13,7 @@
 				<p>退费订单</p><span>{{refund.refundOrderNo}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>手续费</p><span>￥{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):''}}</span>
+				<p>手续费</p><span>{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):'0'}}元</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!=null?refund.refundRealAmount.toFixed(2):''}}</span>
+				<p>退费金额</p><span>{{refund.refundRealAmount!=null?refund.refundRealAmount.toFixed(2):'0'}}元</span>
 			</view>
 		</view>
 		<view class="rechargeDet-main">

pages/user/finance/refundList.vue

@@ -4,7 +4,7 @@
 		<view class="balance">
 			<view class="balanceHead">
 				<view class="payPrice">
-					<span>￥</span><font>{{account.totalAmount}}</font>
+					<font>{{account.totalAmount}}</font><span>元</span>
 				</view>
 				<view class="tips">
 					<p>可退费金额(元)</p><u-icon name="question-line" custom-prefix="custom-icon" color="#00B962" size="32" @click="showtip = true"></u-icon>
@@ -25,20 +25,10 @@
 						</view>
 						<view class="refundList-row" >
 							<p>{{item.applicationTime}}</p>
-							<p>￥{{item.refundAmount.toFixed(2)}}</p>
+							<p>{{item.refundAmount.toFixed(2)}}元</p>
 						</view>
 					</view>
-					<!--
-					<view class="refundList-item">
-						<view class="refundList-row">
-							<font>退至 微信</font>
-							<span class="state2">已退款</span>
-						</view>
-						<view class="refundList-row">
-							<p>2021-12-31 09:00</p>
-							<p>￥15.00</p>
-						</view>
-					</view>-->
+					
 					
 					<!-- <view class="refundList-none">
 						<u-image width="200px" height="200px" src="/static/img/none.svg"></u-image>

pages/user/index.vue

@@ -4,31 +4,36 @@
 			<view class="userHead-img">
 				<u-avatar :src="userId ? headImg : '../../assets/img/head.png'" size="96"></u-avatar>
 			</view>
-			<view class="userHead-text oldTextjp2" >
-				<h3>{{userId ? userPhone : '点击登录/注册'}}</h3>
+			<view class="userHead-text oldTextjp2" oldstyle="font-size: 28px;">
+				<h3 class="oldTextjp2" oldstyle="font-size: 28px;">{{userId ? userPhone : '点击登录/注册'}}</h3>
 			</view>
 		</view>
 		<view class="userData">
 			<view class="userData-num" @click="toBalance">
-				<view class="userData-data">￥{{personAccount.availableAmount != null ? personAccount.availableAmount.toFixed(2) : '0.00'}}</view>
-				<view class="userData-foot">可用余额</view>
+				<view class="userData-data oldTextjp2" oldstyle="font-size: 28px;">{{personAccount.availableAmount != null ? personAccount.availableAmount.toFixed(2) : '0.00'}}元</view>
+				<view class="userData-foot oldTextjp2" oldstyle="font-size: 16px;">可用余额</view>
 			</view>
 			<view class="line">
 				
 			</view>
 			<view class="userData-num" @click="toMyCoupon">
-				<view class="userData-data">{{myCouponList.length}}</view>
-				<view class="userData-foot">优惠券</view>
+				<view class="userData-data oldTextjp2" oldstyle="font-size: 28px;">{{recordsTotal}}张</view>
+				<view class="userData-foot oldTextjp2" oldstyle="font-size: 16px;">优惠券</view>
 			</view>
 		</view>
 		<view class="userBanner">
-			<u-image width="100%" height="80px" src="../../static/img/banner.jpg" border-radius="16"></u-image>
+<!-- 			<u-image width="100%" height="80px" src="../../static/img/banner.jpg" border-radius="16"></u-image>
+ -->			<u-swiper  bg-color="#fff"
+			 :img-mode="'scaleToFill'" height="160" 
+			 :list="bannerList" @click="clickBanner"  :name="'picUrl'" >
+			</u-swiper> 
+		
 		</view>
 		<view class="userIcon">
-			<view class="userIcon-tit">
+			<view class="userIcon-tit oldTextjp2" oldstyle="font-size: 20px;">
 				<h3>常用功能</h3>
 			</view>
-			<view class="userIcon-main">
+			<view class="userIcon-main oldTextjp2" oldstyle="font-size: 18px;">
 				<view class="userIcon-item" @click="getScanCode">
 					<view class="userIcon-icon userIcon-icon1">
 						<u-icon name="qr-scan-2-line" custom-prefix="custom-icon" color="#fff" size="36"></u-icon>
@@ -108,7 +113,7 @@
 			</view>
 		</view>
 		
-		<Tabbar :current="2"></Tabbar>
+		<Tabbar :current="2"  ref="tabbarMain" ></Tabbar>
 	</view>
 </template>
 
@@ -118,6 +123,7 @@
 	import * as loginApi from '@/apis/login.js'
 	import * as WxJsApi from '@/utils/wxJsApi.js'
 	import Tabbar from '@/components/Tabbar.vue'
+	import * as newsApi from '@/apis/news.js'
 	
 	export default {
 		components: {
@@ -125,6 +131,7 @@
 		},
 		data() {
 			return {
+				recordsTotal: 0,
 				myCouponList: [],
 				elderStatus: false,
 				personAccount: {},
@@ -135,6 +142,7 @@
 				title: '联系客服',
 				content: '400-8899-619',
 				confirmText: '拨打电话',
+				bannerList:[],
 				background:{
 					background: 'none'
 				},
@@ -148,7 +156,10 @@
 				this.getUserInfo();
 				this.getCouponList();
 			}
-			
+			if(this.$refs.tabbarMain){
+				this.$refs.tabbarMain.setcount(2);
+			}
+				
 			this.elderStatus=this.carhelp.get("getElderModeClass");
 		},
 		onReady() {
@@ -163,8 +174,47 @@
 			if(consumerPhone){
 				this.content=consumerPhone
  			}
+			this.getBannerInfo("userinfo")
 		},
 		methods: {
+			clickBanner(index){
+				var mod= this.bannerList[index]
+				
+				if(mod.linkUrl.indexOf('http')==0){
+				    window.location=mod.linkUrl;
+				}
+				else if(mod.linkUrl.indexOf('#/')==0){
+					if(mod.linkUrl.indexOf("?")==-1){
+						mod.linkUrl+='?';
+					}
+				    window.location=mod.linkUrl;
+				}
+				else if(mod.linkUrl=='#'||mod.linkUrl==''){
+				
+				}
+				else{
+					uni.navigateTo({
+						url:mod.linkUrl
+					})
+				}
+				
+			},
+			getBannerInfo(code){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				newsApi.getBannerInfo(code).then((res) => {
+					this.bannerList =res.data;
+					
+					// document.getElementsByClassName("uni-swiper-wrapper")[0].parentNode.style="background-color: rgb(255, 255, 255); height: 300px;"
+				 }).catch(error => {
+						uni.showToast({
+						
+							title: error,icon: "none"
+						})
+				})
+			},
 			getCouponList() {
 				uni.showLoading({
 					title: "加载中",
@@ -176,6 +226,7 @@
 					uni.hideLoading();
 					
 					this.myCouponList = res.data.data;
+					this.recordsTotal = res.data.recordsTotal;
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -387,6 +438,7 @@
 		margin-top: 16px;
 		display: flex;
 		justify-content: space-between;
+		font-size: 16px;
 	}
 	.userIcon-icon{
 		display: flex;
@@ -412,6 +464,7 @@
 			align-items: center;
 			padding: 16px;
 			.userCell-title{
+				font-size: 16px;
 				display: flex;
 				align-items: center;
 				p{