改字

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<ujp-navbar title="包月卡购买" :show="false" ></ujp-navbar>
+		<ujp-navbar title="月卡购买" :show="false" ></ujp-navbar>
 		
 		<!-- 头部图片 -->
 	<view class="background">
@@ -991,7 +991,7 @@
 								
 									var lnglat = new AMap.LngLat(this.longitude,this.latitude);
 									var myDistance = lnglat.distance([item.longitude,item.latitude]);
-									item.distance = myDistance/1000;
+									item.distance = myDistance/1000;
 									console.log(item.distance)
 								
 							}

pages/monthlyCardActivity/monthlyCardBuy3.vue

@@ -1,12 +1,12 @@
 <template>
 	<view>
-		<ujp-navbar title="包月卡购买"></ujp-navbar>
+		<ujp-navbar title="月卡购买"></ujp-navbar>
 		<!-- 卡片 -->
 		<view class="monthly-card-bgc">
 			<view class="monthly-card">
 				<view class="main">
 					<view class="title-1">
-						充电服务费包月卡
+						充电服务费月卡
 					</view>
 					<view class="title-2">
 						到期时间：{{userCard&&ispay?userCard.endTime:'未购买'}}<br />
@@ -18,7 +18,7 @@
 		</view>
 
 		<view class="slogan-1">
-			充电服务费包月卡
+			充电服务费月卡
 		</view>
 		<view class="slogan-2">
 			单次购买、整月受益!
@@ -26,34 +26,34 @@
 		<!-- <view class="slogan-3" style="color: #ead9b4;" >
 			限时活动结束时间2022年8月8日0点结束
 		</view> -->
-		<!-- 营运车辆 -->
-		<template  v-for="(item,i) in cardList"  >
-			<view  class="operating" :class="{
-				'operating-coach':item.monthlyRentCard.id==cardId,
-				'non-operational-car':item.monthlyRentCard.id!=cardId,
-			}"
-			
-			@click="cardId=item.monthlyRentCard.id,detail=item.monthlyRentCard"
-			 :key="i">
-				<view class="type">
-					<view class="title">
-						<text class="img">
-							<img  v-if="item.monthlyRentCard.id==cardId" src="../../assets/img/antFill-crown@3x.png" alt="">
-							<img   v-else src="../../assets/img/antFill-crown2.svg" alt="">
-							 
-						</text>{{item.monthlyRentCard.name}}
-					</view>
-					<view class="hint">
-						{{item.monthlyRentCard.remark}}
-					</view>
-			
-				</view>
-				<view class="price">
-			
-					<text class="num">{{item.monthlyRentCard.price.toFixed(2)}}</text>
-					<text class="unit">元</text>
-				</view>
-			</view>
+		<!-- 营运车辆 -->
+		<template  v-for="(item,i) in cardList"  >
+			<view  class="operating" :class="{
+				'operating-coach':item.monthlyRentCard.id==cardId,
+				'non-operational-car':item.monthlyRentCard.id!=cardId,
+			}"
+			
+			@click="cardId=item.monthlyRentCard.id,detail=item.monthlyRentCard"
+			 :key="i">
+				<view class="type">
+					<view class="title">
+						<text class="img">
+							<img  v-if="item.monthlyRentCard.id==cardId" src="../../assets/img/antFill-crown@3x.png" alt="">
+							<img   v-else src="../../assets/img/antFill-crown2.svg" alt="">
+							 
+						</text>{{item.monthlyRentCard.name}}
+					</view>
+					<view class="hint">
+						{{item.monthlyRentCard.remark}}
+					</view>
+			
+				</view>
+				<view class="price">
+			
+					<text class="num">{{item.monthlyRentCard.price.toFixed(2)}}</text>
+					<text class="unit">元</text>
+				</view>
+			</view>
 		</template>
 		
 		 
@@ -61,8 +61,8 @@
 			<view v-html="ykgz"></view>
 
 
-			<view class="slogan-4"
-			 v-if="cardId||ispay"
+			<view class="slogan-4"
+			 v-if="cardId||ispay"
 			 @click="gotoUrl('pages/monthlyCardActivity/monthlyCardList?cardId='+(ispay?userCard.rentCardId:cardId))">
 				查看本活动适用站点
 			</view>
@@ -81,10 +81,10 @@
 							">请使用支付宝扫码</view>
 
 		</u-modal>
-		<img id="qrcode" style="display: none;">
-		<!-- 立即开通 -->
-		<view class="bottom" v-if="ispay">
-			<button class="dredge">已购买</button>
+		<img id="qrcode" style="display: none;">
+		<!-- 立即开通 -->
+		<view class="bottom" v-if="ispay">
+			<button class="dredge">已购买</button>
 		</view>
 		<view class="bottom" v-else-if="!endCardBool">
 			<button class="dredge">已下架</button>
