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

apis/index.js

@@ -73,9 +73,9 @@ export function marketingData(data) {
 }
 export function findChargeData(data) {
 	return request({
-		method: 'get',
+		method: 'post',
 		data: data,
-		url: '/mobile/regUser/findChargeData'
+		url: '/mobile/chargingCar/findChargeData'
 	})
 }
 
@@ -130,7 +130,7 @@ export function chargingRecordData(data) {
 	return request({
 		method: 'post',
 		data: data,
-		url: '/mobile/chargingRecord/chargingRecordData'
+		url: '/mobile/chargingCar/chargingRecordData'
 	})
 }
 export function chargingDetail(id) {

pages.json

@@ -355,7 +355,7 @@
     ],
 	"globalStyle": {
 		"navigationStyle": "custom", // 隐藏系统导航栏
-		//"navigationBarTitleText": "智能充电系统",
+		"navigationBarTitleText": "加载中...",
 		"enablePullDownRefresh": false
 
 	}

pages/index/index.vue

@@ -112,7 +112,7 @@
 				前方等待2位
 			</view>
 			<view v-if="item.status == '1'" class="text-2">
-				已充{{item.actualFee != null ? item.actualFee : '0.00'}}元
+				已充{{item.dueFee != null ? item.dueFee : '0.00'}}元
 			</view>
 			<view v-if="item.status == '2'" class="text-2" style="color: red;">
 				超出时间将收取占位费
