快捷充电，调整

pages/searchPile/chargeProcess/dcCharging.vue

@@ -499,6 +499,16 @@
 							充电服务费6折卡
 						</view>
 
+					</view>
+					<view class="item" style="    border-bottom: 0;" v-if="personInfo.memberLevel==3">
+						<view class="title">
+							快捷充电
+						</view>
+						<view class="detail" style="display: flex;">
+							<span style="   color: #959595;">{{checked2?'已开启':'已关闭'}}</span><u-switch size="40" v-model="checked2" active-color="#00E266" @change="checkedChange2"></u-switch>
+							
+						</view>
+					
 					</view>
 					<view class="item" style="    border-bottom: 0;">
 						<view class="title">
@@ -602,7 +612,7 @@
 		return res < 10 ? '0' + res : res;
 	};
 	import * as api from "@/apis/site.js"
-
+	import * as API_index from '@/apis/index.js'
 	import * as API from '@/apis/chargeProcess.js'
 	import * as API_weixin from '@/apis/weixin.js'
 	import * as userAPI from '@/apis/user.js'
@@ -619,7 +629,8 @@
 			return {
 				barstyle: {
 					backgroundColor: "#19be6b"
-				},
+				},
+				checked2:false,
 				tabList: [{
 						name: '故障',
 						type: 'CJWT-GZ'
@@ -690,7 +701,11 @@
 			this.projectName = process.car.ProjectName;
 
 			var plus = this.carhelp.getPersonInfoPlus()
-			this.personInfo = this.carhelp.getPersonInfo()
+			this.personInfo = this.carhelp.getPersonInfo()
+			
+			if(this.personInfo.quickCharging){
+				this.checked2 = true;
+			}
 			if (plus) {
 				this.userCard = plus.userCard;
 			}
@@ -743,7 +758,28 @@
 				return false
 			}
 		},