@@ -154,7 +154,7 @@
 			return {
 				cardId: '',
 				qrCodeImg: "",
-				showModel: false,
+				showModel: false,
 				cardList:[],
 				projectName: "",
 				list: [{
@@ -190,8 +190,8 @@
 		},
 		computed: {
 			endCardBool() {
-				if(!this.cardList.length){
-					return false;
+				if(!this.cardList.length){
+					return false;
 				}
 				var date = new Date().getTime()
 				if (!this.detail.endTime) {
@@ -223,7 +223,7 @@
 
 					} else {
 						//this.getInfo();
-						
+						
 						this.getCardList();
 						this.show2 = true;
 						//this.carhelp.setGzDate() 
@@ -249,31 +249,31 @@
 				}
 				return false
 			},
-			getCardList(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.cardList({
-					
-				}).then((response) => {
-					
-					
-					this.cardList=response.data.cardList;
-					if(this.cardList.length){
-						this.detail = this.cardList[0].monthlyRentCard
-						this.cardId=this.detail.id;
-						
-					}
-					this.getUserInfo()
-					console.log(this.cardList)
-					//cardId: this.cardId
-					uni.hideLoading()
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
+			getCardList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.cardList({
+					
+				}).then((response) => {
+					
+					
+					this.cardList=response.data.cardList;
+					if(this.cardList.length){
+						this.detail = this.cardList[0].monthlyRentCard
+						this.cardId=this.detail.id;
+						
+					}
+					this.getUserInfo()
+					console.log(this.cardList)
+					//cardId: this.cardId
+					uni.hideLoading()
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
 			},
 			getUserInfo() {
 				uni.showLoading({
@@ -295,9 +295,9 @@
 								this.infoSet = true;
 
 							} else {
-								this.infoSet = false;
-								if(this.endCardBool){
-									this.infoSet1 = true;
+								this.infoSet = false;
+								if(this.endCardBool){
+									this.infoSet1 = true;
 								}
 								
 							}
@@ -379,12 +379,12 @@
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
-				})
-				var listcanvas=document.getElementsByTagName('canvas')
-				console.log(listcanvas.length)
-				if(listcanvas.length>0){
-					document.getElementById("qrcode").removeChild(document.getElementsByTagName('canvas')[0]);
-				}
+				})
+				var listcanvas=document.getElementsByTagName('canvas')
+				console.log(listcanvas.length)
+				if(listcanvas.length>0){
+					document.getElementById("qrcode").removeChild(document.getElementsByTagName('canvas')[0]);
+				}
 				
 				Pay.alpay(this.submitForm).then((response) => {
 
@@ -535,61 +535,61 @@
 		text-align: center;
 	}
 
-	.operating{
-		
-		border: 1px solid rgba(100, 90, 77, 100);
-			padding: 30rpx;
-			margin: 32rpx 40rpx 0;
-			//background: linear-gradient(to right, #bc9663, #79674d);
-			display: flex;
-			justify-content: space-between;
-			color: #fff;
-			border-radius: 12px;
-		
-			.title {
-				color: rgba(255, 255, 255, 100);
-				font-size: 18px;
-				line-height: 20px;
-		
-				.img {
-					display: inline-block;
-					background-color: #fff;
-					width: 40rpx;
-					height: 40rpx;
-					border-radius: 8rpx;
-					line-height: 36rpx;
-					margin-right: 8rpx;
-		
-					img {
-						width: 24rpx;
-						height: 24rpx;
-						margin-left: 8rpx;
-					}
-				}
-			}
-		
-			.hint {
-				color: rgba(255, 255, 255, 100);
-				font-size: 12px;
-				line-height: 24px;
-				margin-top: 4px;
-			}
-		
-			.price {
-				color: rgba(255, 255, 255, 100);
-		
-				margin: auto 0;
-		
-				.num {
-					font-size:56rpx;
-				}
-		
-				.unit {
-					font-size: 32rpx;
-					margin-left: 8rpx;
-				}
-			}
-		
+	.operating{
+		
+		border: 1px solid rgba(100, 90, 77, 100);
+			padding: 30rpx;
+			margin: 32rpx 40rpx 0;
+			//background: linear-gradient(to right, #bc9663, #79674d);
+			display: flex;
+			justify-content: space-between;
+			color: #fff;
+			border-radius: 12px;
+		
+			.title {
+				color: rgba(255, 255, 255, 100);
+				font-size: 18px;
+				line-height: 20px;
+		
+				.img {
+					display: inline-block;
+					background-color: #fff;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 8rpx;
+					line-height: 36rpx;
+					margin-right: 8rpx;
+		
+					img {
+						width: 24rpx;
+						height: 24rpx;
+						margin-left: 8rpx;
+					}
+				}
+			}
+		
+			.hint {
+				color: rgba(255, 255, 255, 100);
+				font-size: 12px;
+				line-height: 24px;
+				margin-top: 4px;
+			}
+		
+			.price {
+				color: rgba(255, 255, 255, 100);
+		
+				margin: auto 0;
+		
+				.num {
+					font-size:56rpx;
+				}
+		
+				.unit {
+					font-size: 32rpx;
+					margin-left: 8rpx;
+				}
+			}
+		
 	}
 	// 营运车辆,非营业车辆
 	.operating-coach {
@@ -652,4 +652,4 @@
 			color: #897a69;
 		}
 	}
-</style>
+</style>

pages/record/details.vue

@@ -24,7 +24,7 @@
 				<view class="details-row"><p>优惠券抵扣</p><span style="color:red">{{userCouponObj? userCouponObj.useText : '未使用'}}</span></view>
 				<view class="details-row" v-if="chargeDetail.discountAmount" ><p>实际减免</p><span >-{{chargeDetail.discountAmount.toFixed(2)}}元</span></view>
 			
-			<view class="details-row" v-if="chargeDetail.userCardId"><p>会员活动</p><span >充电服务费包月卡</span></view>
+			<view class="details-row" v-if="chargeDetail.userCardId"><p>会员活动</p><span >充电服务费月卡</span></view>
 			
 			</view>
 		</view>

pages/searchPile/chargeProcess/charge.vue

@@ -1,27 +1,27 @@
 <template>
 	<view>
-		<ujp-navbar title="开始充电"  :is-back="isback" ></ujp-navbar>
-		<!-- 优惠 -->
-		<view class="discounts" style="padding:0 18px;" v-if="bannerList.length">
-			<u-swiper bg-color="#fff" :img-mode="'scaleToFill'" height="160" :list="bannerList" @click="clickBanner"
-				:name="'picUrl'">
-			</u-swiper>
+		<ujp-navbar title="开始充电"  :is-back="isback" ></ujp-navbar>
+		<!-- 优惠 -->
+		<view class="discounts" style="padding:0 18px;" v-if="bannerList.length">
+			<u-swiper bg-color="#fff" :img-mode="'scaleToFill'" height="160" :list="bannerList" @click="clickBanner"
+				:name="'picUrl'">
+			</u-swiper>
 		</view>
-		<view class="recharge" >
-			
+		<view class="recharge" >
 			
-			<view class="title">
-				<view class="left lefttitle">
-					请选择充电金额
+			
+			<view class="title">
+				<view class="left lefttitle">
+					请选择充电金额
 				</view>
 				<view class="to-recharge" @click="show=true,recordId='',otherNum_f='',fee=0">
 					去充值
 				</view>
 			</view>
 			<p>当前余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元</p>
-			<view class="rechargeMain">
-				<view @click="moneyClick(-1)" :class="!otherNum&&moneyActiveClass == -1? 'active' : ''" class=" recharge-item  ">
-					充满自停
+			<view class="rechargeMain">
+				<view @click="moneyClick(-1)" :class="!otherNum&&moneyActiveClass == -1? 'active' : ''" class=" recharge-item  ">
+					充满自停
 				</view>
 				<view class="recharge-item" @click="moneyClick(item.id)"
 					:class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''" v-for="(item,index) in moneyList"
@@ -34,12 +34,12 @@
 
 				</view>
 				
-			</view>
-			
+			</view>
+			
+			
+			
 			
-			
 			
-			
 			
 
     <!-- 优惠券2 -->
@@ -71,36 +71,36 @@
 			 <view class="member" v-if="userCardBool" >
 			 	<view class="actively ">
 			 		会员活动
-			 	</view>
-				<view class="type"  v-if="!vin" style="color: red;" >
-					vin码不一致
+			 	</view>
+				<view class="type"  v-if="!vin" style="color: red;" >
+					vin码不一致
 				</view>
 				<view class="type" v-else-if="canUse">
-					充电服务费包月卡
-				</view>
-				<view class="type" style="color: red;" v-else>
-					此充电站不支持月卡服务
-				</view>
+					充电服务费月卡
+				</view>
+				<view class="type" style="color: red;" v-else>
+					此充电站不支持月卡服务
+				</view>
 				
-			 </view>
+			 </view>
 			
 			
 		</view>
 		<view class="bottom">
 			<view class="botton"
 			 @click="submit"
-			 >开始充电</view>
+			 >开始充电</view>
 			
-		</view>
-		
-		<view class="textinfo">
-			<p>充电说明：</p>
-			<view>
-				1.最终结算金额将以实际充入电量为准；<br/>
-				2.充满自停模式需要您的余额不低于10元才可充电；<br/>
-				3.充电金额请输入1元~500元的整数。实际充电金额与所选金额会略有出入（一般误差约几分钱)；<br/>
-				4.完成充电后，在满足条件的情况下，优惠券自动抵扣；提前结束充电则不使用优惠券并返还至您的卡包。<br/>
-			</view>
+		</view>
+		
+		<view class="textinfo">
+			<p>充电说明：</p>
+			<view>
+				1.最终结算金额将以实际充入电量为准；<br/>
+				2.充满自停模式需要您的余额不低于10元才可充电；<br/>
+				3.充电金额请输入1元~500元的整数。实际充电金额与所选金额会略有出入（一般误差约几分钱)；<br/>
+				4.完成充电后，在满足条件的情况下，优惠券自动抵扣；提前结束充电则不使用优惠券并返还至您的卡包。<br/>
+			</view>
 		</view>
 		
 		<!-- <view class="but-box" style="margin-bottom: 20px;">
@@ -112,10 +112,10 @@
 			 
 			 @click="submit" shape="circle">开始充电</u-button>
 		</view> -->
-				<u-modal v-model="showmodal" 
-				:show-cancel-button="true"
-				title="余额不足" confirm-text="前往充值"
-				content="账户余额不足，充值成功后开始充电" @confirm="show=true"></u-modal>
+				<u-modal v-model="showmodal" 
+				:show-cancel-button="true"
+				title="余额不足" confirm-text="前往充值"
+				content="账户余额不足，充值成功后开始充电" @confirm="show=true"></u-modal>
 
 		
 		<!-- 弹窗 -->
@@ -125,13 +125,13 @@
 					<view class="recharge" style="padding-bottom: 0;">
 						<view class="title lefttitle " >选择充值金额</view>
 						<p>当前余额{{user.balance>0?user.balance.toFixed(2):'0.00'}}元</p>
-						<view class="rechargeMain">
-							<view class="recharge-item" :class="!otherNum_f&&moneyActiveClass_f == item.id ? 'active' : ''"
-								v-for="(item,index) in moneyList_f" :key="item.id" @click="moneyClick_f(item.id,item)">
-								{{item.amountDesc?item.amountDesc:item.rechargeAmount+'元'}}
-								<view class="amount" v-if="item.amountRemark">{{item.amountRemark}}</view>
-								</view>
-							
+						<view class="rechargeMain">
+							<view class="recharge-item" :class="!otherNum_f&&moneyActiveClass_f == item.id ? 'active' : ''"
+								v-for="(item,index) in moneyList_f" :key="item.id" @click="moneyClick_f(item.id,item)">
+								{{item.amountDesc?item.amountDesc:item.rechargeAmount+'元'}}
+								<view class="amount" v-if="item.amountRemark">{{item.amountRemark}}</view>
+								</view>
+							
 						</view>
 						<p class="oldTextjp2" oldstyle="font-size:16px">其他充值金额</p>
 					<view  style="margin-bottom: 32px;">
@@ -140,7 +140,7 @@
 						
 						:class="otherNum_f? 'active' : ''"
 						class="recharge-input self-stop" style="height: 100%;width: 100%;margin-bottom: 8px;">
-							<u-input v-model="otherNum_f" @input="ckInput_f" @focus="focus" type="digit" :border="true" />
+							<u-input v-model="otherNum_f" @input="ckInput_f" @focus="focus" type="digit" :border="true" />
 										
 						
 						</view>
@@ -177,35 +177,35 @@
 <script>
 	import * as API from '@/apis/chargeProcess.js'
 	import * as userApi from '@/apis/user.js'
-	import * as newsApi from '@/apis/news.js'
-	import * as API_finance from '@/apis/finance.js'
-	import {
-		wxPayJs
-	} from '@/utils/wxpay'
-	import * as Pay from '@/apis/weixin.js'
-	
-	
+	import * as newsApi from '@/apis/news.js'
+	import * as API_finance from '@/apis/finance.js'
+	import {
+		wxPayJs
+	} from '@/utils/wxpay'
+	import * as Pay from '@/apis/weixin.js'
+	
+	
 
 	export default {
 		data() {
-			return {
-				fee:0,
+			return {
+				fee:0,
 				recordId:"",
 				show2:false,
 				stationId:"",
 				elderMode:false,
 				isback:true,
 				show: false,
-				moneyActiveClass: "-1",
+				moneyActiveClass: "-1",
 				moneyActiveClass_f: "-1",
 				detail: {},
-				couponsuse:'',
+				couponsuse:'',
 				showmodal:false,
-				//提交信息
-				//提交信息
-				submitForm_f: {
-					
-					//paytype:'YE',
+				//提交信息
+				//提交信息
+				submitForm_f: {
+					
+					//paytype:'YE',
 				},
 				submitForm: {
 					deviceNo: '',
@@ -216,9 +216,9 @@
 					//paytype:'YE',
 				},
 				uuid:0,
-				user: {},
+				user: {},
 				otherNum_f: '',
-				otherNum: '',
+				otherNum: '',
 				moneyList_f:[],
 				moneyList: [
 					{
@@ -243,39 +243,39 @@
 					},
 
 				],
-				
-				userCard:null,
+				
+				userCard:null,
 				canUse:false,
 				selectObj:{},
 				value:"",
 				// 优惠券
-				listlength:0,
-				vin:true,
+				listlength:0,
+				vin:true,
 				bannerList:[],
-            checked:true,
+            checked:true,
 			selectItem:{},
 			}
-		},
-		computed:{
-			userCardBool(){
-				if(this.userCard){
-					var date=new Date().getTime()
-					var reg=new RegExp('-','gi')
-					var str=this.userCard.endTime;
-					//console.log(str.replace(reg,'/'))
-					var date2=new Date(str.replace(reg,'/')).getTime();
-					if(date<date2){
-						return true;
-					}
-				}
-				return false
-			}
 		},
-		onLoad(op) {
-			
-			// var plus=this.carhelp.getPersonInfoPlus()
-			// if(plus){
-			// 	this.userCard=plus.userCard;
+		computed:{
+			userCardBool(){
+				if(this.userCard){
+					var date=new Date().getTime()
+					var reg=new RegExp('-','gi')
+					var str=this.userCard.endTime;
+					//console.log(str.replace(reg,'/'))
+					var date2=new Date(str.replace(reg,'/')).getTime();
+					if(date<date2){
+						return true;
+					}
+				}
+				return false
+			}
+		},
+		onLoad(op) {
+			
+			// var plus=this.carhelp.getPersonInfoPlus()
+			// if(plus){
+			// 	this.userCard=plus.userCard;
 			// }
 			this.uuid=new Date().getTime();
 			this.stationId= op.stationId;
@@ -285,9 +285,9 @@
 				this.submitForm.channelNo = op.gun;
 				this.submitForm.carNumber = op.carNumber;
 				this.carhelp.setGunIdCharge(this.submitForm);
-			}
-			if(op.vin=='no'){
-					this.vin=false;
+			}
+			if(op.vin=='no'){
+					this.vin=false;
 			}
 			if(op.isback){
 				this.isback=false;
@@ -298,11 +298,11 @@
 						// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
 			if(couponsuse){
 							this.couponsuse=couponsuse
-				}
+				}
 				this.init()
 		},
-		onReady(){
-			this.getBannerInfo("charge-start")
+		onReady(){
+			this.getBannerInfo("charge-start")
 			
 			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
 			if(this.elderMode)
@@ -320,161 +320,161 @@
 			
 			this.getHomePage()
 		},
-		methods: {
-			moneyClick_f(index,item) {
-				this.otherNum_f='';
-				this.moneyActiveClass_f = index;
-				if(item){
-					this.selectItem=item;
-					// if(item.imgUrl){
-					// 	this.selectImg=item
-					// }
-				}
-			},
-			rechargeNow() {
-				if(!this.checked){
-					uni.showToast({
-						title:"请同意《充值协议》后进行充值"
-					})
-					return
-				}
-				
-				this.submitForm_f={};
-				var fee=0;
-				if(!this.otherNum_f){
-					this.submitForm_f.chargingMarketingId=this.selectItem.id;
-					fee=this.selectItem.rechargeAmount
-				}else{
-					this.submitForm_f.amount=this.otherNum_f
-					fee=this.otherNum_f
-				}
-				
-				if(this.fee){
-					var thisfee=this.fee
-					if(this.fee>parseFloat(fee)){
-						uni.showToast({
-							title:`最少充值${thisfee}元才能启动充电`
-						})
-						return
-					}
-				}
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				if(this.recordId){
-					this.submitForm_f.recordId=this.recordId
-					
-					
-				}
-				//(this.submitForm)
-				this.wxpy()
-				
-			},
-			wxpy(){
-				
-				Pay.wxpay(this.submitForm_f).then((response) => {
-					
-					if(!response.result){		
-						uni.showToast({
-							title:  response.message
-						})
-						return
-					}
-					var data = response.data
-					uni.hideLoading()
-					//("Pay+"+new Date().getTime())		
-					wxPayJs(data);
-						
-				}).catch(error => {
-					uni.showToast({
-					
-						title: error
-					})
-						
-				})
-			},
-			focus(){
-				console.log(0)
-				uni.pageScrollTo({
-					scrollTop:999999,
-					duration:0
-				})
-			},
-			init() {
-			
-			
-			
-				
-				var data = {
-						type:2	,
-						};
-			
-			
-				API_finance.marketingData(data).then((res) => {
-			
-					this.moneyList_f = res.data.chargingMarketingList
-					if (this.moneyList_f.length > 0) {
-						this.selectItem = this.moneyList_f[0];
-						this.moneyActiveClass_f = this.moneyList_f[0].id
-						//(this.moneyActiveClass)
-					}
-					
-				}).catch(error => {
-					uni.showToast({
-			
-						title: error
-					})
-				})
-			},
-			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;
-					var url=mod.linkUrl.split("#")[1]
-					//window.location = mod.clickUrl;
-					uni.navigateTo({
-						url: url
-					})
-				}
-				else if(mod.linkUrl=='#'||mod.linkUrl==''){
-				
-				}
-				else{
-					uni.navigateTo({
-						url:mod.linkUrl
-					})
-				}
-				
-			},
-			getBannerInfo(code){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				newsApi.getBannerInfo(code).then((res) => {
-					uni.hideLoading();
-					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"
-						})
-				})
-			},
-			
-			getPile(){
-				
+		methods: {
+			moneyClick_f(index,item) {
+				this.otherNum_f='';
+				this.moneyActiveClass_f = index;
+				if(item){
+					this.selectItem=item;
+					// if(item.imgUrl){
+					// 	this.selectImg=item
+					// }
+				}
+			},
+			rechargeNow() {
+				if(!this.checked){
+					uni.showToast({
+						title:"请同意《充值协议》后进行充值"
+					})
+					return
+				}
+				
+				this.submitForm_f={};
+				var fee=0;
+				if(!this.otherNum_f){
+					this.submitForm_f.chargingMarketingId=this.selectItem.id;
+					fee=this.selectItem.rechargeAmount
+				}else{
+					this.submitForm_f.amount=this.otherNum_f
+					fee=this.otherNum_f
+				}
+				
+				if(this.fee){
+					var thisfee=this.fee
+					if(this.fee>parseFloat(fee)){
+						uni.showToast({
+							title:`最少充值${thisfee}元才能启动充电`
+						})
+						return
+					}
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				if(this.recordId){
+					this.submitForm_f.recordId=this.recordId
+					
+					
+				}
+				//(this.submitForm)
+				this.wxpy()
+				
+			},
+			wxpy(){
+				
+				Pay.wxpay(this.submitForm_f).then((response) => {
+					
+					if(!response.result){		
+						uni.showToast({
+							title:  response.message
+						})
+						return
+					}
+					var data = response.data
+					uni.hideLoading()
+					//("Pay+"+new Date().getTime())		
+					wxPayJs(data);
+						
+				}).catch(error => {
+					uni.showToast({
+					
+						title: error
+					})
+						
+				})
+			},
+			focus(){
+				console.log(0)
+				uni.pageScrollTo({
+					scrollTop:999999,
+					duration:0
+				})
+			},
+			init() {
+			
+			
+			
+				
+				var data = {
+						type:2	,
+						};
+			
+			
+				API_finance.marketingData(data).then((res) => {
+			
+					this.moneyList_f = res.data.chargingMarketingList
+					if (this.moneyList_f.length > 0) {
+						this.selectItem = this.moneyList_f[0];
+						this.moneyActiveClass_f = this.moneyList_f[0].id
+						//(this.moneyActiveClass)
+					}
+					
+				}).catch(error => {
+					uni.showToast({
+			
+						title: error
+					})
+				})
+			},
+			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;
+					var url=mod.linkUrl.split("#")[1]
+					//window.location = mod.clickUrl;
+					uni.navigateTo({
+						url: url
+					})
+				}
+				else if(mod.linkUrl=='#'||mod.linkUrl==''){
+				
+				}
+				else{
+					uni.navigateTo({
+						url:mod.linkUrl
+					})
+				}
+				
+			},
+			getBannerInfo(code){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				newsApi.getBannerInfo(code).then((res) => {
+					uni.hideLoading();
+					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"
+						})
+				})
+			},
+			
+			getPile(){
+				
 			},
 			theme(type) {
 				
@@ -495,32 +495,32 @@
 					
 				this.gotoUrl('pages/user/coupon/chooseCoupons?uuid='+this.uuid+"&amount="+this.submitForm.amount+"&stationId="+this.stationId)
 				
-			},
-			ckInput_f(text) {
-				if (text.indexOf('.') > 0) {
-					
-					var k =text.split(".")[1]
-					if(k.length>=3){
-						this.$nextTick(()=>{
-							text=parseFloat(text).toFixed(2);
-							this.otherNum_f= text
-						})
-					}
-				}
-				var t = Number(text);
-				if (t < 1) {
-					this.$nextTick(() => {
-						this.otherNum_f = '';
-					})
-					
-				}
-				if (t > 500) {
-					this.$nextTick(() => {
-						this.otherNum_f = 500;
-					})
-				
-				}
-			
+			},
+			ckInput_f(text) {
+				if (text.indexOf('.') > 0) {
+					
+					var k =text.split(".")[1]
+					if(k.length>=3){
+						this.$nextTick(()=>{
+							text=parseFloat(text).toFixed(2);
+							this.otherNum_f= text
+						})
+					}
+				}
+				var t = Number(text);
+				if (t < 1) {
+					this.$nextTick(() => {
+						this.otherNum_f = '';
+					})
+					
+				}
+				if (t > 500) {
+					this.$nextTick(() => {
+						this.otherNum_f = 500;
+					})
+				
+				}
+			
 			},
 			ckInput(text) {
 				if (text.indexOf('.') > 0) {
@@ -574,8 +574,8 @@
 				if(this.selectObj.id){
 					this.submitForm.userCouponId=this.selectObj.id
 				}
-				if(this.userCardBool&&this.canUse&&this.vin){
-					this.submitForm.userCardId=this.userCard.id
+				if(this.userCardBool&&this.canUse&&this.vin){
+					this.submitForm.userCardId=this.userCard.id
 				}
 				uni.showLoading({
 					title: "加载中",
@@ -584,24 +584,24 @@
 
 				//this.submitForm.deviceNo = this.detail.deviceNo;
 				API.startCarCharging(this.submitForm).then((res) => {
-					//(JSON.stringify(this.res))
-					
-					if(res.data.status=="5"){
-						uni.hideLoading()
-						this.showmodal=true;
-						this.recordId=res.data.recordId;
-					
-						var fee=res.data.fee;
-					
-						
-						this.fee=(fee-this.user.balance).toFixed(2);
-						this.otherNum_f=this.fee;
+					//(JSON.stringify(this.res))
+					
+					if(res.data.status=="5"){
+						uni.hideLoading()
+						this.showmodal=true;
+						this.recordId=res.data.recordId;
+					
+						var fee=res.data.fee;
+					
+						
+						this.fee=(fee-this.user.balance).toFixed(2);
+						this.otherNum_f=this.fee;
 					}else{
 						
 						this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
 						
 						
-					}
+					}
 					
 					
 
@@ -622,43 +622,43 @@
 					title: "加载中",
 					mask: true,
 				})
-				
-				
-			
-				API.userCard({
-					stationId:this.stationId
-				}).then((res) => {
-					console.log(res)
-					this.userCard=res.data.regUserCard
-					this.canUse=res.data.canUse
-					//this.user = res.data
-					
-					
-					API.personalCenter().then((res2) => {
-						this.user = res2.data
-						this.isReady = true;
-						uni.hideLoading()
-					 
-					}).catch(error => {
-						uni.showToast({
-							title: error
-						})
-					})
-					
-				 
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
+				
+				
+			
+				API.userCard({
+					stationId:this.stationId
+				}).then((res) => {
+					console.log(res)
+					this.userCard=res.data.regUserCard
+					this.canUse=res.data.canUse
+					//this.user = res.data
+					
+					
+					API.personalCenter().then((res2) => {
+						this.user = res2.data
+						this.isReady = true;
+						uni.hideLoading()
+					 
+					}).catch(error => {
+						uni.showToast({
+							title: error
+						})
+					})
+					
+				 
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
 				})
 			},
 			useCoupon(){
-				 var obj={
-					 	status:0,
-					 	stationId:this.stationId
+				 var obj={
+					 	status:0,
+					 	stationId:this.stationId
 					 }
-				if(this.userCardBool) {
-					obj.userCardId=this.userCard.id
+				if(this.userCardBool) {
+					obj.userCardId=this.userCard.id
 				}
 				 
 				userApi.couponList(obj).then((res) => {
@@ -714,30 +714,30 @@
 	}
 </style>
 
-<style lang="scss" scoped>
-	.textinfo{
-		padding: 40rpx;
-		font-size: 14px !important;
-		color: #999999;
-	
-		p{
-			font-size: 16px !important;
-			color:#101010;
-			    font-weight: bold;
-		}
-	}
-	.lefttitle{
-		font-weight: bold;
-		font-size: 16px
+<style lang="scss" scoped>
+	.textinfo{
+		padding: 40rpx;
+		font-size: 14px !important;
+		color: #999999;
+	
+		p{
+			font-size: 16px !important;
+			color:#101010;
+			    font-weight: bold;
+		}
+	}
+	.lefttitle{
+		font-weight: bold;
+		font-size: 16px
 	}
 	@import "@/_theme.scss";
 	.listlength{
 		    float: right;
 		    padding-right: 10px;
 	}
-	/deep/.u-drawer-content{
-		border-radius: 10px 10px 0 0
-	}
+	/deep/.u-drawer-content{
+		border-radius: 10px 10px 0 0
+	}
 	
 	/deep/.u-radio-group {
 		width: 100%;
@@ -1024,7 +1024,7 @@ position: relative;
 	
 	
 	// 尾部
-	.bottom {
+	.bottom {
 		background: #fff;
 		width: 100%;
 		// height: 64px;
@@ -1038,7 +1038,7 @@ position: relative;
 		.botton {
 			//width: 343px;
 			height: 40px;
-			line-height: 40px;
+			line-height: 40px;
 			font-size:16px;
 			border-radius: 50px;
 			background-color: rgba(0, 185, 98, 100);

pages/searchPile/chargeProcess/charging.vue

@@ -109,7 +109,7 @@
 				</view>
 				<view class="detail">
 					<p class="electrovalence"><text class="num">0.74</text> 元/度</p>
-					<p class="electrovalence-monthlyCard">电价:0.74 | 服务费:0.00(包月卡)</p>
+					<p class="electrovalence-monthlyCard">电价:0.74 | 服务费:0.00(月卡)</p>
 				</view>
 			
 			</view>
@@ -136,7 +136,7 @@
 					会员活动
 				</view>
 				<view class="detail">
-					充电免服务费包月卡
+					充电免服务费月卡
 				</view>
 			
 			</view>

pages/searchPile/chargeProcess/dcChargeEnd.vue

@@ -47,7 +47,7 @@
 				会员活动
 			</view>
 			<view class="content">
-				充电服务费包月卡
+				充电服务费月卡
 			</view>
 		</view>
 	</view>

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -113,7 +113,7 @@
 				</view>
 				
 			</view>
-		</view>
+		</view>
 		
 		<view class="cost-explain">
 			<view class="text">
@@ -127,7 +127,7 @@
 			 @click="step=1">
 				&#xe600;
 			</view>
-		</view>
+		</view>
 		
 		<!--提示  -->
 		<view class="tips"  v-if="userCardBool" style="margin-bottom: 40rpx;" >
@@ -137,20 +137,20 @@
 			</view> -->
 			<view class="content" :style="canUse?'':'color: red;'" >
 			
-				{{canUse?'充电服务费包月卡':'此充电站不支持月卡服务'}}
+				{{canUse?'充电服务费月卡':'此充电站不支持月卡服务'}}
 				 
 			</view>
 
 		</view>
-	<!-- 填写车牌后状态 -->
-	<view class="car">
-		<view class="car-name">
-			入场车辆
-		</view>
-		<view class="car-number">
-			{{car?car.carNum:''}}
-			<img   v-if="!car" @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line2.svg" alt="">
-		</view>
+	<!-- 填写车牌后状态 -->
+	<view class="car">
+		<view class="car-name">
+			入场车辆
+		</view>
+		<view class="car-number">
+			{{car?car.carNum:''}}
+			<img   v-if="!car" @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line2.svg" alt="">
+		</view>
 	</view>
 	
 
@@ -185,10 +185,10 @@
 			
 			<view class="content">
 			
-				1.车停好，请熄火后再充电；<br/>
-				2.请确保充电枪插接到位；<br/>
-				3.车辆充电时，请关闭车内电源；<br/>
-				4.充电完毕，请及时拔枪;<br/>
+				1.车停好，请熄火后再充电；<br/>
+				2.请确保充电枪插接到位；<br/>
+				3.车辆充电时，请关闭车内电源；<br/>
+				4.充电完毕，请及时拔枪;<br/>
 				5.填写车牌号，离场时可减免部分停车费。
 				
 			</view>
@@ -234,7 +234,8 @@
 				price: {},
 				gunDetail:{},
 				haveLock :false,
-				lockSafeStopTime:0,
				lockStatus:'',// 1抬锁 2落锁
+				lockSafeStopTime:0,
+				lockStatus:'',// 1抬锁 2落锁
 				detail: {
 					no: '',
 					interface: '',

pages/searchPile/stationAndPile/stationDetails.vue

@@ -1,23 +1,23 @@
 <template>
 	<view style="padding-bottom: 28px;">
 		<ujp-navbar title="站点详情">
-			<view slot="right" style="margin-right: 10px;" @click="getScanCode"   >
-					<view class="iconfont qr-code">
-						&#xe61a;
+			<view slot="right" style="margin-right: 10px;" @click="getScanCode"   >
+					<view class="iconfont qr-code">
+						&#xe61a;
 					</view>
 			</view>
 		</ujp-navbar>
-		
-		<u-alert-tips type="warning"
-		v-if="stationDetail.station&&stationDetail.station.maxSoc"
-		 :descStyle="{
-			     fontSize: '28rpx',
-			     color: '#ef7a30',
-		 }" 
-		 :show-icon="true"   :description="'【充电SOC限制】为保障充电安全，并积极响应主管部门对新能源汽车充电安全工作，从即日起，该站充电设施SOC上限阈值为'+stationDetail.station.maxSoc+'%，即充电量达到满充电量'+stationDetail.station.maxSoc+'%时，充电设施将自动结束充电。'" >
-		 
-		 </u-alert-tips>
-		
+		
+		<u-alert-tips type="warning"
+		v-if="stationDetail.station&&stationDetail.station.maxSoc"
+		 :descStyle="{
+			     fontSize: '28rpx',
+			     color: '#ef7a30',
+		 }" 
+		 :show-icon="true"   :description="'【充电SOC限制】为保障充电安全，并积极响应主管部门对新能源汽车充电安全工作，从即日起，该站充电设施SOC上限阈值为'+stationDetail.station.maxSoc+'%，即充电量达到满充电量'+stationDetail.station.maxSoc+'%时，充电设施将自动结束充电。'" >
+		 
+		 </u-alert-tips>
+		
 		
 		<view v-if="stationDetail.station!=null" class="station-details">
 			<u-image border-radius='15rpx' v-if="stationDetail.station != null && stationDetail.station.image != null"
@@ -52,8 +52,8 @@
 				<view class="date"><text><img src="../../../assets/img/riLine-map-pin-time-line.svg" alt=""></text>
 				{{stationDetail.station.describe}}</view>
 			</view>
-			<view class="infos-item between " 
-			v-if="stationDetail.station.parkingDescription"
+			<view class="infos-item between " 
+			v-if="stationDetail.station.parkingDescription"
 			oldstyle="font-size: 16px;" @click="()=>{if(stationDetail.station.parkingSimpleDescription){parkingTips=true}}" >
 				<view class="park"><text><img src="../../../assets/img/riLine-parking-box-line.svg" alt=""></text>
 				{{stationDetail.station.parkingDescription}}</view>
@@ -101,12 +101,12 @@
 			</view> -->
 			<!-- <view class="details-item">
 				<view class="iconfont font5" style="color: #4e94ff;">&#xe60e;</view>
-				<view class="item-text " oldstyle="font-size: 16px;" >
-					<template v-if="stationDetail.station.distance">
-						{{stationDetail.station.distance!=null&&stationDetail.station.distance>0.1 ? stationDetail.station.distance.toFixed(1)+'公里':'小于100米'}}
-					</template>
-					<template v-else>
-						定位中
+				<view class="item-text " oldstyle="font-size: 16px;" >
+					<template v-if="stationDetail.station.distance">
+						{{stationDetail.station.distance!=null&&stationDetail.station.distance>0.1 ? stationDetail.station.distance.toFixed(1)+'公里':'小于100米'}}
+					</template>
+					<template v-else>
+						定位中
 					</template>
 					<span style="font-size: 12px;
 							color: #5c95f8;
@@ -118,15 +118,15 @@
 				<view class="item-text " oldstyle="font-size: 16px;">
 					{{stationDetail.station.describe}}
 				</view>
-			</view> -->
-			
-		<!-- 	<view class="details-item">
-				<img class="iconfont font5" src="@/assets/img/riLine-coupon-3-line.svg"  style="width: 40rpx;" >
-				<view class="item-text " oldstyle="font-size: 16px;">
-					本站<span v-if="stationDetail&&stationDetail.station&&stationDetail.station.giveDiscount">会员享服务费{{stationDetail.station.discountRatio/10}}折，</span>支持包月卡、服务费代金券和超级代金券等优惠活动
-					
-				</view>
-			</view> -->
+			</view> -->
+			
+		<!-- 	<view class="details-item">
+				<img class="iconfont font5" src="@/assets/img/riLine-coupon-3-line.svg"  style="width: 40rpx;" >
+				<view class="item-text " oldstyle="font-size: 16px;">
+					本站<span v-if="stationDetail&&stationDetail.station&&stationDetail.station.giveDiscount">会员享服务费{{stationDetail.station.discountRatio/10}}折，</span>支持月卡、服务费代金券和超级代金券等优惠活动
+					
+				</view>
+			</view> -->
 			
 			<!-- <view class="station-address" @click="map">
 				<img src="static/img/Frame 201.png" alt="">
@@ -155,12 +155,12 @@
 				<template v-for="(item,i) in device.gunList">
 					<view class="item" :style="item.open?'':'  border-bottom: 1px solid rgba(238, 242, 240, 100);'"
 						:key="i+'_'+index">
-						
-						
-						<view v-if="item.workStatus == 0&&item.insertStatus"
-								style="font-size:14px;height: 50px;"
-								class="free charging">
-						已插枪
+						
+						
+						<view v-if="item.workStatus == 0&&item.insertStatus"
+								style="font-size:14px;height: 50px;"
+								class="free charging">
+						已插枪
 						</view>
 						<view v-else-if="device.online"
 							:style="item.workStatusText.length>3?' padding: 0 10px':(item.workStatusText.length==3?'font-size:14px;height: 50px;':'padding: 10px;')"
@@ -168,23 +168,23 @@
 						free:true,
 						charging:item.enableShare&&item.workStatus!=0,
 						
-						'not-open2':item.enableShare&&!item.enableShareWithinTime&&device.online,
-						'not-open':item.isRed||item.workStatus==2
+						'not-open2':item.enableShare&&!item.enableShareWithinTime&&device.online,
+						'not-open':item.isRed||item.workStatus==2
 						
 					}">
 							{{item.workStatusText}}
-						</view>
-						
-						
-						<view v-else
-								style=" padding: 0 10px"
-								:class="{
-							free:true,
-					
-							'not-open':true,
-							
-						}">
-								离线
+						</view>
+						
+						
+						<view v-else
+								style=" padding: 0 10px"
+								:class="{
+							free:true,
+					
+							'not-open':true,
+							
+						}">
+								离线
 							</view>
 						<view class="info">
 							<view class="name " >
@@ -211,48 +211,48 @@
 								</view>
 								<view class="tag-item" @click="book2(item,item.enableShare&&item.enableShareWithinTime)"
 									:class="item.enableShare&&item.enableShareWithinTime?'':'not-open-tag'">
-									
+									
 									{{item.haveLock?'解锁':'充电' }}
 								</view>
 							</view>
 
-						</template>
+						</template>
 						
-						<view class="persent"
-						 style="margin: auto;height: 50px; width: 100px;    max-width: 100px; "
-						 v-if="item.workStatus == 2 ">
-								<!-- carsvg11:platform=='ios'&&platform!='ios', -->
-							
-							<svg  :class="{
-								carsvg1:true,
-							
-							}"  
-							
-							width="100" height="40" viewBox="0 0 100 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-							<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H100V40H0V0ZM29.0889 33.6517H74.363C73.4148 31.9925 72.8222 30.2147 72.5852 28.0814C72.5852 25.2369 73.7704 22.6295 75.6667 20.7332C77.563 18.8369 80.1704 17.6517 83.0148 17.6517C85.8593 17.6517 88.4667 18.8369 90.363 20.7332C92.2593 22.6295 93.4444 25.2369 93.4444 28.0814C93.4444 29.7406 93.0889 31.2814 92.3778 32.7036H92.7333C94.9852 31.5184 97.1185 30.0962 98.7778 27.6073L96.5259 15.0443C92.8519 13.3851 86.8074 11.3703 81.9482 10.7777C79.4593 8.05174 76.8519 5.9184 72.9407 4.25914C64.5259 3.19248 58.2444 3.54803 49.237 4.25914C41.5333 6.74803 34.8963 9.711 29.563 13.2666C28.438 13.4154 27.2599 13.5643 26.0461 13.7177C18.5644 14.6633 9.72591 15.7804 3.60741 18.1258L2.06667 28.5554C4.2 30.8073 7.51852 31.9925 10.837 32.7036C10.1259 31.2814 9.77037 29.8591 9.77037 28.1999C9.77037 25.3554 10.9556 22.748 12.8519 20.8517C14.7481 18.9554 17.3556 17.7703 20.2 17.7703C23.0444 17.7703 25.6519 18.9554 27.5481 20.8517C29.4444 22.748 30.6296 25.3554 30.6296 28.1999C30.6296 30.2147 30.1556 31.9925 29.0889 33.6517ZM76.7333 21.6814C78.3926 20.0221 80.763 18.9554 83.2519 18.9554C85.7407 18.9554 87.9926 20.0221 89.7704 21.6814C91.4296 23.3406 92.4963 25.711 92.4963 28.1999C92.4963 30.8073 91.4296 33.0591 89.7704 34.7184C88.1111 36.3777 85.7407 37.4443 83.2519 37.4443C80.6444 37.4443 78.3926 36.3777 76.7333 34.7184C75.0741 33.0591 74.0074 30.6888 74.0074 28.1999C74.0074 25.5925 75.0741 23.3406 76.7333 21.6814ZM13.8 21.6814C15.4593 20.0221 17.8296 18.9554 20.3185 18.9554C22.8074 18.9554 25.1778 20.0221 26.837 21.6814C28.4963 23.3406 29.563 25.711 29.563 28.1999C29.563 30.2849 28.8809 32.1426 27.7591 33.6517C27.4781 34.0298 27.1694 34.386 26.837 34.7184C25.1778 36.3777 22.8074 37.4443 20.3185 37.4443C17.7111 37.4443 15.4593 36.3777 13.8 34.7184C13.2095 34.1279 12.6941 33.4474 12.2751 32.7036C11.5167 31.3571 11.0741 29.8031 11.0741 28.1999C11.0741 25.5925 12.1407 23.3406 13.8 21.6814Z" fill="white"/>
-							</svg>
-							
-							
-							
+						<view class="persent"
+						 style="margin: auto;height: 50px; width: 100px;    max-width: 100px; "
+						 v-if="item.workStatus == 2 ">
+								<!-- carsvg11:platform=='ios'&&platform!='ios', -->
+							
+							<svg  :class="{
+								carsvg1:true,
+							
+							}"  
+							
+							width="100" height="40" viewBox="0 0 100 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+							<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H100V40H0V0ZM29.0889 33.6517H74.363C73.4148 31.9925 72.8222 30.2147 72.5852 28.0814C72.5852 25.2369 73.7704 22.6295 75.6667 20.7332C77.563 18.8369 80.1704 17.6517 83.0148 17.6517C85.8593 17.6517 88.4667 18.8369 90.363 20.7332C92.2593 22.6295 93.4444 25.2369 93.4444 28.0814C93.4444 29.7406 93.0889 31.2814 92.3778 32.7036H92.7333C94.9852 31.5184 97.1185 30.0962 98.7778 27.6073L96.5259 15.0443C92.8519 13.3851 86.8074 11.3703 81.9482 10.7777C79.4593 8.05174 76.8519 5.9184 72.9407 4.25914C64.5259 3.19248 58.2444 3.54803 49.237 4.25914C41.5333 6.74803 34.8963 9.711 29.563 13.2666C28.438 13.4154 27.2599 13.5643 26.0461 13.7177C18.5644 14.6633 9.72591 15.7804 3.60741 18.1258L2.06667 28.5554C4.2 30.8073 7.51852 31.9925 10.837 32.7036C10.1259 31.2814 9.77037 29.8591 9.77037 28.1999C9.77037 25.3554 10.9556 22.748 12.8519 20.8517C14.7481 18.9554 17.3556 17.7703 20.2 17.7703C23.0444 17.7703 25.6519 18.9554 27.5481 20.8517C29.4444 22.748 30.6296 25.3554 30.6296 28.1999C30.6296 30.2147 30.1556 31.9925 29.0889 33.6517ZM76.7333 21.6814C78.3926 20.0221 80.763 18.9554 83.2519 18.9554C85.7407 18.9554 87.9926 20.0221 89.7704 21.6814C91.4296 23.3406 92.4963 25.711 92.4963 28.1999C92.4963 30.8073 91.4296 33.0591 89.7704 34.7184C88.1111 36.3777 85.7407 37.4443 83.2519 37.4443C80.6444 37.4443 78.3926 36.3777 76.7333 34.7184C75.0741 33.0591 74.0074 30.6888 74.0074 28.1999C74.0074 25.5925 75.0741 23.3406 76.7333 21.6814ZM13.8 21.6814C15.4593 20.0221 17.8296 18.9554 20.3185 18.9554C22.8074 18.9554 25.1778 20.0221 26.837 21.6814C28.4963 23.3406 29.563 25.711 29.563 28.1999C29.563 30.2849 28.8809 32.1426 27.7591 33.6517C27.4781 34.0298 27.1694 34.386 26.837 34.7184C25.1778 36.3777 22.8074 37.4443 20.3185 37.4443C17.7111 37.4443 15.4593 36.3777 13.8 34.7184C13.2095 34.1279 12.6941 33.4474 12.2751 32.7036C11.5167 31.3571 11.0741 29.8031 11.0741 28.1999C11.0741 25.5925 12.1407 23.3406 13.8 21.6814Z" fill="white"/>
+							</svg>
+							
+							
+							
+							
+							<u-line-progress  class="carline" 
+							 
+							   inactive-color="#92bd90"
+							 :show-percent="false" :striped="false" :striped-active="false"
+							 active-color="#51a96b" :percent="item.soc?item.soc:100">
+							
+							 </u-line-progress>
 							
-							<u-line-progress  class="carline" 
-							 
-							   inactive-color="#92bd90"
-							 :show-percent="false" :striped="false" :striped-active="false"
-							 active-color="#51a96b" :percent="item.soc?item.soc:100">
-							
-							 </u-line-progress>
-							
 							<svg  class="carsvg2" style=""
 							
 							width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
 							<path d="M14.2454 34.1958C13.8962 33.9672 17.9208 21.3078 17.7138 20.7516C17.505 20.1954 11.1168 21.1668 10.8054 20.1894C10.4922 19.212 21.418 1.51684 21.7582 1.80124C22.0966 2.08564 18.126 14.8296 18.288 15.2454C18.4518 15.6594 24.9984 14.7726 25.1964 15.8076C25.3962 16.8426 14.5928 34.4244 14.2454 34.1958Z" fill="#00B962"/>
-							</svg>
-							<span  class="carspan" :class="{
-								carspan2:!item.soc
+							</svg>
+							<span  class="carspan" :class="{
+								carspan2:!item.soc
 							}"> {{item.soc?item.soc+'%':'充电中'}}
-							</span>
-							
+							</span>
+							
 							
 						</view>
 
@@ -325,12 +325,12 @@
 		<view class="price-explain" :class="{
 			'elderMode':elderMode
 		}" v-show="current==1">
-			<u-alert-tips
-			 v-if="showtips"
-			 type="warning" :descStyle="{
-						     fontSize: '28rpx',
-						     color: '#ef7a30',
-					 }"   description="每个月的电价可以在“网上国网”APP网站上查到，会根据“煤电联动”机制进行调整。" :show-icon="true"></u-alert-tips>
+			<u-alert-tips
+			 v-if="showtips"
+			 type="warning" :descStyle="{
+						     fontSize: '28rpx',
+						     color: '#ef7a30',
+					 }"   description="每个月的电价可以在“网上国网”APP网站上查到，会根据“煤电联动”机制进行调整。" :show-icon="true"></u-alert-tips>
 				
 			<view class="price-main">
 				<view class="price-item" v-for="(item,i) in pricesInfo" :key="i">
@@ -341,23 +341,23 @@
 						{{item.startTime}}-{{item.endTime}} <view class="current-time">当前时段</view>
 					</view>
 					<view class="price">
-						<text class="price-1"><text class="num">{{item.costPrice.toFixed(2)}}</text> <text >元/度</text></text> 
-						<text class="price-2"  v-if="station&&station.giveDiscount" >
-							<text class="num">{{((item.servicePrice*1000+item.electricityPrice*1000)/1000).toFixed(2)}}元/度</text>
+						<text class="price-1"><text class="num">{{item.costPrice.toFixed(2)}}</text> <text >元/度</text></text> 
+						<text class="price-2"  v-if="station&&station.giveDiscount" >
+							<text class="num">{{((item.servicePrice*1000+item.electricityPrice*1000)/1000).toFixed(2)}}元/度</text>
 						</text>
 					</view>
 					<view class="else-price">
 						<view class="electric-price">
 							电费{{item.electricityPrice.toFixed(2)}}元/度
-						</view>
-						
-						<view
-						 v-if="station&&station.giveDiscount"
-						
-						 class="service-price">服务费{{item.discountServicePrice}}元/度(折前{{item.servicePrice.toFixed(2)}}元/度)</view>
+						</view>
+						
+						<view
+						 v-if="station&&station.giveDiscount"
+						
+						 class="service-price">服务费{{item.discountServicePrice}}元/度(折前{{item.servicePrice.toFixed(2)}}元/度)</view>
 						
-						<view 
-							v-if="station&&!station.giveDiscount"
+						<view 
+							v-if="station&&!station.giveDiscount"
 						class="service-price">服务费{{item.servicePrice}}元/度</view>
 					</view>
 				</view>
@@ -366,10 +366,10 @@
 				
 			</view>
 
-			<u-divider color="#B6BDC3" style="margin-top:20px;" bg-color="#F2F4F4">*充电费用仅供参考，请以充电桩上的费用为准</u-divider>
+			<u-divider color="#B6BDC3" style="margin-top:20px;" bg-color="#F2F4F4">*充电费用仅供参考，请以充电桩上的费用为准</u-divider>
 
 		</view>
-		
+		
 		 <!-- 弹窗 -->
 		<view>
 			<u-modal v-model="show" confirm-text="去看空闲桩" cancel-text="查看处罚规则" confirm-color="#00B962">
@@ -408,7 +408,7 @@
 				devicesId: '',
 				elderMode: false,
 				userId: '',
-				show: false,
+				show: false,
 				showtips:true,
 				list: [{
 						"name": "充电桩"
@@ -450,10 +450,10 @@
 					],
 					park: {
 						price: '2小时免费停车'
-					},
-					uuid:'',
+					},
+					uuid:'',
 					setIntervalBool:true,
-					priceList: [],
+					priceList: [],
 					platform:'',
 					
 					devices: {
@@ -466,12 +466,12 @@
 				}
 			}
 		},
-		onLoad(op) {
-			uni.getSystemInfo({
-				success: (res) => {
-					console.log("----------")
-					console.log(res.platform)
-					this.platform=res.platform
+		onLoad(op) {
+			uni.getSystemInfo({
+				success: (res) => {
+					console.log("----------")
+					console.log(res.platform)
+					this.platform=res.platform
 				}})
 			_self = this;
 
@@ -485,35 +485,35 @@
 
 					this.getPriceList(op.id)
 				
-					this.getChargingStationDetail()
-					
+					this.getChargingStationDetail()
+					
 				
 				}
 				
 			}
-		},
-		onHide() {
-			this.setIntervalBool=false
-			if(this.uuid){
-				clearInterval(this.uuid)	
-				this.uuid='';
-			}
-		},
-		onShow() {
-			this.setIntervalBool=true
-			if(!this.uuid){
-				this.uuid=setInterval(()=>{
-					if(this.setIntervalBool){
-						this.getChargingStationDetail(true)
-					}
-				},5*1000)
-			}
-		},
-		onUnload() {
-			if(this.uuid){
-				clearInterval(this.uuid)
-				
-			}
+		},
+		onHide() {
+			this.setIntervalBool=false
+			if(this.uuid){
+				clearInterval(this.uuid)	
+				this.uuid='';
+			}
+		},
+		onShow() {
+			this.setIntervalBool=true
+			if(!this.uuid){
+				this.uuid=setInterval(()=>{
+					if(this.setIntervalBool){
+						this.getChargingStationDetail(true)
+					}
+				},5*1000)
+			}
+		},
+		onUnload() {
+			if(this.uuid){
+				clearInterval(this.uuid)
+				
+			}
 		},
 		onReady() {
 			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
@@ -535,22 +535,22 @@
 
 		},
 		methods: {
-			getChargingStationDetail(bl) {
+			getChargingStationDetail(bl) {
 				
-				var _self = this;
-				if(!bl){
-					uni.showLoading({
-					
-					})
+				var _self = this;
+				if(!bl){
+					uni.showLoading({
+					
+					})
 				}
 				
 				let data = {
 					stationId: this.stationId
-				};
-				var distance=null;
-				if(bl&&this.stationDetail&&this.stationDetail.station){
-					 distance=this.stationDetail.station.distance
-					 //防止重新获取定位
+				};
+				var distance=null;
+				if(bl&&this.stationDetail&&this.stationDetail.station){
+					 distance=this.stationDetail.station.distance
+					 //防止重新获取定位
 				}
 				api.getChargingStationDetail(data).then(function(res) {
 					uni.hideLoading()
@@ -570,32 +570,32 @@
 							}
 							_self.stationDetail.station.tagList = tagList;
 						}
-						
-						if(distance){
-							_self.stationDetail.station.distance=distance
-						}
-						var totalNum=0;
-						if(_self.openlist==null){
-							_self.openlist=new Map();
+						
+						if(distance){
+							_self.stationDetail.station.distance=distance
+						}
+						var totalNum=0;
+						if(_self.openlist==null){
+							_self.openlist=new Map();
 							
-							for(var  i in _self.stationDetail.devices ){
-								var device=_self.stationDetail.devices[i]
-								totalNum+=device.gunList.length
-								
-								for (let j = 0; j < device.gunList.length; j++) {
-									
-									_self.openlist.set(device.gunList[j].id,false);
-									
-									
-								}
-								
-							}
-							_self.list[0].name = "充电桩(" + totalNum + ")"
-						}
-						
-						
-						
-						
+							for(var  i in _self.stationDetail.devices ){
+								var device=_self.stationDetail.devices[i]
+								totalNum+=device.gunList.length
+								
+								for (let j = 0; j < device.gunList.length; j++) {
+									
+									_self.openlist.set(device.gunList[j].id,false);
+									
+									
+								}
+								
+							}
+							_self.list[0].name = "充电桩(" + totalNum + ")"
+						}
+						
+						
+						
+						
 						
 					 
 						if (_self.stationDetail.station.distance == null&&!bl) {
@@ -606,7 +606,7 @@
 
 				})
 			},
-			setOpen(item) {
+			setOpen(item) {
 				
 				var obj=this.openlist.get(item.id)
 				if (obj) {
@@ -614,7 +614,7 @@
 
 				} else {
 					obj = true
-				}
+				}
 				this.openlist.set(item.id,obj)
 				this.$forceUpdate()
 			},
@@ -761,7 +761,7 @@
 						}
 					}).catch(error => {
 
-					})
+					})
 				
 			},
 			getPriceList(id) {
@@ -776,7 +776,7 @@
 
 					if (res.data.prices.length) {
 
-						let date = new Date();
+						let date = new Date();
 						this.station=res.data.chargingStation
 						let hours = date.getHours();
 						let minutes = date.getMinutes();
@@ -791,9 +791,9 @@
 							var obj = this.pricesInfo[i]
 
 							if (date_str >= obj.startTime && date_str <= obj.endTime) {
-								obj.current = true;
-								if(obj.electricityPrice==0){
-									this.showtips=false
+								obj.current = true;
+								if(obj.electricityPrice==0){
+									this.showtips=false
 								}
 							}
 
@@ -804,21 +804,21 @@
 			},
 			 
 
-			navigate() {
-				uni.showLoading({
-					
+			navigate() {
+				uni.showLoading({
+					
 				})
 				WxJsApi.openLocation({
 				    latitude:parseFloat( _self.stationDetail.station.latitude),//目的地latitude
 				    longitude:parseFloat( _self.stationDetail.station.longitude),//目的地longitude
 				    name: _self.stationDetail.station.name,
 				    address: _self.stationDetail.station.address,
-				    scale: 15,//地图缩放大小，可根据情况具体调整
-					success(res) {
-							uni.hideLoading()
-					},
-					complete() {
-						//	uni.hideLoading()
+				    scale: 15,//地图缩放大小，可根据情况具体调整
+					success(res) {
+							uni.hideLoading()
+					},
+					complete() {
+						//	uni.hideLoading()
 					}
 				});
 				// //('station'+JSON.stringify(_self.stationDetail.station))
@@ -852,7 +852,7 @@
 						id
 				})
 			},
-			map() {
+			map() {
 				this.navigate()
 				//var item= _self.stationDetail.station
 				//window.location.href="https://uri.amap.com/marker?position="+ item.longitude+","+item.latitude+"&name="+item.name;
@@ -879,76 +879,76 @@
 	}
 </script>
 
-<style lang="scss" scoped>
-	.oldTextClassF{
-		.infos-item {
-			font-size: 40rpx  !important
-		};
-		.slow {
-			margin-left:1px  !important;
-		}
-		.info{
-			
-			.name{
-				font-size: 48rpx !important;
-				line-height:48rpx !important;
-				font-weight: bold;
-			}
-			.details{
-				font-size: 38rpx !important;
-				line-height: 38rpx !important;
-			}
-		}
-		
-	}
-	
-	.carline{
-		width: 72px;
-								height: 27px !important;
-											display: flex;
-											position: relative;
-											top: -32px;
-											z-index: 30;
-	}
-	.carsvg2{
-		 width: 28px;position: relative;top: -65px;    right:-10px;z-index: 1;
-	}
-	.carsvg1{
-		width: 72px;height: 36px;
-											display: flex;
-											position: relative;
-											top: 0px;
-											z-index: 80;
-											float: left;
-	}
-	.carsvg11{
-		width: 72px;height: 36px;
-											display: flex;
-											position: relative;
-											top: 5px;
-											left: -22px;
-											z-index: 80;
-	}
-	.carsvg12{
-		opacity: 0;
-	}
-	
-	.carspan{
-		display: flex;
-		    position: relative;
-		    top: -98px;
-		    left: 27px;
-			z-index: 88;
-			color: white;
-			
-	}
-	.carspan2{
-		
-		    font-size: 13px;
-		    left: 22px;
-			top: -96px;
-			
-			
+<style lang="scss" scoped>
+	.oldTextClassF{
+		.infos-item {
+			font-size: 40rpx  !important
+		};
+		.slow {
+			margin-left:1px  !important;
+		}
+		.info{
+			
+			.name{
+				font-size: 48rpx !important;
+				line-height:48rpx !important;
+				font-weight: bold;
+			}
+			.details{
+				font-size: 38rpx !important;
+				line-height: 38rpx !important;
+			}
+		}
+		
+	}
+	
+	.carline{
+		width: 72px;
+								height: 27px !important;
+											display: flex;
+											position: relative;
+											top: -32px;
+											z-index: 30;
+	}
+	.carsvg2{
+		 width: 28px;position: relative;top: -65px;    right:-10px;z-index: 1;
+	}
+	.carsvg1{
+		width: 72px;height: 36px;
+											display: flex;
+											position: relative;
+											top: 0px;
+											z-index: 80;
+											float: left;
+	}
+	.carsvg11{
+		width: 72px;height: 36px;
+											display: flex;
+											position: relative;
+											top: 5px;
+											left: -22px;
+											z-index: 80;
+	}
+	.carsvg12{
+		opacity: 0;
+	}
+	
+	.carspan{
+		display: flex;
+		    position: relative;
+		    top: -98px;
+		    left: 27px;
+			z-index: 88;
+			color: white;
+			
+	}
+	.carspan2{
+		
+		    font-size: 13px;
+		    left: 22px;
+			top: -96px;
+			
+			
 	}
 	@import "@/_theme.scss";
 
@@ -1864,7 +1864,7 @@
 				padding:2px;
 				position: absolute;
 				top: 0;
-			    right: 0;
+			    right: 0;
 				 font-size: 14px;
 				text-align: center;
 			}
@@ -1968,4 +1968,4 @@
 		}
 	}
 
-</style>
+</style>

pages/user/dataSet.vue

@@ -292,7 +292,7 @@ import {
 				uni.showModal({
 					title: '提示',
 					confirmText:'查看活动',
-					content: '包月卡一经激活，在有效期内车主无法更换已绑定的帐号及车牌号',
+					content: '月卡一经激活，在有效期内车主无法更换已绑定的帐号及车牌号',
 					success: res => {
 						if (res.confirm) {
 							uni.navigateTo({

pages/user/index.vue

@@ -43,7 +43,7 @@
 				<view class="title">
 					<text class="img">
 						<img src="../../assets/img/antFill-crown@3x.png" alt="">
-					</text>充电服务包月卡
+					</text>充电服务月卡
 				</view>
 				<view class="open-btn" @click="gotoUrl('pages/monthlyCardActivity/monthlyCardBuy')">
 					立即开通
@@ -55,7 +55,7 @@
 				<view class="title">
 					<text class="img">
 						<img src="../../assets/img/antFill-crown@3x.png" alt="">
-					</text>充电服务费包月卡
+					</text>充电服务费月卡
 				</view>
 				<view class="date">
 					{{userCard.endTime?userCard.endTime.slice(0,10):''}}到期

pages/user/mine.vue

@@ -43,7 +43,7 @@
 				<view class="title">
 					<text class="img">
 						<img src="../../assets/img/antFill-crown@3x.png" alt="">
-					</text>充电服务费包月卡
+					</text>充电服务费月卡
 				</view>
 				<view class="open-btn">
 					立即开通
@@ -55,7 +55,7 @@
 				<view class="title">
 					<text class="img">
 						<img src="../../assets/img/antFill-crown@3x.png" alt="">
-					</text>充电服务费包月卡
+					</text>充电服务费月卡
 				</view>
 				<view class="date">
 					2022.07.30到期