@@ -796,8 +796,9 @@
 	}
 
 	.news {
-		background-color: #fff;
-		margin: 12px 16px 20px;
+		background-color: #fff;		
+		width: 91.4%;
+		margin: 12px auto 0;
 		border-radius: 8px;
 
 		.news-content {
@@ -806,7 +807,7 @@
 			padding: 12px;
 
 			.content-text {
-				width: 211px;
+				width: 56.2%;
 				height: 42px;
 				line-height: 21px;
 				color: #101010;
@@ -817,7 +818,7 @@
 			;
 
 			.content-img {
-				width: 100px;
+				width: 26.7%;
 				height: 80px;
 				background-color: #777777;
 				border-radius: 4px;

pages/searchPile/chargeProcess/charge.vue

@@ -5,15 +5,12 @@
 			<view class="title">请选择充电金额</view>
 			<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" :key="item.id">
+				<view class="recharge-item" @click="moneyClick(item.id)"
+					:class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''" v-for="(item,index) in moneyList"
+					:key="item.id">
 					{{item.name}}元
 				</view>
-				<view class="recharge-item"
-				  :class="otherNum ? 'active' : ''"
-				 style="
+				<view class="recharge-item" :class="otherNum ? 'active' : ''" style="
 					padding: 8px 0px;">
 					<u-input v-model="otherNum" @input="ckInput" type="digit" placeholder="其他充值金额" />
 
@@ -25,14 +22,35 @@
 
 			</view>
 			<p>其他充电模式</p>
-			<view 
-		
-			@click="moneyClick(-1)"
-			:class="!otherNum&&moneyActiveClass == -1? 'active' : ''"
-			class="self-stop ">
+			<view @click="moneyClick(-1)" :class="!otherNum&&moneyActiveClass == -1? 'active' : ''" class="self-stop ">
 				充满自停
 			</view>
 
+			<!-- 优惠券 -->
+			<view class="discounts">
+				<view class="title">
+					<view class="title-1">
+						优惠券
+					</view>
+					<view class="title-2">
+						每次只能使用1张
+					</view>
+					<view class="title-3">
+						-￥6.00
+					</view>
+				</view>
+				<view class="select">
+					<u-radio-group v-model="value" @change="radioGroupChange" wrap="true">
+						<u-radio @change="radioChange" v-for="(item, index) in list" :key="index" :name="item.name"
+							:disabled="item.disabled">
+							{{item.name}}
+
+						</u-radio>
+						<view class="explain">使用说明</view>
+					</u-radio-group>
+
+				</view>
+			</view>
 
 
 		</view>
@@ -47,16 +65,16 @@
 
 	export default {
 		data() {
-			return {
-				moneyActiveClass:"5",
+			return {
+				moneyActiveClass: "5",
 				detail: {},
 				//提交信息
 				submitForm: {
 					deviceNo: '',
 					channelNo: '',
 					carNumber: '',
-					chargeStrategy: 2,
-					amount:0
+					chargeStrategy: 2,
+					amount: 0
 					//paytype:'YE',
 				},
 				user: {},
@@ -83,16 +101,29 @@
 					},
 
 				],
-
+				// 优惠券
+				list: [{
+						name: '满50元减6元',
+						disabled: false
+					},
+					{
+						name: '满30元减3元',
+						disabled: false
+					},
+					{
+						name: '满100减15元 未满足使用条件',
+						disabled: false
+					}
+				],
 
 			}
 		},
 		onLoad(op) {
 			if (op.deviceNo) {
-				this.submitForm.deviceNo = op.deviceNo;
-				this.submitForm.channelNo = op.gun;
+				this.submitForm.deviceNo = op.deviceNo;
+				this.submitForm.channelNo = op.gun;
 				this.submitForm.carNumber = '鄂DD12352';
-				
+
 			}
 
 
@@ -100,41 +131,41 @@
 		onShow() {
 			this.getHomePage()
 		},
-		methods: {
-			ckInput(text){
-				if(text.indexOf('.')>0){
-					
-					this.$nextTick(()=>{
-						this.otherNum=text.substring(0,text.indexOf('.'))
-						uni.showToast({
-							title:"请输入正整数"
-						})
-					})
-				}
-				var t	=Number(text);
-				if(t<1){
-					this.$nextTick(()=>{
-						this.otherNum='';
-					})
-						
-				}
-				if(t>500){
-					this.$nextTick(()=>{
-						this.otherNum=500;
-					})
-						
-				}
-				
-			},
-			moneyClick(index) {
-				this.moneyActiveClass = index;
-				
+		methods: {
+			ckInput(text) {
+				if (text.indexOf('.') > 0) {
+
+					this.$nextTick(() => {
+						this.otherNum = text.substring(0, text.indexOf('.'))
+						uni.showToast({
+							title: "请输入正整数"
+						})
+					})
+				}
+				var t = Number(text);
+				if (t < 1) {
+					this.$nextTick(() => {
+						this.otherNum = '';
+					})
+
+				}
+				if (t > 500) {
+					this.$nextTick(() => {
+						this.otherNum = 500;
+					})
+
+				}
+
+			},
+			moneyClick(index) {
+				this.moneyActiveClass = index;
+
 			},
-			confirm() {
-			
-				//console.log(JSON.stringify(this.submitForm))
-				
-				
+			confirm() {
+
+				//console.log(JSON.stringify(this.submitForm))
+
+
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -143,10 +174,10 @@
 				//this.submitForm.deviceNo = this.detail.deviceNo;
 				API.startCarCharging(this.submitForm).then((res) => {
 					console.log(JSON.stringify(this.res))
-					this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id="+res.data.recordId);
+					this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
 
 
-				}).catch(error => {
+				}).catch(error => {
 					uni.hideLoading()
 					if (error == '用户账户余额不足!') {
 						uni.showModal({
@@ -186,29 +217,29 @@
 					})
 				})
 			},
-			
+
 			submit() {
-	
-				if(this.moneyActiveClass==-1&&!this.otherNum){
-					this.submitForm.chargeStrategy=0;
-					this.submitForm.amount=0
-				}else{
-					this.submitForm.chargeStrategy=2;
-					if(this.otherNum){
-						this.submitForm.amount=this.otherNum
-					}else{
-						this.submitForm.amount=this.moneyActiveClass
-					}
-				}
-				
+
+				if (this.moneyActiveClass == -1 && !this.otherNum) {
+					this.submitForm.chargeStrategy = 0;
+					this.submitForm.amount = 0
+				} else {
+					this.submitForm.chargeStrategy = 2;
+					if (this.otherNum) {
+						this.submitForm.amount = this.otherNum
+					} else {
+						this.submitForm.amount = this.moneyActiveClass
+					}
+				}
+
 				if (!this.submitForm.channelNo) {
 					uni.showToast({
 						title: '请先选择充电通道'
 					})
 					return
 				}
-				
-			 
+
+
 				if (this.submitForm.chargeStrategy == 0 && this.user.balance < 5) {
 					uni.showModal({
 						title: '支付',
@@ -257,6 +288,11 @@
 	.recharge-item:last-child {
 		font-size: 14px !important;
 		color: #999999;
+
+	}
+
+	.u-input {
+		text-align: center !important;
 	}
 
 	.recharge {
@@ -270,13 +306,15 @@
 			color: #666;
 			margin-top: 4px;
 		}
-	.self-stop.active{
-		 
-			background-color: #EFFFF7;
-			border-color: #00B962;
-			color: #00B962;
-		
-	}
+
+		.self-stop.active {
+
+			background-color: #EFFFF7;
+			border-color: #00B962;
+			color: #00B962;
+
+		}
+
 		.rechargeMain {
 			display: flex;
 			flex-wrap: wrap;
@@ -334,9 +372,13 @@
 	}
 
 	.but-box {
-		width: 335px;
+		width: 89.3%;
 		height: 44px;
 		margin: 0 auto;
+		position: fixed;
+		bottom: 0;
+		right: 0;
+		left: 0;
 
 		.u-size-default[data-v-3bf2dba7] {
 			background-color: rgba(0, 185, 98, 100);
@@ -345,4 +387,79 @@
 			text-align: center;
 		}
 	}
+
+	//优惠券
+	.discounts {
+		margin-top: 20px;
+		width: 100%;
+
+		.title {
+			width: 100%;
+			display: flex;
+
+			.title-1 {
+				width: 48px;
+				height: 22px;
+				color: rgba(16, 16, 16, 100);
+				font-size: 16px;
+			}
+
+			.title-2 {
+				margin-left: 4px;
+				font-size: 14px;
+				line-height: 20px;
+			}
+
+			.title-3 {
+				margin-left: 126px;
+				height: 19px;
+				font-size: 16px;
+			}
+		}
+
+		.select {
+			position: relative;
+
+			/deep/.u-radio {
+				padding: 18px 16px;
+				margin-top: 12px;
+				width: 100%;
+				height: 48px;
+				border-radius: 4px;
+				background-color: rgba(255, 255, 255, 100);
+				text-align: center;
+				border: 1px solid rgba(227, 227, 227, 100);
+				position: relative;
+			}
+
+			/deep/.u-radio:nth-child(3) {
+				background-color: #e3e3e3 !important;
+
+			}
+
+			/deep/.u-radio__icon-wrap {
+				left: 16px;
+				background-color: #fff;
+			}
+
+			/deep/.u-radio__label {
+				margin-left: 40px;
+			}
+		}
+
+		.explain {
+			width: 64px;
+			height: 24px;
+			line-height: 24px;
+			position: absolute;
+			top: 24px;
+			right: 12px;
+			border-radius: 4px;
+			background-color: rgba(255, 255, 255, 100);
+			text-align: center;
+			border: 1px solid rgba(227, 227, 227, 100);
+			color: rgba(0, 185, 98, 100);
+			font-size: 12px;
+		}
+	}
 </style>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -4,11 +4,11 @@
 			<u-navbar title="充电结束">
 			</u-navbar>
 			<view class="progress-bar2">
-				<u-circle-progress width="400" active-color="green" :percent="100" border-width="20">
+				<u-circle-progress width="400" active-color="green" duration='20'  :percent="100" border-width="20">
 					<view class="u-progress-content">
 						<!-- <view class="u-progress-dot"></view> -->
 						<text class='u-progress-info' v-if="chargingGun.gunType==1">
-							{{chargingRecord.endSoc}}
+							{{chargingRecord.endSoc}}%
 							<p class="progress-text">当前电量</p>
 						</text>
 						
@@ -40,6 +40,14 @@
 						充电金额
 					</view>
 				</view>
+			</view>
+			<view 
+			 v-if="chargingRecord.remark"
+			style="
+				margin-top: 20px;
+				text-align: center;
+			">
+				结束原因：{{chargingRecord.remark}}
 			</view>
 			<view class="bottom">
 				<u-button size="default" shape="circle" @click="gotoMain(0)"  >返回首页</u-button>
@@ -57,25 +65,28 @@
 			<view class="progress-bar">
 				<u-circle-progress width="440" active-color="green" :percent="percent?percent:percentValue" border-width="50">
 
-					<view class="u-progress-content" v-if="chargingGun.gunType==1">
-						<view class="u-progress-dot"></view>
-						<text class='u-progress-info'>{{percent.toFixed(2)}}%</text>
-					</view>
-					<view class="u-progress-content" v-if="chargingGun.gunType==2">
-						<text class='u-progress-info'>前方等待10位</text>
+					
+					<view class="u-progress-content" v-if="chargingRecord.status==4">
+						<text class='u-progress-info'>前方等待{{waitNum}}位</text>
+					</view>
+					<view class="u-progress-content" v-else-if="chargingGun.gunType==1">
+						<view class="u-progress-dot"></view>
+						<text class='u-progress-info'>{{percent}}%</text>
+					</view>
+					<view class="u-progress-content" v-else-if="chargingGun.gunType==2">
+						<view class="u-progress-dot"></view>
+						<text class='u-progress-info'>{{chargingRecord.statusText}}...</text>
 					</view>
 					<view class="bot"></view>
 				</u-circle-progress>
 			</view>
-			<view class="starting">
-				{{chargingRecord.statusN}}...
-				
-
+			<view class="starting"  v-if="chargingGun.gunType==1">
+				{{chargingRecord.statusText}}...
 			</view>
 
 
 			<view class="timer">
-				{{getPercent()}}
+				{{timer}}
 			</view>
 			<view class="charged">
 				已充电{{chargingGun.kwh}}度
@@ -83,7 +94,7 @@
 			<view class="cost">
 				<view class="">
 					<view class="cost-top">
-						{{chargingRecord.dueFee}}元
+						{{chargingRecord.dueFee?chargingRecord.dueFee:0}}元
 					</view>
 					<view class="cost-bottom">
 						实时费用
@@ -103,7 +114,7 @@
 			<view class="power">
 				<view>
 					<view class="power-num">
-						{{chargingRecord.chargeVoltage}}v
+						{{chargingRecord.chargeVoltage?chargingRecord.chargeVoltage:0}}v
 					</view>
 					<view class="power-text">
 						电压
@@ -112,7 +123,7 @@
 				<view class="line"></view>
 				<view>
 					<view class="power-num">
-						{{chargingGun.power}}kW
+						{{chargingGun.power?chargingGun.power:0}}kW
 					</view>
 					<view class="power-text">
 						功率
@@ -121,7 +132,7 @@
 				<view class="line"></view>
 				<view>
 					<view class="power-num">
-						{{chargingRecord.chargeAmpere}}A
+						{{chargingRecord.chargeAmpere?chargingRecord.chargeAmpere:0}}A
 					</view>
 					<view class="power-text">
 						电流
@@ -154,7 +165,7 @@
 			</view>
 			<view class="bottom2">
 				<u-button type="primary"  @click="submit"
-				 :style="chargingRecord.status==1?'':'background-color: #9be6c2;'"
+				 :style="chargingRecord.status==1?'background-color: #00b962':'background-color: #9be6c2;'"
 				 shape="circle" >结束充电</u-button>
 			</view>
 
@@ -175,7 +186,8 @@
 	} from '@/utils'
 	export default {
 		data() {
-			return {
+			return {
+				timer:'',
 				title: '联系客服',
 				content: '0716-8123456',
 				confirmText: '拨打电话',
@@ -186,7 +198,9 @@
 				id: "",
 				chargingGun: {},
 				chargingRecord: {},
-				show: false,
+				show: false,
+				isReady:true,
+				waitNum:'',
 			}
 		},
 		onLoad(op) {
@@ -201,6 +215,9 @@
 				this.consumerPhone = consumerPhone
 			}
 
+		},
+		onUnload() {
+			this.isReady=false;
 		},
 		onReady() {
 			this.addpercent()
@@ -219,8 +236,8 @@
 				}
 			},
 			addpercent(){
-				
-				if(this.percent==0){
+				this.timer=this.getPercent()
+				if(this.isReady){
 					setTimeout(()=>{	
 						this.percentValue++;
 						if(this.percentValue>=100){
@@ -243,13 +260,20 @@
 				return obj;
 			},
 			getPercent() {
-				var ms=this.chargingGun.chargeTimeSec;
+				var Hour=0;
+				var Fen=0;
+				var S=0;
+				if (this.chargingRecord.status == 1) {
+					var second = secondsDistance(this.chargingRecord.startTime);
 				
-				var Hour = parseInt(Math.floor(ms / (60 * 60)));
-				var Fen = parseInt(Math.floor(ms % (60 * 60) / 60));
-				var S = parseInt(Math.floor(ms % (60) ));
+				var ms=second;
 				
-				var obj = (Hour > 9 ? "" : "0") + Hour + ":" + (Fen > 9 ? "" : "0") + Fen+ ":" + (S > 9 ? "" : "0") + S
+				 Hour = parseInt(Math.floor(ms / (60 * 60)));
+				 Fen = parseInt(Math.floor(ms % (60 * 60) / 60));
+				 S = parseInt(Math.floor(ms % (60) ));
+				
+				 }
+				 var obj = (Hour > 9 ? "" : "0") + Hour + ":" + (Fen > 9 ? "" : "0") + Fen+ ":" + (S > 9 ? "" : "0") + S
 				 
 			
 				return obj;
@@ -274,36 +298,47 @@
 				});
 			},
 			getInfo() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
+				// uni.showLoading({
+				// 	title: "加载中",
+				// 	mask: true,
+				// })
 				API.chargingDetail({
 					id: this.id
 				}).then((res) => {
 					this.chargingRecord = res.data.chargingRecord
 
 					this.chargingGun = res.data.chargingGun
-
+					this.waitNum=res.data.waitNum;
 					this.isReady = true;
 					//直流
 					if(this.chargingGun.gunType==1){
 						
 						if (this.chargingRecord.status == 1) {
+							this.percent=this.chargingGun.soc
 							// var second = secondsDistance(this.chargingRecord.startTime);
 							// var percent = (second / 60) / this.chargingRecord.estimateMinute * 100;
 							// console.log(this.percent)
-							var sum=this.chargingGun.chargeTimeSec/60+this.chargingGun.remainMin;
-							if(sum){
-								this.percent=this.chargingGun.chargeTimeSec/60/sum*100	
-							}
+							// var sum=this.chargingGun.chargeTimeSec/60+this.chargingGun.remainMin;
+							// if(sum){
+							// 	this.percent=this.chargingGun.chargeTimeSec/60/sum*100	
+							// }
 							
 						}
 					}else if(this.chargingGun.gunType==2){
 						//交流
 					}
-					
-					uni.hideLoading()
+					if(this.isReady&&this.chargingRecord.status!=2){
+						var time=500;
+						if(this.chargingRecord.status==0){
+							
+						}else{
+							time=3000;
+						}
+						setTimeout(()=>{
+							this.getInfo();
+						},time)
+					}
+					//uni.hideLoading()
 
 				}).catch(error => {
 					uni.showToast({

pages/searchPile/chargeProcess/exChargeEnd.vue

@@ -114,7 +114,7 @@
 }
 .bottom{
 	display: flex;
-	  width: 343px;
+	  width: 91.4%;
 	  padding: 12px 16px;
 	  position: fixed;
 	  bottom: 0;

pages/searchPile/searchPile.vue

@@ -243,7 +243,7 @@
 
 			</view>
 		</view>
-		<view class="position-box">
+		<view class="position-box" v-show="viewMode">
 			<view class="iconfont position" >&#xe634;</view>
 		</view>
 		<Tabbar :current="1"></Tabbar> 

pages/searchPile/searchPileMap.vue

@@ -79,7 +79,9 @@
 			</view>
 			<view class="img-box"><img src="/static/img/location.png" alt=""></view>
 		</view>
-         <view class="iconfont position" >&#xe634;</view>
+        <view class="position-box">
+        	<view class="iconfont position" >&#xe634;</view>
+        </view>
 		<u-tabbar v-model="current" :list="tabbarList" active-color="#009143"></u-tabbar>
 	</view>
 </template>
@@ -436,10 +438,20 @@
 		}
 	}
 	.position{
-		position:fixed;
+		color: #1677ff;
+		font-size: 14px
+	}
+	.position-box{
+		position:absolute;
 		top: 341px;
 		right: 118px;
-		font-size: 16px;
-		color: #1677ff;
+		width: 16px;
+		height: 16px;
+		/* line-height: 20px; */
+		background-color: rgba(22, 119, 255, 100);
+		text-align: center;
+		box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.4);
+		border: 2px solid rgba(255, 255, 255, 100);
+		border-radius: 999px;
 	}
 </style>