-		methods: {
+		methods: {
+			checkedChange2() {
+			
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API_index.changeQuickCharging({qucikStatus: this.checked2?1:0}).then((res) => {
+					var userInfo = this.carhelp.getPersonInfo();
+					userInfo.quickCharging=checked2;
+					this.carhelp.setPersonInfo(userInfo);
+					uni.hideLoading();
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 			thisdaysDistance(endTime) {
 
 				var date = new Date()

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -1516,18 +1516,25 @@
 						this.startCarChargingBl=true;
 						var submitForm={
 							deviceNo:this.detail.deviceNo,
-							gun:this.gun.channelNo,
+							channelNo:this.gun.channelNo,
 							carNumber:this.car ? this.car.carNum : '',
 							chargeStrategy:0,
 							amount:0,
-							payType:0,
+							payType:2,
 						}
 						if(this.userCardBool){
 							submitForm.userCardId=this.userCard.id
 						}
 						API.startCarCharging(submitForm).then((res) => {
-							
-							this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
+							if (res.data.status == "5") {
+								uni.showToast({
+									title:"快捷充电失败:用户余额不足！"
+								})
+								uni.hideLoading()
+							}else{
+								this.gotoUrl("pages/searchPile/chargeProcess/dcCharging?id=" + res.data.recordId);
+								
+							}
 							
 						}).catch(error => {
 							uni.hideLoading()

pages/user/member/index.vue

@@ -1,54 +1,201 @@
-<template>
-	<view>
-		<ujp-navbar title="规则说明">
-			
-		</ujp-navbar>
-		
-		<view class="textMain">
-			<view class="p">当您注册成为“51充电联盟”汽车充电会员以后，可享受如下权益：</view>
-			<view class="p">1.会员体系设置联盟会员、黄金会员及铂金会员三级；</view>
-			<view class="p">2.系统自动评级标准：</view>
-			<view class="p">①联盟会员：完成注册</view>
-			<view class="p">②黄金会员：248≤月充电量＜1000度</view>
-			<view class="p">③铂金会员：月充电量≥1000度</view>
-			<view class="p">3.每个月1号凌晨4点根据上个累计充电量情况评定当月会员级别。</view>
-			
-			<view class="p pMain">温馨提示：</view>
-			<view class="p">1.51充电联盟可以根据实际情况对权益规则和内容进行变动或调整，具体以权益说明页面为准，公布即生效；</view>
-			<view class="p">2.如有其他疑问可拨打客服热线：400-8899-619。</view>
-
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+<template>
+	<view>
+		<ujp-navbar title="规则说明">
+
+		</ujp-navbar>
+
+		<view class="textMain">
+			<view class="p pMain">会员等级：</view>
+			<view class="p">当您注册成为“51充电联盟”汽车充电会员以后，可享受如下权益：</view>
+			<view class="p">1、注册51充电联盟平台用户并完善信息即成为联盟会员。</view>
+			<view class="p">2、会员体系设置联盟会员、黄金会员及铂金会员三级；</view>
+			<view class="p">3、每月累计充电量达到不同等级的要求，下个月即可升级。</view>
+			<view class="p">a)联盟会员：完成注册</view>
+			<view class="p">b)黄金会员：248≤月充电量＜1000度</view>
+			<view class="p">c)铂金会员：月充电量≥1000度</view>
+			<view class="p">4、不同会员等级，享有不同会员等级权益</view>
+			<view class="p">5、联盟会员永久有效，黄金会员、铂金会员等级有效期为1个自然月。</view>
+			<view class="p"> 6、每月1号凌晨4点根据上个月累计充电量情况评定当月会员级别。</view>
+
+			<view class="p pMain">会员权益：</view>
+			<view class="p">本次升级共上线8大会员权益：</view>
+			<view class="p">1、折扣卡 联盟及以上会员可购买充电服务费6折卡</view>
+			<view class="p">2、月卡 联盟及以上会员可购买充电服务费月卡</view>
+			<view class="p">3、车主驿站 荆鹏软件园充电站院内可供新能源车主使用的共享职工之家</view>
+			<view class="p">4、小礼品 平台不定期为黄金及以上会员赠送小礼品</view>
+			<view class="p">5、工会福利 荆州市总工会不定期为黄金及以上会员赠送福利</view>
+			<view class="p">6、充电预约 铂金会员可在已开启预约功能的充电桩上预约充电服务</view>
+			<view class="p">7、生日问候 平台将为铂金会员提供生日问候服务（需在个人资料中填写出生信息）</view>
+			<view class="p">8、快捷充电 铂金会员可在平台体验插枪扫码快捷充电服务</view>
+			<view class="table">
+
+				<table>
+
+					<tr class="th">
+
+
+						<td></td>
+						<td >联盟</td>
+						<td>黄金</td>
+						<td>铂金</td>
+					</tr>
+
+					<tr>
+						<td class="td1">评级标准及月充电量</td>
+						<td>完成注册</td>
+						<td>248~999</td>
+						<td>≥1000</td>
+					</tr>
+					<tr>
+						<td class="td1">有效期</td>
+						<td>永久</td>
+						<td>1个月</td>
+						<td>1个月</td>
+					</tr>
+					<tr>
+						<td class="td1">
+							折扣卡
+						</td>
+						<td><span class="span1">●</span></td>
+						<td><span class="span1">●</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+					<tr>
+						<td class="td1">
+							月卡
+						</td>
+						<td><span class="span2">●</span></td>
+						<td><span class="span1">●</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+					<tr>
+						<td class="td1">
+							车主驿站
+						</td>
+						<td><span class="span2">●</span></td>
+						<td><span class="span2">●</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+
+					<tr>
+						<td class="td1">
+							小礼品
+						</td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span2">●</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+					<tr>
+						<td class="td1">
+							工会福利
+						</td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span2">●</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+					<tr>
+						<td class="td1">
+							充电预约
+						</td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+					<tr>
+						<td class="td1">
+							生日问候
+						</td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+					<tr>
+						<td class="td1">
+							快捷充电
+						</td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span2">○</span></td>
+						<td><span class="span1">●</span></td>
+					</tr>
+				</table>
+
+			</view>
+
+
+
+			<view class="p pMain">政策变更说明：</view>
+			<view class="p">1.51充电联盟可以根据实际情况对权益规则和内容进行变动、调整或终止，具体以权益说明页面为准，公布即生效；</view>
+			<view class="p">2.如有其他疑问可拨打客服热线：400-8899-619。</view>
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #ffffff;
+	}
+
+	.textMain {
+		margin: 40rpx;
+		padding-bottom: 80rpx;
+
+		.p {
+			margin: 8rpx 0;
+		}
+
+		.pMain {
+			font-size: 32rpx;
+			margin: 48rpx 0 16rpx 0;
+			color: #000;
+			font-weight: bold;
+		}
+	}
+
+	.table {
+		table {
+			border-spacing:0;
+			font-size: 32rpx;
+			.th {
+				background-color: rgba(72, 83, 104, 1);
+				color: rgba(255, 255, 255, 1);
+				td{
+					border-right: 1px solid #fff;
+				}
+			}
+
+			.td1 {
+				text-align: start;
+				background-color: rgba(243, 245, 247, 1);
+				width: 200rpx;
+				padding: 0 16rpx;
+				border-bottom: 1px solid #fff;
 				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background-color: #ffffff;
-	}
-	.textMain{
-		margin: 40rpx;
-		.p{
-			margin:  8rpx 0;
-		}
-		.pMain{
-			font-size: 32rpx;
-			margin:  48rpx 0  16rpx 0;
-			color: #000;
-			font-weight: bold;
-		}
-	}
-</style>
+
+			}
+
+			td {
+				text-align: center;
+				
+				width: 160rpx;
+			}
+		}
+
+
+	}
+</style>

pages/user/member/member.vue

@@ -275,7 +275,7 @@
 					var num2 = 0;
 					for (var i in chargeList) {
 						var obj = chargeList[i]
-						if (obj.status == 2 ) {
+						if (obj.status == 2&&obj.entAccountId==null ) {
 							num1 += obj.electricQuantity
 							num2 += obj.totalServiceMoney
 						}