测试优化

apis/login.js

@@ -12,6 +12,17 @@ export function findByOpenId(data) {
 	})
 }
 
+
+export function quickRegistration(data) {
+	var url='/mobile/regUser/quickRegistration';
+	return requestWhite({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+
  export function registerGuest(data) {
  	var url='/mobile/regUser/registerGuest';
  	return requestWhite({

components/QuickRegistration.vue

@@ -25,18 +25,57 @@
 		</view>
 		
 		<u-popup v-model="show2" mode="bottom" border-radius="14" :closeable="true" >
-			<view  class="QuickRegistrationPopup">
+			<view>
+				<ucarkeyboard ref="uKeyboard" mode="car"
+				  style="    z-index: 999;" :style="!keyShow?'display: none':''"
+				 :showTips="true" :confirmBtn="false"
+				  :mask-close-able="false" :tooltip="false" v-model="keyShow" @change="valChange" @backspace="backspace">
+					
+					<view class="ucarkeyboardView"  >
+										<span >车牌号:{{form.carNumber}}</span>
+										<span @tap="keyShow=!keyShow" style="
+						float: right;
+						padding-right: 10px;
+						color: #41a863;
+					">确定</span>
+									</view>
+				</ucarkeyboard>
+			<view  class="QuickRegistrationPopup" >
+				
+					
+				
 				<view class="popup1">快速注册</view>
 				<view class="popup2">欢迎来到优电联盟</view>
-				<view class="popup3"></view>
-				<view class="popup4">未注册的手机号验证后将自动注册</view>
+				
+				<view v-show="!keyShow">
+					
+				
+				<view class="popup3" >
+					<view class="input">
+						<u-input :customStyle="customStyle"  :clearable="false"
+						
+							v-model="form.telephone" type="number" placeholder="请输入手机号"
+							placeholder-style="font-size:16px;color:#ccc;" />
+					</view>
+				</view>
+				<view class="popup4" >未注册的手机号验证后将自动注册</view>
 				<view class="popup5">验证码</view>
-				<view class="popup3"></view>
+				<view class="popup3">
+					<view class="input">
+						<u-input :customStyle="customStyle"  :clearable="false"
+						
+							v-model="form.verifyCode" type="number" placeholder="请输入验证码"
+							placeholder-style="font-size:16px;color:#ccc;" />
+						<view class="code" :style="isCodeTipsColor ? 'color: #999999;' : ''" @click="getCode">
+							{{codeTips}}</view>
+					</view>
+				</view>
+				</view>
 				<view class="popup5">车牌号码</view>
 				<view class="popup6"  @tap="keyShowBtn(true)" >
 					<umessageInput :focus="true"
 					@selectIndex="getSelectIndex"
-					:value="form.carNum" :maxlength="maxlength" :disabled-keyboard="true"></umessageInput>
+					:value="form.carNumber" :maxlength="maxlength" :disabled-keyboard="true"></umessageInput>
 							
 				</view>
 				<view class="popup7">
@@ -51,28 +90,18 @@
 					</view>
 				</view>
 				<view class="popup8">
-					<u-button class="success-btn" shape="circle" type="success" @click="rechargeNow"
-						 >
+					<u-button class="success-btn" shape="circle" type="success" @click="keepCar" >
 						完成
 					</u-button>
 				</view>
 			</view>
-			<ucarkeyboard ref="uKeyboard" mode="car"
-			  style="    z-index: 999;" :style="!keyShow?'display: none':''"
-			 :showTips="true" :confirmBtn="false" :mask-close-able="false" :tooltip="false" v-model="keyShow" @change="valChange" @backspace="backspace">
 				
-				<view style="
-					text-align: center;
-					font-size: 18px;
-				">
-									<span style="color: #fff;">车牌号:{{form.carNum}}</span>
-									<span @tap="keyShow=!keyShow" style="
-					float: right;
-					padding-right: 10px;
-					color: #41a863;
-				">确定</span>
-								</view>
-			</ucarkeyboard>
+			
+			
+			<u-verification-code :seconds="sendMsgSecond" ref="uCode" @change="codeChange" @end="end" @start="start"
+				change-text="已发送(Xs)">
+			</u-verification-code>
+			</view>
 		</u-popup>
 	</view>
 </template>
@@ -80,53 +109,153 @@
 <script>
 	import umessageInput from '@/components/UmessageInput.vue'
 	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
-	
+	import * as loginApi from '@/apis/login.js'
+	import {
+		checkPhone,newDate
+	} from '@/utils'
 	export default {
 		name:"QuickRegistration",
 		components: {
 			ucarkeyboard,umessageInput
 		},
+		props:{
+			carNum:""
+		},
 		data() {
 			return {
+				customStyle: {
+					'font-size': '28rpx',
+					'border-radius': '50px',
+					'background-color': 'rgba(237, 240, 239, 1)',
+					'text-align':'center'
+
+				},
+				
+				
 				keyShow:false,
 				show1:true,
 				show2:false,
 				selectIndex:-1,
 				maxlength:8,
 				value:false,
+				personInfo: null,
+				isSendMsgIng: false,
+				isCodeTipsColor: false,
+				sendMsgSecond: 60,
+				codeTips: '',
 				form: {
-					carNum: '',
+					telephone: '',
+					verifyCode: '',
+					carNumber: '',
 					defaultFlag: true,
+					
 				},
 			};
+		},
+		created() {
+			console.log("1")
+			this.form.carNumber=this.carNum
+			var personInfo = this.carhelp.getPersonInfo()
+			this.personInfo = personInfo
+			
+		},
+		mounted() {
+			
 		},
 		methods:{
+			
+			codeChange(text) {
+				this.codeTips = text;
+			},
+			start() {
+				if (!this.isSendMsgIng) {
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+					loginApi.getVerifyCode(this.form.telephone).then((response) => {
+						uni.hideLoading();
+						this.carhelp.set("getvcodetime", new Date().getTime());
+			
+						if (!"") {
+							//倒计时
+							uni.showToast({
+								title: "发送成功"
+							})
+						} else {
+							uni.showToast({
+								title: "您的验证码已经发送[5分钟有效]，请勿重复点击"
+							})
+						}
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
+			},
+			//倒计时
+			end() {
+				this.sendMsgSecond = 60;
+				this.isSendMsgIng = false;
+				this.isCodeTipsColor = false;
+			},
+			// 获取验证码
+			getCode() {
+				if (this.$refs.uCode.canGetCode) {} else {
+					uni.showToast({
+						title: '倒计时结束后再发送',
+						icon: "none"
+					})
+					return
+				}
+			
+				var checkPhoneResult = checkPhone(this.form.telephone);
+			
+				if (checkPhoneResult !== true) {
+					uni.showToast({
+						title: checkPhoneResult,
+					})
+					return;
+				}
+				this.$refs.uCode.start();
+				this.isCodeTipsColor = true;
+			},
 			keyShowBtn(keyShow){
 				
+				var aaa =	this.$refs.uKeyboard.changeCarInputValue();
+				console.log(aaa,this.form.carNumber.length)
+				 if((this.form.carNumber.length == 0) && aaa) {
+					this.$refs.uKeyboard.changeCarInputMode();
+				}else if(!aaa&&(this.form.carNumber.length > 0)){
+					this.$refs.uKeyboard.changeCarInputMode();
+				}
+				
 				this.keyShow=keyShow;
 			},
 			checkboxChange() {
 				this.value = !this.value;
 			},
 			getSelectIndex(i){
-				this.selectIndex=i;
-				if(i==0){
-					var aaa =	this.$refs.uKeyboard.changeCarInputValue();
+				// this.selectIndex=i;
+				// if(i==0){
+				// 	var aaa =	this.$refs.uKeyboard.changeCarInputValue();
 					
-					if( aaa) {
-						this.$refs.uKeyboard.changeCarInputMode();
-					}
-				}
+				// 	if( aaa) {
+				// 		this.$refs.uKeyboard.changeCarInputMode();
+				// 	}
+				// }
 			},
 			// 按键被点击(点击退格键不会触发此事件)
 			valChange(val) {
 				
-				if(this.form.carNum.length>=this.maxlength&&this.selectIndex==-1){
+				if(this.form.carNumber.length>=this.maxlength&&this.selectIndex==-1){
 					return
 				}
 				
 				if(this.selectIndex==-1){
-					this.form.carNum += val;
+					this.form.carNumber += val;
 				}else{
 					const replaceStr = (str, index, char) => {
 					 const strAry = str.split('');
@@ -137,15 +266,15 @@
 					 return strAry.join('');
 					 }
 					 
-					this.form.carNum=replaceStr(this.form.carNum,this.selectIndex,val) ;
+					this.form.carNumber=replaceStr(this.form.carNumber,this.selectIndex,val) ;
 					this.selectIndex=-1;
 				}
-				// 将每次按键的值拼接到form.carNum变量中，注意+=写法
+				// 将每次按键的值拼接到form.carNumber变量中，注意+=写法
 				
-				//(this.form.carNum);
+				//(this.form.carNumber);
 			
 				var aaa =	this.$refs.uKeyboard.changeCarInputValue();
-				if((this.form.carNum.length == 0) && aaa) {
+				if((this.form.carNumber.length == 0) && aaa) {
 					this.$refs.uKeyboard.changeCarInputMode();
 				}else if(!aaa){
 					this.$refs.uKeyboard.changeCarInputMode();
@@ -153,11 +282,11 @@
 			},
 			// 退格键被点击
 			backspace() {
-				// 删除form.carNum的最后一个字符
-				if(this.form.carNum.length){
+				// 删除form.carNumber的最后一个字符
+				if(this.form.carNumber.length){
 					if(this.selectIndex==-1){
 						
-						this.form.carNum = this.form.carNum.substr(0, this.form.carNum.length - 1);
+						this.form.carNumber = this.form.carNumber.substr(0, this.form.carNumber.length - 1);
 						
 					}else{
 						const replaceStr = (str, index, char) => {
@@ -169,7 +298,7 @@
 						 return strAry.join('');
 						 }
 						 
-						this.form.carNum=replaceStr(this.form.carNum,this.selectIndex,'') ;
+						this.form.carNumber=replaceStr(this.form.carNumber,this.selectIndex,'') ;
 						
 						//this.selectIndex=-1;
 					}
@@ -178,16 +307,33 @@
 				
 				
 				
-				//(this.form.carNum);
+				//(this.form.carNumber);
 				
 				var aaa =	this.$refs.uKeyboard.changeCarInputValue();
-				if(this.form.carNum.length == 0 && aaa) {
+				if(this.form.carNumber.length == 0 && aaa) {
 					this.$refs.uKeyboard.changeCarInputMode();
 				}
 			},
 			keepCar() {
+				
+				var checkPhoneResult = checkPhone(this.form.telephone);
+				
+				if (!this.form.telephone || checkPhoneResult != true) {
+					uni.showToast({
+						title: checkPhoneResult,
+						icon: "none"
+					})
+					return;
+				}
+				if (!this.form.verifyCode) {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none"
+					})
+					return
+				}
 				//(this.form)
-				if(this.form.carNum.length != 8) {
+				if(this.form.carNumber.length != 8) {
 					uni.showToast({
 						title:"请填写新能源车牌"
 					})
@@ -196,13 +342,58 @@
 				
 				if (!this.value) {
 					uni.showToast({
-						title: "请阅读并同意《个人信息处理授权书》"
+						title: "请勾选协议"
 					})
 					return
 				}
-			
+				
+				//this.form.nickName= this.form.telephone;
+				if(this.carhelp.getUserInfo().nickname){
+					this.form.nickName = this.carhelp.getUserInfo().nickname;
+					this.form.headImg = this.carhelp.getUserInfo().headimgurl;
+				}
+				
+				this.form.openId = this.carhelp.getOpenId();
+				this.form.source = 2 //创建渠道1电单车2电车
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (this.personInfo && this.personInfo.userType == "1") {
+				
+					loginApi.validateGuestCode(this.form).then((response) => {
+						this.loginresponse(response, true)
+				
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				} else {
+					loginApi.validateCode(this.form).then((response) => {
+						this.loginresponse(response)
+				
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				}
 				
 			},
+			loginresponse(response, bl) {
+				
+				var token = response ? response.data.token : '';
+				this.carhelp.setToken(token);
+				this.carhelp.setPersonInfo(response.data.regUser);
+				this.carhelp.setPersonInfoPlus(response.data);
+				this.show1=false
+				this.show2=false
+				uni.hideLoading()
+				this.$emit("login",this.form);
+			},
 			open(){
 				
 			},
@@ -303,28 +494,47 @@
 		.popup2{
 			color: rgba(119, 119, 119, 1);
 			font-size: 36rpx;
+			margin-bottom: 40rpx;
 		}
 		.popup3{
-			
+			margin-bottom: 24rpx;
+			.input{
+				display: flex;
+				    align-items: center;
+				.code {
+					
+					top: 7px;
+					color: rgb(63, 189, 112);
+				}
+			}
 		}
 		.popup4{
+			margin-bottom: 40rpx;
 			color: rgba(102, 102, 102, 1);
 			font-size: 28rpx;
 		}
 		.popup5{
+			margin-bottom: 16rpx;
 			color: rgba(16, 16, 16, 1);
 			font-size: 36rpx;
 			font-weight: bold;
 		}
 		.popup6{
-			
+			margin-bottom: 40rpx;
 		}
 		.popup7{
-			
+			margin-bottom: 40rpx;
 		}
 		.popup8{
 			
 		}
 	}
-	
+	.ucarkeyboardView{
+		text-align: center;
+		    font-size: 40rpx;
+		    height: 200rpx;
+		    display: flex;
+		    align-items: flex-end;
+		    justify-content: space-between;
+	}
 </style>

components/Ucarkeyboard-mod.vue

@@ -2,8 +2,12 @@
 	<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
 		<view class="u-keyboard-grids">
 			<block>
-				<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
-					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover" class="u-keyboard-grids-btn"
+				<view class="u-keyboard-grids-item" 
+				 v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
+					<view :hover-stay-time="100" @tap="carInputClick(i, j)" hover-class="u-carinput-hover"
+					 class="u-keyboard-grids-btn" :class="{
+					'u-keyboard-index':item=='鄂'
+				}"
 					 v-for="(item, j) in group" :key="j">
 						{{ item }}
 					</view>
@@ -257,4 +261,7 @@
 	.u-keyboard-change .en {
 		transform: translateY(10rpx);
 	}
+	.u-keyboard-index{
+		background-color: #d0f0df;
+	}
 </style>

config/.env.dev.js

@@ -28,6 +28,7 @@ const UNI_APP = {
 	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq
 	//openId:"oK9Wr50iQUjEAam1s_RpHpXJS5xg",//月卡用户
 	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//sz
+	
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 	branchParameter:"51team",//team51,youdian

config/.env.dev.ud.js

@@ -21,7 +21,7 @@ const UNI_APP = {
 	openId:"oSruR6YkhP7QDroLnZGxWis43Kn0",//zkx
 	//openId:"oSruR6dZcmSM4ATuweZ5fjHGQsiA",//杨所
 	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
- 
+	//openId:"123",
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 	branchParameter:"youdian",//team51,youdian

pages/login/completeInfo.vue

@@ -204,7 +204,7 @@
 			}
 		},
 		onReady() {
-			this.$refs.uKeyboard.changeCarInputMode();
+			//this.$refs.uKeyboard.changeCarInputMode();
 			this.getUserInfo();
 		},
 		methods: {

pages/login/login.vue

@@ -27,11 +27,7 @@
 							placeholder-style="font-size:16px;color:#ccc;" />
 					</view>
 					<view class="tips"><span style="color: red;">*</span>未注册的手机号验证后将自动注册</view>
-					<view class="tips" style="color: red;" v-if="branchParameterBl('ud')" >
-						
-						
-						*原51充电联盟会员使用原手机号登录后可共享您的余额、优惠券等账户信息
-					</view>
+					
 				</view>
 				<view class="login-form-item">
 					<view class="title"  style="font-weight: bold;">验证码</view>
@@ -261,9 +257,13 @@
 					title: "加载中",
 					mask: true,
 				})
-
-				this.form.nickName = this.carhelp.getUserInfo().nickname;
-				this.form.headImg = this.carhelp.getUserInfo().headimgurl;
+
+				if(this.carhelp.getUserInfo().nickname){
+					this.form.nickName = this.carhelp.getUserInfo().nickname;
+					this.form.headImg = this.carhelp.getUserInfo().headimgurl;
+				}
+				//this.form.nickName = this.carhelp.getUserInfo().nickname;
+				//this.form.headImg = this.carhelp.getUserInfo().headimgurl;
 				this.form.openId = this.carhelp.getOpenId();
 				this.form.source = 2 //创建渠道1电单车2电车
 

pages/parking/search.vue

@@ -161,7 +161,7 @@
 			
 		},
 		onReady() {
-			this.$refs.uKeyboard.changeCarInputMode();
+			//this.$refs.uKeyboard.changeCarInputMode();
 		},
 		methods: {
 			//微信支付

pages/searchPile/chargeProcess/charge.vue

@@ -163,7 +163,20 @@
 			<view v-if="personInfo.userType == '1'&&0"   class="greyTips" >
 				车主注册会员可享受至少5%优惠，并可快速进入会员注册页面
 			</view>
-
+			<!-- 入场车辆 -->
+			<view class="member"  :class="{
+					'cost-explain2':!submitForm.carNumber
+				}">
+				<view class="actively ">
+					入场车辆
+				</view>
+				<view class="type" @click="carDet()" >
+					{{submitForm.carNumber?submitForm.carNumber:'填车牌号可减免部分停车费用'}}
+					<img v-if="!submitForm.carNumber"  src="@/assets/static/img/riLine-edit-box-line2.svg" alt="">
+					
+				</view>
+			</view>
+			
 			<view class="member">
 				<view class="actively">
 					优惠券
@@ -203,7 +216,7 @@
 
 			</view>
 
-
+			
 			<!-- 会员活动 -->
 			<view class="member">
 				<view class="actively ">
@@ -362,48 +375,7 @@
 
 		</u-popup>
 		<!-- 弹窗2 -->
-		<!-- <template>
-			<view>
-				<u-popup v-model="paySelect" mode="bottom">
-					<view class="paySelect">
-						<view class="title lefttitle ">选择支付方式</view>
-						<u-radio-group v-model="payValueTemp">
-
-							<p>
-								<u-radio name="0" active-color="#2979f6" shape="circle" size="48">
-									<p>{{payList[0].name}}<span>({{payList[0].tips}})</span> </p>
-								</u-radio>
-							</p>
-							<p v-if="personInfo&&personInfo.userType=='2'">
-								<u-radio name="1" active-color="#2979f6" shape="circle" size="48">
-									<p>{{payList[1].name}}<span>({{payList[1].tips}})</span> </p>
-								</u-radio>
-							</p>
-							<p v-if="false">
-								<u-radio name="2" active-color="#2979f6" shape="circle" size="48">
-									<p>{{payList[2].name}}<span>(其他充值金额)</span> </p>
-
-								</u-radio>
-							</p>
-						</u-radio-group>
-					</view>
-
-					<view class="recharge" style="padding-bottom: 0;">
-
-
-						<view class="recharge-btn transactionClass" style="margin-top: 60px;">
-
-
-							<u-button class="success-btn" @click="paySelectMethod(1)" shape="circle" type="success"
-								style="margin-top: 12px;margin-bottom: 16px;">
-								<span>确定</span>
-							</u-button>
-						</view>
-					</view>
-				</u-popup>
-
-			</view>
-		</template> -->
+		
 		<!-- 弹窗 -->
 		<template>
 			<view>
@@ -464,7 +436,7 @@
 
 			</view>
 		</template>
-		<quickRegistration></quickRegistration>
+		<quickRegistration v-if="personInfo.userType == '1'" @login="loginMethod"   :carNum="carNumber"  ></quickRegistration>
 	</view>
 </template>
 
@@ -617,7 +589,8 @@
 				startMode:"",
 
 				paySelectMethodValue:1,
-				chargingFundsBl:false,
+				chargingFundsBl:false,
+				id:""
 
 			}
 		},
@@ -640,14 +613,10 @@
 			if(op.startMode){
 				this.startMode=op.startMode
 			}
-			this.personInfo = this.carhelp.getPersonInfo()
-			// if(plus){
-			// 	this.userCard=plus.userCard;
-			// }
-			if (this.personInfo && this.personInfo.userType == "1") {
-				this.show3 = true
+			
+			if(op.id){
+				this.id=op.id
 			}
-
 			this.uuid = new Date().getTime();
 			this.stationId = op.stationId;
 			if (op.deviceNo) {
@@ -674,30 +643,7 @@
 			this.init()
 		},
 		onReady() {
-			this.personInfo = this.carhelp.getPersonInfo()
-			if (this.personInfo.userType == "1") {
-				this.payValueTemp = 0;
-				this.payValue = 0;
-			} else {
-				this.payValueTemp = 1;
-
-				var payValueDefault = this.carhelp.get("payValueDefault");
-
-				this.payValue = 1;
-				if (payValueDefault == "1" || payValueDefault == "0") {
-					this.payValue = payValueDefault;
-				}
-				if (payValueDefault == "1" || payValueDefault == "4") {
-					this.paySelectMethodValue = payValueDefault;
-					this.payValue = payValueDefault;
-				}
-				
-				if(payValueDefault==4){
-					this.chargingFundsBl=true;
-				}
-			}
-			this.payName = this.payList[this.payValue].name;
-
+			
 			this.getBannerInfo("charge-start")
 
 			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
@@ -706,7 +652,7 @@
 			else
 				this.theme('standard')
 				
-				
+			this.loginMethod()
 			this.getChargeList()
 		},
 		onShow() {
@@ -721,7 +667,56 @@
 
 			this.getHomePage()
 		},
-		methods: {
+		methods: {
+			carDet(t) {
+				if(this.submitForm.carNumber){
+					return
+				}
+				this.onShowRole = true
+				
+				var url="/pages/user/car/carDet?jpcode=jp_team51_charge_id:A_" + this.id
+				 
+				uni.navigateTo({
+					url: url
+				})
+			
+			},
+			loginMethod(form){
+				this.personInfo = this.carhelp.getPersonInfo()
+				// if(plus){
+				// 	this.userCard=plus.userCard;
+				// }
+				if (this.personInfo && this.personInfo.userType == "1") {
+					this.show3 = true
+				}
+				this.personInfo = this.carhelp.getPersonInfo()
+				if (this.personInfo.userType == "1") {
+					this.payValueTemp = 0;
+					this.payValue = 0;
+				} else {
+					this.payValueTemp = 1;
+				
+					var payValueDefault = this.carhelp.get("payValueDefault");
+				
+					this.payValue = 1;
+					if (payValueDefault == "1" || payValueDefault == "0") {
+						this.payValue = payValueDefault;
+					}
+					if (payValueDefault == "1" || payValueDefault == "4") {
+						this.paySelectMethodValue = payValueDefault;
+						this.payValue = payValueDefault;
+					}
+					
+					if(payValueDefault==4){
+						this.chargingFundsBl=true;
+					}
+				}
+				this.payName = this.payList[this.payValue].name;
+				this.useCoupon()
+				if(form){
+					this.submitForm.carNumber=form.carNumber
+				}
+			},
 			thisdaysDistance(endTime){
 						
 							 var date=new Date()
@@ -2019,6 +2014,10 @@
 		    margin-top: 20rpx;
 			    border-radius: 8px;
 	}
-	
+	.cost-explain2{
+		.type{
+			color: #FF3D00;
+		}
+	}
 	
 </style>

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -533,12 +533,12 @@
 					<view class="text">
 						入场车辆
 					</view>
-					<view class="car-number" v-if="!car||!carplateMust">
-						{{car?car.carNum:'填车牌号减免停车费用'}}
-						<img v-if="!car" @click="carDet()" src="@/assets/static/img/riLine-edit-box-line2.svg" alt="">
+					<view class="car-number" v-if="!car||!carplateMust" @click="carDet()">
+						{{car?car.carNum:'填车牌号可减免部分停车费用'}}
+						<img v-if="!car"  src="@/assets/static/img/riLine-edit-box-line2.svg" alt="">
 					</view>
 					<view class="car-number" v-else >
-						{{car?car.carNum:'填车牌号减免停车费用'}}
+						{{car?car.carNum:'填车牌号可减免部分停车费用'}}
 						<!-- <img v-if="car&&car.carNum" @click="carTempBl=true"
 							src="@/assets/static/img/riLine-edit-box-line2.svg" alt=""> -->
 								
@@ -745,6 +745,7 @@
 		</u-modal>
 		
 		
+		<quickRegistration v-if="show4" @login="loginMethod" :carNum="car?car.carNum:''" ></quickRegistration>
 		
 		
 	</view>
@@ -758,7 +759,8 @@
 	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
 	
 	import * as API_weixin from '@/apis/weixin.js'
-
+	import quickRegistration from '@/components/QuickRegistration.vue'
+	
 	import {
 		newDate,
 		hourDistanceArr,
@@ -769,7 +771,7 @@
 
 	export default {
 		components: {
-			ucarkeyboard
+			ucarkeyboard,quickRegistration
 		},
 		data() {
 			return {
@@ -896,8 +898,63 @@
 				this.getPile()
 			}
 
+		},
+		onReady() {
+		
+			this.projectName = process.car.ProjectName;
+			
+			var consumerPhone = "400-8899-619"
+			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+			if (consumerPhone) {
+				this.consumerPhone = consumerPhone
+			}
+			var carDetText = "填写车牌号，充电时可以减免部分停车费用"
+			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+			if (carDetText) {
+				this.carDetText = carDetText
+			}
+			if( this.branchParameterBl('ud')){
+				this.getf5surprised()
+			}
+			
+		},
+		onLoad(op) {
+			//this.startCarCharging()
+			if (op.isback) {
+				this.isback = true
+			}
+			if (op.id) {
+				this.id = op.id
+		
+				var personInfo = this.carhelp.getPersonInfo()
+				this.personInfo = personInfo
+				var userInfo = this.carhelp.getPersonInfo();
+				if (this.personInfo && this.personInfo.userType == "1") {
+					this.show3 = true
+				}else{
+					
+				}
+				if (userInfo && userInfo.id) {
+		
+					//this.getNewYear()
+				} else {
+					//this.getBannerInfoTop("home-top");	
+				}
+				
+				this.getPile()
+		
+			} else {
+				uni.showToast({
+					title: "请扫码充电"
+				})
+			}
 		},
-		methods: {
+		methods: {
+			loginMethod(){
+				var personInfo = this.carhelp.getPersonInfo()
+				this.personInfo = personInfo
+				this.getPile()
+			},
 			cancelGz() {
 				this.carhelp.setGzDate()
 			},
@@ -1204,7 +1261,10 @@
 			carTemp() {
 
 			},
-			carDet(t) {
+			carDet(t) {
+				if(this.car){
+					return
+				}
 				this.onShowRole = true
 				
 				var url="/pages/user/car/carDet?jpcode=jp_team51_charge_id:A_" + this.id
@@ -1512,7 +1572,7 @@
 						'&deviceNo=' + this.detail.deviceNo + "&gun=" + this.gun.channelNo + "&carNumber=" + (
 							this.car ? this.car.carNum : '');
 
-
+					url+="&id="+this.id
 					uni.navigateTo({
 						url: url
 					})
@@ -1530,7 +1590,8 @@
 						this.car ? this.car.carNum : '');
 					if(this.isback){
 						url+="&startMode=1"
-					}
+					}
+					url+="&id="+this.id
 	
 				uni.navigateTo({
 					url: url
@@ -1926,56 +1987,7 @@
 			}
 		},
 
-		onReady() {
-
-			this.projectName = process.car.ProjectName;
-			
-			var consumerPhone = "400-8899-619"
-			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-			if (consumerPhone) {
-				this.consumerPhone = consumerPhone
-			}
-			var carDetText = "填写车牌号，充电时可以减免部分停车费用"
-			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-			if (carDetText) {
-				this.carDetText = carDetText
-			}
-			if( this.branchParameterBl('ud')){
-				this.getf5surprised()
-			}
-			
-		},
-		onLoad(op) {
-			//this.startCarCharging()
-			if (op.isback) {
-				this.isback = true
-			}
-			if (op.id) {
-				this.id = op.id
-
-				var personInfo = this.carhelp.getPersonInfo()
-				this.personInfo = personInfo
-				var userInfo = this.carhelp.getPersonInfo();
-				if (this.personInfo && this.personInfo.userType == "1") {
-					this.show3 = true
-				}else{
-					
-				}
-				if (userInfo && userInfo.id) {
-
-					//this.getNewYear()
-				} else {
-					//this.getBannerInfoTop("home-top");	
-				}
-				
-				this.getPile()
-
-			} else {
-				uni.showToast({
-					title: "请扫码充电"
-				})
-			}
-		}
+		
 	}
 </script>
 

pages/user/car/carAdd.vue

@@ -79,7 +79,7 @@
 		},
 		onReady() {
 			if(this.$refs.uKeyboard){
-				this.$refs.uKeyboard.changeCarInputMode();
+				//this.$refs.uKeyboard.changeCarInputMode();
 			}
 			
 			

pages/user/car/carDet.vue

@@ -210,7 +210,7 @@
 			}
 		},
 		onReady() {
-			this.$refs.uKeyboard.changeCarInputMode();
+			//this.$refs.uKeyboard.changeCarInputMode();
 			
 			this.carLicense=this.carhelp.getPersonInfo().carLicense
 			if(this.carLicense){